Skip to content

Add type-asserts to the results of parse_brackets() #617

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
KristofferC merged 1 commit into from
Feb 4, 2026
Merged

Add type-asserts to the results of parse_brackets() #617

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
13 changes: 7 additions & 6 deletions src/julia/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ function parse_unary(ps::ParseState)
return (needs_parameters=is_paren_call,
is_paren_call=is_paren_call,
is_block=!is_paren_call && num_semis > 0)
end
end::NamedTuple{(:needs_parameters, :is_paren_call, :is_block, :delim_flags), Tuple{Bool, Bool, Bool, RawFlags}}

# The precedence between unary + and any following infix ^ depends on
# whether the parens are a function call or not
Expand Down Expand Up @@ -2206,7 +2206,8 @@ function parse_function_signature(ps::ParseState, is_function::Bool)
parsed_call = _parsed_call,
needs_parse_call = _needs_parse_call,
maybe_grouping_parens = !had_commas && !had_splat && num_semis == 0 && num_subexprs == 1)
end
end::NamedTuple{(:needs_parameters, :is_anon_func, :parsed_call, :needs_parse_call, :maybe_grouping_parens, :delim_flags),
Tuple{Bool, Bool, Bool, Bool, Bool, RawFlags}}
is_anon_func = opts.is_anon_func
parsed_call = opts.parsed_call
needs_parse_call = opts.needs_parse_call
Expand Down Expand Up @@ -2740,7 +2741,7 @@ function parse_call_arglist(ps::ParseState, closer)

parse_brackets(ps, closer, false) do _, _, _, _
return (needs_parameters=true,)
end
end::NamedTuple{(:needs_parameters, :delim_flags), Tuple{Bool, RawFlags}}
end

# Parse the suffix of comma-separated array expressions such as
Expand All @@ -2757,7 +2758,7 @@ function parse_vect(ps::ParseState, closer, prefix_trailing_comma)
opts = parse_brackets(ps, closer) do _, _, _, num_subexprs
return (needs_parameters=true,
num_subexprs=num_subexprs)
end
end::NamedTuple{(:needs_parameters, :num_subexprs, :delim_flags), Tuple{Bool, Int, RawFlags}}
delim_flags = opts.delim_flags
if opts.num_subexprs == 0 && prefix_trailing_comma
delim_flags |= TRAILING_COMMA_FLAG
Expand Down Expand Up @@ -3114,7 +3115,7 @@ function parse_paren(ps::ParseState, check_identifiers=true, has_unary_prefix=fa
return (needs_parameters=is_tuple,
is_tuple=is_tuple,
is_block=num_semis > 0)
end
end::NamedTuple{(:needs_parameters, :is_tuple, :is_block, :delim_flags), Tuple{Bool, Bool, Bool, RawFlags}}
if opts.is_tuple
# Tuple syntax with commas
# (x,) ==> (tuple-p x)
Expand Down Expand Up @@ -3292,7 +3293,7 @@ function parse_string(ps::ParseState, raw::Bool)
opts = parse_brackets(ps, K")") do had_commas, had_splat, num_semis, num_subexprs
return (needs_parameters=false,
simple_interp=!had_commas && num_semis == 0 && num_subexprs == 1)
end
end::NamedTuple{(:needs_parameters, :simple_interp, :delim_flags), Tuple{Bool, Bool, RawFlags}}
if !opts.simple_interp || peek_behind(ps, skip_parens=false).kind == K"generator"
# "$(x,y)" ==> (string (parens (error x y)))
emit(ps, m, K"error", error="invalid interpolation syntax")
Expand Down
Loading