Merge pull request #4 from timhall/2D-arrays

Add support for 2D arrays

Author: timhall

JSONConverter.bas

@@ -97,9 +97,19 @@ Public Function ConvertToJSON(ByVal JSON_DictionaryCollectionOrArray As Variant,
     Dim JSON_LBound As Long
     Dim JSON_UBound As Long
     Dim JSON_IsFirstItem As Boolean
+    Dim JSON_Index2D As Long
+    Dim JSON_LBound2D As Long
+    Dim JSON_UBound2D As Long
+    Dim JSON_IsFirstItem2D As Boolean
     Dim JSON_Key As Variant
     Dim JSON_Value As Variant
+    
+    JSON_LBound = -1
+    JSON_UBound = -1
     JSON_IsFirstItem = True
+    JSON_LBound2D = -1
+    JSON_UBound2D = -1
+    JSON_IsFirstItem2D = True
 
     Select Case VarType(JSON_DictionaryCollectionOrArray)
     Case vbNull, vbEmpty
@@ -127,8 +137,10 @@ Public Function ConvertToJSON(ByVal JSON_DictionaryCollectionOrArray As Variant,
 
         On Error Resume Next
 
-        JSON_LBound = LBound(JSON_DictionaryCollectionOrArray)
-        JSON_UBound = UBound(JSON_DictionaryCollectionOrArray)
+        JSON_LBound = LBound(JSON_DictionaryCollectionOrArray, 1)
+        JSON_UBound = UBound(JSON_DictionaryCollectionOrArray, 1)
+        JSON_LBound2D = LBound(JSON_DictionaryCollectionOrArray, 2)
+        JSON_UBound2D = UBound(JSON_DictionaryCollectionOrArray, 2)
 
         If JSON_LBound >= 0 And JSON_UBound >= 0 Then
             For JSON_Index = JSON_LBound To JSON_UBound
@@ -137,10 +149,31 @@ Public Function ConvertToJSON(ByVal JSON_DictionaryCollectionOrArray As Variant,
                 Else
                     JSON_BufferAppend JSON_Buffer, ",", JSON_BufferPosition, JSON_BufferLength
                 End If
+            
+                If JSON_LBound2D >= 0 And JSON_UBound2D >= 0 Then
+                    JSON_BufferAppend JSON_Buffer, "[", JSON_BufferPosition, JSON_BufferLength
 
-                JSON_BufferAppend JSON_Buffer, _
-                    ConvertToJSON(JSON_DictionaryCollectionOrArray(JSON_Index), JSON_ConvertLargeNumbersFromString), _
-                    JSON_BufferPosition, JSON_BufferLength
+                    For JSON_Index2D = JSON_LBound2D To JSON_UBound2D
+                        If JSON_IsFirstItem2D Then
+                            JSON_IsFirstItem2D = False
+                        Else
+                            JSON_BufferAppend JSON_Buffer, ",", JSON_BufferPosition, JSON_BufferLength
+                        End If
+                        
+                        JSON_BufferAppend JSON_Buffer, _
+                            ConvertToJSON(JSON_DictionaryCollectionOrArray(JSON_Index, JSON_Index2D), _
+                                JSON_ConvertLargeNumbersFromString), _
+                            JSON_BufferPosition, JSON_BufferLength
+                    Next JSON_Index2D
+                    
+                    JSON_BufferAppend JSON_Buffer, "]", JSON_BufferPosition, JSON_BufferLength
+                    JSON_IsFirstItem2D = True
+                Else
+                    JSON_BufferAppend JSON_Buffer, _
+                        ConvertToJSON(JSON_DictionaryCollectionOrArray(JSON_Index), _
+                            JSON_ConvertLargeNumbersFromString), _
+                        JSON_BufferPosition, JSON_BufferLength
+                End If
             Next JSON_Index
         End If
 

specs/Specs.bas

@@ -193,6 +193,18 @@ Public Function Specs() As SpecSuite
         .Expect(JSONString).ToEqual "[""123456789012345678901234567890""]"
     End With
 
+    With Specs.It("should convert 2D arrays")
+        ' Checks https://code.google.com/p/vba-json/issues/detail?id=8
+        Dim MultiDimensionalArray(1, 1) As Variant
+        MultiDimensionalArray(0, 0) = 1
+        MultiDimensionalArray(0, 1) = 2
+        MultiDimensionalArray(1, 0) = 3
+        MultiDimensionalArray(1, 1) = 4
+        
+        JSONString = JSONConverter.ConvertToJSON(MultiDimensionalArray)
+        .Expect(JSONString).ToEqual "[[1,2],[3,4]]"
+    End With
+    
     ' ============================================= '
     ' Errors
     ' ============================================= '