mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-24 07:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix integers parsed as floats

Browse Source
This commit is contained in:
xackus 2019-12-09 22:29:45 +01:00 committed by Andrew Kelley
parent 3388c777fa
commit c27d06596b
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/std/json.zig
View File

@ -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();
testing.expectError(error.UnexpectedEndOfJson, p.parse(""));
return (try p.parse(json_str)).root;
}
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);
}