Ticket #264: tkt264.patch

Source/BackEndClr/SharpGenerator.cobra

@@ -3636 +3636 @@
             if expr inherits TypeExpr
                 if expr.containedType inherits ArrayType
                     # arrays
-                    sw.write('new ')
-                    sw.write((expr.containedType to ArrayType).theWrappedType.sharpRef)
-                    sw.write(r'[')
-                    .writeSharpArgs(sw)
-                    sw.write(r']')
+                    _writeNewCall(sw, nil, (expr.containedType to ArrayType).theWrappedType.sharpRef, false) 
                 else
-                    sw.write('new ')
-                    expr.writeSharpDef(sw)
-                    sw.write('(')
-                    .writeSharpArgs(sw)
-                    sw.write(')')
+                    _writeNewCall(sw, expr, '', true) 
             else if expr inherits IdentifierExpr
                 if expr.isTypeReference
-                    sw.write('new ')
-                    expr.writeSharpDef(sw)
-                    sw.write('(')
-                    .writeSharpArgs(sw)
-                    sw.write(')')
+                    _writeNewCall(sw, expr, '', true) 
                 else if expr.receiverType inherits GenericParam # TODO: shouldn't expr.isTypeReference above have caught this?
-                    sw.write('new [expr.receiverType.sharpRef](')
-                    .writeSharpArgs(sw)
-                    sw.write(')')
+                    _writeNewCall(sw, nil, expr.receiverType.sharpRef, true) 
                 else if expr.type.nonNil.isDescendantOf(.compiler.delegateType)
                     isMethodSig = true
                 else if expr.type.isSystemTypeClass or _type.isDynamic
@@ -3686 +3672 @@
                     if defi.type.isDynamic
                         what = '(System.Type)' + what
                 # TODO: could speed this up. see http://ayende.com/Blog/archive/2008/02/27/Creating-objects--Perf-implications.aspx
-                sw.write('System.Activator.CreateInstance([what]')
+                sw.write('System.Activator.CreateInstance(')
+                if what == r'[]'  # Indexer - something like  myList[idx]()
+                    expr.writeSharpDef(sw)
+                else
+                    sw.write(what)
                 .writeSharpArgs(sw, ', ')
                 sw.write(')')
             if parens, sw.write(')')
-
+                
+    def _writeNewCall(sw as CurlyWriter, expr as Expr?, exprStr as String, isInvocation as bool)
+        require expr or exprStr.length >0
+        delim =  if(isInvocation, '()', r'[]') # invocation or index deref
+        sw.write('new ')
+        if expr, expr.writeSharpDef(sw)
+        else,   sw.write(exprStr)
+        sw.write(delim[0])
+        .writeSharpArgs(sw)
+        sw.write(delim[1])
+                
     def writeSharpArgs(sw as CurlyWriter)
         .writeSharpArgs(sw, '')
 

Tests/320-misc-two/855-indexed-postcall.cobra

@@ +1 @@
+class A
+    def blah
+        print "A!"
+  
+class B
+    def blah
+        print "B!"
+  
+class C
+    def blah
+        print "C!"
+
+
+class Program
+    def main
+        myList = [A, B, C]
+        for i, type in myList.numbered
+            # This works:
+            type = myList[i]
+            type().blah
+            # This failed at compile time:
+            myList[i]().blah
+
+        for i in 0: myList.count
+            myList[i]().blah