Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 21 additions & 1 deletion lib/spitfire.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1423,8 +1423,28 @@ defmodule Spitfire do
{rhs, parser}
end

parser =
if token == :"//" and not match?({:.., _, [_, _]}, lhs) do
put_error(
pre_parser,
{meta,
"the range step operator (//) must immediately follow the range definition operator (..), for example: 1..9//2. If you wanted to define a default argument, use (\\\\) instead. Syntax error before: '//'"}
)
else
parser
end

ast =
case token do
:"//" ->
case lhs do
{:.., lhs_meta, [left, middle]} ->
{:..//, lhs_meta, [left, middle, rhs]}

_ ->
{token, newlines ++ meta, [lhs, rhs]}
end

:"not in" ->
{:not, meta, [{:in, meta, [lhs, rhs]}]}

Expand Down Expand Up @@ -2927,7 +2947,7 @@ defmodule Spitfire do
if MapSet.member?(@terminals_with_comma, peek_token(parser)) or
peek_token(parser) == :";" or
peek in [:stab_op, :do, :end, :block_identifier] or
(is_binary_op?(peek) and peek != :dual_op) do
(is_binary_op?(peek) and peek not in [:dual_op, :ternary_op]) do
{{:..., current_meta(parser), []}, parser}
else
meta = current_meta(parser)
Expand Down
21 changes: 21 additions & 0 deletions test/spitfire_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2300,6 +2300,13 @@ defmodule SpitfireTest do
assert Spitfire.parse("%e.(){}") == s2q("%e.(){}")
assert Spitfire.parse("%e.(1){}") == s2q("%e.(1){}")
assert Spitfire.parse("%e.(a, b){}") == s2q("%e.(a, b){}")

# Ellipsis + ternary edge cases (newline and semicolon-separated)
assert Spitfire.parse("x...\n//y") == s2q("x...\n//y")
assert Spitfire.parse("x...;//y") == s2q("x...;//y")
assert Spitfire.parse("x...\n;//y") == s2q("x...\n;//y")
assert Spitfire.parse("x...\n;\n//y") == s2q("x...\n;\n//y")
assert Spitfire.parse("x...\n;\n# comment\n//y") == s2q("x...\n;\n# comment\n//y")
end
end

Expand All @@ -2314,6 +2321,20 @@ defmodule SpitfireTest do
[{[line: 1, column: 5], "unknown token: %"}]}
end

test "range step operator requires a range lhs" do
code = "x...//y"

assert {:error, _} = s2q(code)
assert {:error, _ast, errors} = Spitfire.parse(code)

assert Enum.any?(errors, fn {_meta, message} ->
String.contains?(
message,
"the range step operator (//) must immediately follow the range definition operator (..)"
)
end)
end

test "missing bitstring brackets" do
code = """
<<one::
Expand Down
Loading