Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix impartial negative number parsing #11

Merged
merged 2 commits into from
Feb 9, 2019
Merged

Fix impartial negative number parsing #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb2345
better syntax error message
boudra Feb 9, 2019
f689e61
fix parsing impartial negative numbers
boudra Feb 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions c_src/decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ void parse_number(decoder_t* d, json_event_t* e) {
return;
}

if(buf == limit) {
goto done;
}

if(*buf == '0' && buf + 1 < limit && is_digit(*(buf+1))) {
syntax_error(d, e);
return;
Expand Down
4 changes: 4 additions & 0 deletions lib/jaxon/parse_error.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ defmodule Jaxon.ParseError do
msg
end

def message(%{unexpected: {:error, context}}) do
"Syntax error at `#{context}`"
end

def message(%{unexpected: unexpected, expected: []}) do
"Unexpected #{event_to_pretty_name(unexpected)}"
end
Expand Down
10 changes: 5 additions & 5 deletions test/stream_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defmodule JaxonEventStreamTest do

@json_stream ~s(
{
"numbers": [1,2],
"numbers": [1,2,-1],
"empty_array": [],
"empty_object": {},
"bool1": true,
Expand Down Expand Up @@ -51,8 +51,8 @@ defmodule JaxonEventStreamTest do
assert [1] == query(stream, "$.numbers[0]")
assert [nil] == query(stream, "$.null")
assert [2] == query(stream, "$.numbers[1]")
assert [[1, 2]] == query(stream, "$.numbers")
assert [1, 2] == query(stream, "$.numbers[*]")
assert [[1, 2, -1]] == query(stream, "$.numbers")
assert [1, 2, -1] == query(stream, "$.numbers[*]")
assert ["Keanu Reeves"] == query(stream, "$.person.name")
assert [%{"name" => "The Matrix"}] == query(stream, "$.person.movies[1]")
assert ["Speed"] == query(stream, "$.person.movies[0].name")
Expand All @@ -68,7 +68,7 @@ defmodule JaxonEventStreamTest do
|> Elixir.Stream.take(30)
|> Enum.to_list()

assert Enum.take(Elixir.Stream.cycle([1, 2]), 30) == result
assert Enum.take(Elixir.Stream.cycle([1, 2, -1]), 30) == result
end

test "multiple JSON doucuments in a stream chunk" do
Expand All @@ -77,7 +77,7 @@ defmodule JaxonEventStreamTest do
|> Stream.query([:root, "numbers", :all])
|> Enum.to_list()

assert [1, 2, 1, 2] == result
assert [1, 2, -1, 1, 2, -1] == result
end

test "single values" do
Expand Down