Skip to content

Avoid adding tuple in parsing of $(x) -> rhs #534

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
merged 1 commit into from
Feb 6, 2025
Merged

Avoid adding tuple in parsing of $(x) -> rhs #534

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
14 changes: 7 additions & 7 deletions src/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,7 @@ end
# $a ==> ($ a)
#
# flisp: parse-unary-prefix
function parse_unary_prefix(ps::ParseState)
function parse_unary_prefix(ps::ParseState, has_unary_prefix=false)
mark = position(ps)
t = peek_token(ps)
k = kind(t)
Expand All @@ -1480,15 +1480,15 @@ function parse_unary_prefix(ps::ParseState)
# $a ==> ($ a)
# $$a ==> ($ ($ a))
# $&a ==> ($ (& a))
parse_unary_prefix(ps)
parse_unary_prefix(ps, true)
end
# Only need PREFIX_OP_FLAG for ::
f = k == K"::" ? PREFIX_OP_FLAG : EMPTY_FLAGS
emit(ps, mark, k, f)
end
else
# .&(x,y) ==> (call .& x y)
parse_atom(ps)
parse_atom(ps, true, has_unary_prefix)
end
end

Expand Down Expand Up @@ -3066,7 +3066,7 @@ end
# *very* overloaded!
#
# flisp: parse-paren / parse-paren-
function parse_paren(ps::ParseState, check_identifiers=true)
function parse_paren(ps::ParseState, check_identifiers=true, has_unary_prefix=false)
ps = ParseState(ps, range_colon_enabled=true,
space_sensitive=false,
where_enabled=true,
Expand Down Expand Up @@ -3100,7 +3100,7 @@ function parse_paren(ps::ParseState, check_identifiers=true)
opts = parse_brackets(ps, K")") do had_commas, had_splat, num_semis, num_subexprs
is_tuple = had_commas || (had_splat && num_semis >= 1) ||
(initial_semi && (num_semis == 1 || num_subexprs > 0)) ||
(peek(ps, 2) == K"->" && peek_behind(ps).kind != K"where")
(peek(ps, 2) == K"->" && (peek_behind(ps).kind != K"where" && !has_unary_prefix))
return (needs_parameters=is_tuple,
is_tuple=is_tuple,
is_block=num_semis > 0)
Expand Down Expand Up @@ -3475,7 +3475,7 @@ end
# the syntactic operators or closing tokens.
#
# flisp: parse-atom
function parse_atom(ps::ParseState, check_identifiers=true)
function parse_atom(ps::ParseState, check_identifiers=true, has_unary_prefix=false)
bump_trivia(ps)
mark = position(ps)
leading_kind = peek(ps)
Expand Down Expand Up @@ -3634,7 +3634,7 @@ function parse_atom(ps::ParseState, check_identifiers=true)
bump(ps, remap_kind=K"Identifier")
end
elseif leading_kind == K"(" # parens or tuple
parse_paren(ps, check_identifiers)
parse_paren(ps, check_identifiers, has_unary_prefix)
elseif leading_kind == K"[" # cat expression
bump(ps, TRIVIA_FLAG)
ckind, cflags = parse_cat(ps, K"]", ps.end_symbol)
Expand Down
4 changes: 4 additions & 0 deletions test/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,10 @@ tests = [
"(a,b)->c" => "(-> (tuple-p a b) c)"
"(a;b=1)->c" => "(-> (tuple-p a (parameters (= b 1))) c)"
"x::T->c" => "(-> (tuple (::-i x T)) c)"
"\$a->b" => "(-> (tuple (\$ a)) b)"
"\$(a)->b" => "(-> (tuple (\$ (parens a))) b)"
# FIXME "&(a)->b" => "(-> (tuple-p (& (parens a))) b)"
# FIXME "::(a)->b" => "(-> (tuple-p (:: (parens a))) b)"
# `where` combined with `->` still parses strangely. However:
# * It's extra hard to add a tuple around the `x` in this syntax corner case.
# * The user already needs to add additional, ugly, parens to get this
Expand Down
Loading