Changeset 2420

Timestamp:

08/24/10 03:12:39 (18 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Bad code gen for structs containing ref types.
ticket:238
credit:hopscc

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/BackEndClr/SharpGenerator.cobra (modified) (2 diffs)
• Tests/140-structs/210-struct-init.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -478 +478 @@
 
 * Fixed: Some invariants cause an internal error.  ticket:248
+
+* Fixed: Bad code gen for structs containing ref types.  ticket:238

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -1539 +1539 @@
             sw.write(' = ')
             _initExpr.writeSharpDef(sw)
-        else if .type.isReference and not .type.nonNil inherits GenericParam
+        else if _canInitDefault
             sharpInit = .type.sharpInit
             if sharpInit.length
@@ -1545 +1545 @@
                 sw.write(sharpInit)
         sw.write(';\n')
+        
+    def _canInitDefault as bool
+        # In C#, struct members can't be explicitly init'ed on declaration
+        if .parentBox inherits Struct, return false
+        return .type.isReference and not .type.nonNil inherits GenericParam