From c27d06596bf1b92d668fa6e28edadf153bc9a818 Mon Sep 17 00:00:00 2001
From: xackus <14938807+xackus@users.noreply.github.com>
Date: Mon, 9 Dec 2019 22:29:45 +0100
Subject: [PATCH] fix integers parsed as floats

---
 lib/std/json.zig | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/std/json.zig b/lib/std/json.zig
index 6946ba0170d9eee92962348de49556fa3850c87e..a02c4ca733de273e711c5f0d7c388b51c277c4b0 100644
--- a/lib/std/json.zig
+++ b/lib/std/json.zig
@@ -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"));
 }
 
+fn test_parse(json_str: []const u8) !Value {
+    var p = Parser.init(debug.global_allocator, false);
+    return (try p.parse(json_str)).root;
+}
+
 test "parsing empty string gives appropriate error" {
-    var p = Parser.init(debug.global_allocator, false);
-    defer p.deinit();
-    testing.expectError(error.UnexpectedEndOfJson, p.parse(""));
+    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);
 }
-- 
2.54.0