Skip to content

Fix: .- and .+ before numeric literals #76

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

Merged
c42f merged 1 commit into from
Aug 25, 2022
Merged

Fix: .- and .+ before numeric literals #76

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
9 changes: 7 additions & 2 deletions src/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ function parse_unary(ps::ParseState)
parse_factor(ps)
return
end
if k in KSet"- +"
if k in KSet"- +" && !is_decorated(t)
t2 = peek_token(ps, 2)
if !preceding_whitespace(t2) && kind(t2) in KSet"Integer Float"
k3 = peek(ps, 3)
Expand All @@ -1116,13 +1116,18 @@ function parse_unary(ps::ParseState)
else
# We have a signed numeric literal. Glue the operator to the
# next token to create a signed literal:
# +2 ==> +2
# -2 ==> -2
# +2.0 ==> 2.0
# -2*x ==> (call-i -2 * x)
bump_glue(ps, kind(t2), EMPTY_FLAGS, 2)
end
return
end
end
# Things which are not quite negative literals result in a unary call instead
# -0x1 ==> (call - 0x01)
# - 2 ==> (call - 2)
# .-2 ==> (call .- 2)
parse_unary_call(ps)
end

Expand Down
15 changes: 9 additions & 6 deletions test/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,7 @@ tests = [
],
JuliaSyntax.parse_term => [
"a * b * c" => "(call-i a * b c)"
# parse_unary
"-2*x" => "(call-i -2 * x)"
":T" => "(quote T)"
"in::T" => "(:: in T)"
"isa::T" => "(:: isa T)"
"-2*x" => "(call-i -2 * x)"
],
JuliaSyntax.parse_juxtapose => [
"2x" => "(call-i 2 * x)"
Expand All @@ -153,9 +149,16 @@ tests = [
"0xenomorph" => "0x0e"
],
JuliaSyntax.parse_unary => [
"+2" => "2"
":T" => "(quote T)"
"in::T" => "(:: in T)"
"isa::T" => "(:: isa T)"
"-2^x" => "(call - (call-i 2 ^ x))"
"-2[1, 3]" => "(call - (ref 2 1 3))"
"-2" => "-2"
"+2.0" => "2.0"
"-0x1" => "(call - 0x01)"
"- 2" => "(call - 2)"
".-2" => "(call .- 2)"
],
JuliaSyntax.parse_unary_call => [
# Standalone dotted operators are parsed as (|.| op)
Expand Down