Commit c27d06596bf1b92d668fa6e28edadf153bc9a818 | zig

author	xackus <14938807+xackus@users.noreply.github.com> 2019-12-09 22:29:45+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-12-10 10:30:41-05:00
log	c27d06596bf1b92d668fa6e28edadf153bc9a818
tree	4346e90b7abd158209a707e673eec94f24e1a73b
parent	3388c777fae8b76d1e325b71813361083244ce5d

fix integers parsed as floats

1 files changed, 22 insertions(+), 3 deletions(-)

lib
- std
  - json.zig

lib/std/json.zig+22-3

 @@ -387,14 +387,17 @@ pub const StreamingParser = struct {
                     token.* = Token.initMarker(Token.Id.ArrayBegin);
                 },
                 '-' => {
+                    p.number_is_integer = true;
                     p.state = State.Number;
                     p.count = 0;
                 },
                 '0' => {
+                    p.number_is_integer = true;
                     p.state = State.NumberMaybeDotOrExponent;
                     p.count = 0;
                 },
                 '1'...'9' => {
+                    p.number_is_integer = true;
                     p.state = State.NumberMaybeDigitOrDotOrExponent;
                     p.count = 0;
                 },
 @@ -453,14 +456,17 @@ pub const StreamingParser = struct {
                     token.* = Token.initMarker(Token.Id.ArrayBegin);
                 },
                 '-' => {
+                    p.number_is_integer = true;
                     p.state = State.Number;
                     p.count = 0;
                 },
                 '0' => {
+                    p.number_is_integer = true;
                     p.state = State.NumberMaybeDotOrExponent;
                     p.count = 0;
                 },
                 '1'...'9' => {
+                    p.number_is_integer = true;
                     p.state = State.NumberMaybeDigitOrDotOrExponent;
                     p.count = 0;
                 },
 @@ -1374,8 +1380,21 @@ test "write json then parse it" {
     testing.expect(mem.eql(u8, tree.root.Object.get("str").?.value.String, "hello"));
 }
-test "parsing empty string gives appropriate error" {
+fn test_parse(json_str: []const u8) !Value {
     var p = Parser.init(debug.global_allocator, false);
-    defer p.deinit();
+    return (try p.parse(json_str)).root;
-    testing.expectError(error.UnexpectedEndOfJson, p.parse(""));
+}
+test "parsing empty string gives appropriate error" {
+    testing.expectError(error.UnexpectedEndOfJson, test_parse(""));
+}
+test "integer after float has proper type" {
+    const json = try test_parse(
+        \\{
+        \\  "float": 3.14,
+        \\  "ints": [1, 2, 3]
+        \\}
+    );
+    std.testing.expect(json.Object.getValue("ints").?.Array.at(0) == .Integer);
 }