Ticket #253: min-multi-dim-array.patch

Source/TypeProxies.cobra

@@ -460 +460 @@
 
 
 class ArrayTypeIdentifier inherits WrappedTypeIdentifier
-
+    var multiDimens as int = 0
+    
     cue init(token as IToken, typeId as AbstractTypeIdentifier)
         base.init(token, typeId)
 
@@ -468 +469 @@
         return container.memberForName(.theWrappedTypeIdentifier.name)
 
     def _resolveType as IType is override
-        return .typeProvider.arrayType(_typeId.realType)
+        if not .multiDimens
+            return .typeProvider.arrayType(_typeId.realType)
+        # uncached multidim arrayTypes
+        at = ArrayType(_typeId.realType)
+        at.multiDimens = .multiDimens
+        at.bindInh
+        at.bindInt
+        return at
 
-
 class NilableTypeIdentifier
     inherits WrappedTypeIdentifier
     """

Source/BackEndClr/SharpGenerator.cobra

@@ -837 +837 @@
     is partial
 
     get sharpRef as String is override
-        return '[_wrappedType.sharpRef]' + r'[]'
-
+        suffix = r'[]'
+        # special form for multidimensional arrays  # TYPE[,] or TYPE[,,]
+        if .multiDimens == 2,      suffix = r'[,]'
+        else if .multiDimens == 3, suffix = r'[,,]'
+        wtsr = '[_wrappedType.sharpRef]' + suffix
+        return wtsr     
+            
     get sharpInit as String is override
         return 'null'
 

Source/Types.cobra

@@ -1708 +1708 @@
     get suffix as String is override
         return r'[]'
 
+    var _multiDimens as int = 0 # 2=2D (matrix), 3=3D
+    pro multiDimens from var
+        # flag multidimension ArrayTypes specially TYPE[,] vs TYPE[][]
+    
     def isAssignableTo(type as IType) as bool is override
         if base.isAssignableTo(type), return true
         if type inherits ArrayType
@@ -1758 +1762 @@
             interfaces = [iclone to ITypeProxy, icoll, ienum]  # TODO:, _ilistOf]  -- problems with cobra -ert:yes hello and extension method String.split
             _box = Class(Token.empty, Token.empty, '[.getType.name]_[.serialNum]', List<of IType>(), List<of String>(), AttributeList(), nil, interfaces, List<of ITypeProxy>(), nil)
             # TODO: make members based on System.Array
-            indexer = Indexer(Token.empty, Token.empty, _box, r'[]', [Param(Token('', 1, 1, 1, 'ID', 'index', nil), .compiler.intType)], _wrappedType, List<of String>(), AttributeList(), '')
+            paramList = [Param(Token('', 1, 1, 1, 'ID', 'index', nil), .compiler.intType)]
+            if _multiDimens >= 2
+                paramList.add(Param(Token('', 1, 1, 1, 'ID', 'index2', nil), .compiler.intType))
+            if _multiDimens >= 3
+                paramList.add(Param(Token('', 1, 1, 1, 'ID', 'index3', nil), .compiler.intType))
+            indexer = Indexer(Token.empty, Token.empty, _box, r'[]', paramList, _wrappedType, List<of String>(), AttributeList(), '')
             _box.addDecl(indexer)
             lengthProp = Property(Token.empty, Token.empty, _box, 'length', .compiler.intType, List<of String>(), AttributeList(), '')
             _box.addDecl(lengthProp)

Source/CobraParser.cobra

@@ -3447 +3447 @@
         if bracket
             if .peek.which=='INTEGER_LIT'
                 .throwError('The size of the array is not part of its type. Specify the size when creating the array such as: [t.name]\[]([.peek.text]).')
-            .expect('RBRACKET')
-            t = ArrayTypeIdentifier(bracket, t)
+            # allow 1D array type only
+            #.expect('RBRACKET')
+            #t = ArrayTypeIdentifier(bracket, t)
+            # 1D plus 2D and 3D (only) multidimensional and jagged
+            t = _extendedArrayTypeId(bracket, t to !)
 
         while true
             # check for 'optional' aka 'can be nil'
@@ -3464 +3467 @@
 
         return t to !
 
+    def _extendedArrayTypeId(bracket as IToken?, t as AbstractTypeIdentifier) as AbstractTypeIdentifier
+        """
+        Scan for 1D array TYPE[] as above but also for 
+        2D or 3D (only) multidimensional array type    'TYPE[,]' or 'TYPE[,,]' or 
+        a jagged 2D or 3D array 'TYPE[][]' or 'TYPE[][][]' and return the resulting ArrayTypeIdentifier
+        The latter two provide some minimal typing support for the additional array forms,
+        initialisation of such types still has to be done by a fallthrough to csharp.
+        e.g.   arrj as int[][] = sharp'new int[2][2]'
+               arrj[0], arrj[1] = int[](4), int[](2)
+               
+               arr2D as int[,] = sharp'new int[4,2]'
+        """
+        dimens = 0
+        if .optional('COMMA'), dimens += 1  # 2D multiDimension TYPE[,]
+        if .optional('COMMA'), dimens += 1  # 3D multiDimension TYPE[,,]
+        .expect('RBRACKET')
+        t = ArrayTypeIdentifier(bracket, t)
+        if dimens > 0 
+            ta = t to ArrayTypeIdentifier
+            ta.multiDimens = 1 + dimens     # specially tagged with dimensions
+        else
+            bracket = .optional('LBRACKET')
+            if bracket  # 2D jagged array : TYPE[][]
+                .expect('RBRACKET')
+                t = ArrayTypeIdentifier(bracket, t)
+                bracket = .optional('LBRACKET')
+                if bracket  # 3D jagged array : TYPE[][][]
+                    .expect('RBRACKET')
+                    t = ArrayTypeIdentifier(bracket, t)    
+        return t            
+                    
     def genericTypeId(openGenericToken as IToken) as AbstractTypeIdentifier
         require openGenericToken.text.trim.endsWith('<of')
         fullName = openGenericToken.text.trim + ' '

Tests/110-basics-two/800-arrays/400-multi-dim-array.cobra

@@ +1 @@
+# Test for crude minimal support of jagged and mutidimensional arrays
+# The support
+#  Recognises a type only, 
+#   - jagged: TYPE[][] or TYPE[][][] 
+#   - multidim TYPE[,] or TYPE[,,]
+# 2D and 3D arrays only (no more)
+# no constructor/initialiser call ( drop to sharp'' for that)
+
+# The type names used here are specific to the .Net family
+
+class MultiDimArray
+    const jaggedInt2DTypeStr = r'System.Int32[][]'
+    const intType2DStr       = r'System.Int32[,]'
+    const intType3DStr       = r'System.Int32[,,]'
+    const stringType2DStr    = r'System.String[,]'
+    const stringType3DStr    = r'System.String[,,]'
+    
+    def main
+        .jagged
+        .multiDimen
+        .multiDimenString
+        .usingLit
+        .crtInst
+        
+    def jagged
+        arr as int[][] = sharp'new int[2][]'
+        arr[0], arr[1]  = int[](10), int[](6)
+        assert arr.typeOf.toString == .jaggedInt2DTypeStr
+        
+        arr[0][0] = 9
+        assert arr[0][0] == 9
+        assert arr[0][1] == 0
+        arr[1][0] = 10
+        assert arr[1][0] == 10
+        arr[0][9] = 09
+        assert arr[0][9] == 9
+        arr[1][5] = 15
+        assert arr[1][5] == 15
+        #print arr
+        expect System.IndexOutOfRangeException 
+            arr[0][10] = 404
+        expect System.IndexOutOfRangeException 
+            arr[1][6] = 404
+    
+    def multiDimen
+        arr as int[,] = sharp'new int[2,10]'
+        assert arr.typeOf.toString == .intType2DStr
+        
+        arr[0,0] = 9
+        assert arr[0,0] == 9
+        assert arr[0,1] == 0
+        arr[1,0] = 10
+        assert arr[1,0] == 10
+        arr[1,9] = 19
+        assert arr[1,9] == 19
+        expect System.IndexOutOfRangeException 
+            arr[0,10] = 404
+        expect System.IndexOutOfRangeException 
+            arr[1,10] = 404
+        #print arr
+        
+        arr3D as int[,,] = sharp'new int[2,2,2]'
+        assert arr3D.typeOf.toString == .intType3DStr
+        arr3D[0,0,0] = 9
+        assert arr3D[0,0,0] == 9
+        assert arr3D[0,0,1] == 0
+        arr3D[0,1,0] = 10
+        assert arr3D[0,1,0] == 10
+        arr3D[1,1,1] = 111
+        assert arr3D[1,1,1] == 111
+
+        expect System.IndexOutOfRangeException 
+            arr3D[0,0,2] = 404
+        expect System.IndexOutOfRangeException 
+            arr3D[0, 2, 0] = 404
+        expect System.IndexOutOfRangeException 
+            arr3D[2, 0, 0] = 404
+            
+        using sw = StringWriter()
+            print to sw
+                print arr3D stop
+            assert sw.toString == r'[9, 0, 10, 0, 0, 0, 0, 111]'
+        
+    def multiDimenString
+        arr as String[,] = sharp'new string[2,10]'  # 2D Matrix
+# TODO: should actually be arr as String?[,] = sharp'new string[2,10]'
+# but should just fall out when supprted for 1D arrays
+        assert arr.typeOf.toString == .stringType2DStr
+        
+        arr[0,0] = 'hello'
+        assert arr[0,0] == 'hello'
+        #assert arr[0,1] == nil
+        arr[1,0] = 'Noddie'
+        assert arr[1,0] == 'Noddie'
+        #print arr
+        
+        arr3D as String[,,] = sharp'new string[2,2,2]'  # 3D Cubix
+        assert arr3D.typeOf.toString == .stringType3DStr
+        arr3D[0,0,0] = 'hi'
+        assert arr3D[0,0,0] == 'hi'
+        #assert arr3D[0,0,1] == nil
+        arr3D[0,1,0] = '10'
+        assert arr3D[0,1,0] == '10'
+        arr3D[1,0,0] = '100'
+        assert arr3D[1,0,0] == '100'
+        arr3D[1,1,1] = '111'
+        assert arr3D[1,1,1] == '111'
+        #print arr3D
+        using sw = StringWriter()
+            print to sw
+                print arr3D stop
+            assert sw.toString == r"['hi', nil, '10', nil, '100', nil, nil, '111']"
+            
+            
+    def usingLit
+        # making a 2D multidim array before the multidim array type was available
+        #essentially hand created like jagged
+        a = int[](10)
+        b = int[](10)
+        arr = @[a,b]  #OK
+        assert arr.typeOf.toString == .jaggedInt2DTypeStr
+        
+        arr[0][0] = 9
+        assert arr[0][0] == 9
+        assert arr[0][1] == 0
+        assert arr[1][0] == 0
+        arr[1][1] = 1
+        assert arr[1][1] == 1
+        #print arr
+        
+    def crtInst
+        # Introspectively
+        arr = Array.createInstance(int, 2, 10) 
+        arr.setValue(9,0,0)
+        assert arr.getValue(0,0) == 9
+        assert arr.getValue(0,1) == 0
+        assert arr.getValue(0,2) == 0
+        

Developer/IntermediateReleaseNotes.text

@@ -64 +64 @@
 
 * Generate warning on use of deprecated `$sharp('...')` syntax in favor of newer alternate sharp-string-literal form: `sharp'...'` and `sharp"..."`.
 
+* Provide very minimal support (types only) for 2D and 3D jagged and multidimensional arrays : ticket 253 
 
+
 ================================================================================
 Library
 ================================================================================