Merge branch 'mr/fix_integer_parsing' into 'master'

Ensure large integers can be parsed in JSON data See merge request eng/toolchain/gnatcoll-core!89
AdaCore · Mar 22, 2024 · c83c7c4 · c83c7c4
2 parents e0c6cea + d1a2936
commit c83c7c4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/gnatcoll-json.adb b/src/gnatcoll-json.adb
@@ -536,7 +536,8 @@ package body GNATCOLL.JSON is
                end;
             when INTEGER_VALUE =>
                Tmp := Create
-                  (Integer'Value (Token (Buf, Event.First, Event.Last)));
+                  (Long_Long_Integer'Value
+                     (Token (Buf, Event.First, Event.Last)));
             when NUMBER_VALUE =>
                Tmp := Create
                   (Long_Float'Value (Token (Buf, Event.First, Event.Last)));

diff --git a/testsuite/tests/json/integer_number/test.adb b/testsuite/tests/json/integer_number/test.adb
@@ -8,11 +8,10 @@ function Test return Integer is
 
    use type JSON.JSON_Value_Type;
 
-   Content : constant String := "14";
 begin
    declare
       Value   : constant JSON.JSON_Value := JSON.Read
-         (Strm     => Content,
+         (Strm     => "14",
           Filename => "<data>");
       Result  : Integer;
    begin
@@ -23,5 +22,21 @@ begin
       Result := JSON.Get (Value);
       A.Assert (Result = 14, "check that result is equal to 14");
    end;
+
+   declare
+      Value   : constant JSON.JSON_Value := JSON.Read
+         (Strm     => "9000000000000000000",
+          Filename => "<data>");
+      Result  : Long_Long_Integer;
+   begin
+      A.Assert (True, "passed");
+      A.Assert (JSON.Kind (Value) = JSON.JSON_Int_Type,
+                "check if type is JSON_Int_Type (got " &
+                JSON.Kind (Value)'Img & ")");
+      Result := JSON.Get (Value);
+      A.Assert (Result = 9000000000000000000,
+                "check that result is equal to 9000000000000000000");
+   end;
+
    return A.Report;
 end Test;