Skip to content

Newline macros #475

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Newline macros #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f94454a
allow "(@foo x\n y)"
MasonProtter Jun 3, 2024
2090e86
fixup implementation
MasonProtter Jul 26, 2024
4b1f766
don't use new features
MasonProtter Jul 26, 2024
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
4 changes: 2 additions & 2 deletions src/parse_stream.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ mutable struct ParseStream
# May be different from VERSION!
version::Tuple{Int,Int}

function ParseStream(text_buf::Vector{UInt8}, text_root, next_byte::Integer,
function ParseStream(text_buf::Union{Vector{UInt8}, Memory{UInt8}}, text_root, next_byte::Integer,
version::VersionNumber)
io = IOBuffer(text_buf)
seek(io, next_byte-1)
Expand Down Expand Up @@ -404,7 +404,7 @@ function _buffer_lookahead_tokens(lexer, lookahead)
end
end
end

# Return the index of the next byte of the input
function _next_byte(stream)
last(stream.tokens).next_byte
Expand Down
19 changes: 12 additions & 7 deletions src/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,27 @@ struct ParseState
whitespace_newline::Bool
# Enable parsing `where` with high precedence
where_enabled::Bool
in_parens::Bool
end

# Normal context
function ParseState(stream::ParseStream)
ParseState(stream, true, false, false, false, false, true)
ParseState(stream, true, false, false, false, false, true, false)
end

function ParseState(ps::ParseState; range_colon_enabled=nothing,
space_sensitive=nothing, for_generator=nothing,
end_symbol=nothing, whitespace_newline=nothing,
where_enabled=nothing)
where_enabled=nothing,
in_parens=nothing)
ParseState(ps.stream,
range_colon_enabled === nothing ? ps.range_colon_enabled : range_colon_enabled,
space_sensitive === nothing ? ps.space_sensitive : space_sensitive,
for_generator === nothing ? ps.for_generator : for_generator,
end_symbol === nothing ? ps.end_symbol : end_symbol,
whitespace_newline === nothing ? ps.whitespace_newline : whitespace_newline,
where_enabled === nothing ? ps.where_enabled : where_enabled)
where_enabled === nothing ? ps.where_enabled : where_enabled,
in_parens === nothing ? ps.in_parens : in_parens)
end

# Functions to change parse state
Expand All @@ -56,7 +59,7 @@ end
function with_space_sensitive(ps::ParseState)
ParseState(ps,
space_sensitive=true,
whitespace_newline=false)
whitespace_newline=ps.in_parens)
end

# Convenient wrappers for ParseStream
Expand Down Expand Up @@ -3006,7 +3009,9 @@ function parse_paren(ps::ParseState, check_identifiers=true)
ps = ParseState(ps, range_colon_enabled=true,
space_sensitive=false,
where_enabled=true,
whitespace_newline=true)
whitespace_newline=true,
in_parens=peek(ps, 2) == K"@")
@show peek(ps, 2)
mark = position(ps)
@check peek(ps) == K"("
bump(ps, TRIVIA_FLAG) # K"("
Expand All @@ -3023,7 +3028,7 @@ function parse_paren(ps::ParseState, check_identifiers=true)
bump_closing_token(ps, K")")
emit(ps, mark, K"parens")
elseif !check_identifiers && k == K"::" &&
peek(ps, 2, skip_newlines=true) == K")"
peek(ps, 2, skip_newlines=true) == K")"
# allow :(::) as a special case
# :(::) ==> (quote-: (parens ::))
bump(ps)
Expand All @@ -3035,7 +3040,7 @@ function parse_paren(ps::ParseState, check_identifiers=true)
initial_semi = peek(ps) == K";"
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))
(initial_semi && (num_semis == 1 || num_subexprs > 0))
return (needs_parameters=is_tuple,
is_tuple=is_tuple,
is_block=num_semis > 0)
Expand Down