Merge pull request #18 from timhall/parse-numbers

Update number parsing

Author: timhall

specs/Excel-REST - Specs.xlsm

@@ -61,6 +61,21 @@ Public Function Specs() As SpecSuite
         End If
     End With
 
+    With Specs.It("should parse json numbers")
+        json = "{""a"":1,""b"":1.23,""c"":14.6000000000,""d"":14.6e6,""e"":14.6E6,""f"":10000000000000000000000}"
+        Set Parsed = RestHelpers.ParseJSON(json)
+        
+        .Expect(Parsed).ToBeDefined
+        If Not Parsed Is Nothing Then
+            .Expect(Parsed("a")).ToEqual 1
+            .Expect(Parsed("b")).ToEqual 1.23
+            .Expect(Parsed("c")).ToEqual 14.6
+            .Expect(Parsed("d")).ToEqual 14600000
+            .Expect(Parsed("e")).ToEqual 14600000
+            .Expect(Parsed("f")).ToEqual 1E+22
+        End If
+    End With
+    
     With Specs.It("should convert to json")
         Set Obj = New Dictionary
         Obj.Add "a", 1

specs/RestHelpersSpecs.bas

@@ -626,7 +626,7 @@ Private Function json_parseString(ByRef str As String, ByRef index As Long) As S
             Case "u"
                 index = index + 1
                 Code = Mid$(str, index, 4)
-                json_parseString = json_parseString & ChrW(val("&h" + Code))
+                json_parseString = json_parseString & ChrW(Val("&h" + Code))
                 index = index + 4
             End Select
         Case quote
@@ -656,17 +656,7 @@ Private Function json_parseNumber(ByRef str As String, ByRef index As Long)
             Value = Value & char
             index = index + 1
         Else
-            If InStr(Value, ".") Or InStr(Value, "e") Or InStr(Value, "E") Then
-                json_parseNumber = CDbl(Value)
-            Else
-                If Len(Value) < 5 Then
-                    json_parseNumber = CInt(Value)
-                ElseIf Len(Value) < 10 Then
-                    json_parseNumber = CLng(Value)
-                Else
-                    json_parseNumber = CDec(Value)
-                End If
-            End If
+            json_parseNumber = Val(Value)
             Exit Function
         End If
     Loop