Skip to content

fix: parsing crashes on code with errors #65

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

Open
doorgan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: parsing crashes on code with errors #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions lib/spitfire.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@ defmodule Spitfire do
peek_token(parser) in [:eol, :";", :eof] and parser.tokens != :eot ->
next_token(parser)

current_token(parser) in [:")", :"]", :"}", :">>"] ->
next_token(parser)

peek_token(parser) in [:")", :"]", :"}", :">>"] ->
next_token(parser)

true ->
parser
end
Expand Down
41 changes: 39 additions & 2 deletions test/spitfire_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2653,7 +2653,6 @@ defmodule SpitfireTest do
{{:., [line: 5, column: 37], [{:state, [line: 5, column: 32], nil}, :baz]},
[no_parens: true, line: 5, column: 38], []}
]},
{:__block__, [error: true, line: 5, column: 41], []},
{:__block__,
[
end_of_expression: [newlines: 1, line: 5, column: 43],
Expand All @@ -2665,7 +2664,6 @@ defmodule SpitfireTest do
[
{[line: 2, column: 8], "missing closing brace for map"},
{[line: 4, column: 1], "unknown token: ,"},
{[line: 5, column: 41], "unknown token: )"},
{[line: 5, column: 42], "unknown token: }"}
]}
end
Expand Down Expand Up @@ -2844,6 +2842,45 @@ defmodule SpitfireTest do

assert {:error, _ast, [{[line: 1, column: 4], "missing closing parentheses"}]} = Spitfire.parse(code)
end

test "stray closing delimiter after identifier" do
assert {:error, {:__block__, [], [{:x, _, nil}, {:__block__, [error: true, line: 1, column: 3], []}]},
[{[line: 1, column: 3], "unknown token: ]"}]} = Spitfire.parse("x ]")

assert {:error, {:__block__, [], [{:x, _, nil}, {:__block__, [error: true, line: 1, column: 3], []}]},
[{[line: 1, column: 3], "unknown token: }"}]} = Spitfire.parse("x }")

assert {:error, {:__block__, [], [{:x, _, nil}, {:__block__, [error: true, line: 1, column: 3], []}]},
[{[line: 1, column: 3], "unknown token: )"}]} = Spitfire.parse("x )")

assert {:error, {:__block__, [], [{:@, _, [{:x, _, nil}]}, {:__block__, [error: true, line: 1, column: 4], []}]},
[{[line: 1, column: 4], "unknown token: ]"}]} = Spitfire.parse("@x ]")

assert {:error, {:__block__, [], [1, {:__block__, [error: true, line: 1, column: 3], []}]},
[{[line: 1, column: 3], "unknown token: ]"}]} = Spitfire.parse("1 ]")

assert {:error, _ast, [{[line: 1, column: 3], "unknown token: ]"}, {[line: 1, column: 5], "unknown token: }"}]} =
Spitfire.parse("x ] }")
end

test "stray closing delimiter after complete expression" do
assert {:error,
{:__block__, [],
[
{:foo, [closing: [line: 1, column: 5], line: 1, column: 1], []},
{:__block__, [error: true, line: 1, column: 6], []}
]}, [{[line: 1, column: 6], "unknown token: }"}]} = Spitfire.parse("foo()}")

assert {:error, {:__block__, [], [[1, 2], {:__block__, [error: true, line: 1, column: 7], []}]},
[{[line: 1, column: 7], "unknown token: }"}]} = Spitfire.parse("[1, 2]}")

assert {:error,
{:__block__, [],
[
{:%{}, [closing: [line: 1, column: 7], line: 1, column: 1], [a: 1]},
{:__block__, [error: true, line: 1, column: 8], []}
]}, [{[line: 1, column: 8], "unknown token: )"}]} = Spitfire.parse("%{a: 1})")
end
end

describe "&parse_with_comments/2" do
Expand Down