Skip to content
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

Jump to bottom

Add public keyword #320

Merged
merged 17 commits into from
Jul 30, 2023
Merged

Add public keyword #320

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
37ff4c8
add some parsing
Jun 28, 2023
c43f12d
switch to `public foo, bar` syntax
Jul 8, 2023
a343b7f
make public a keyword only at the toplevel
Jul 8, 2023
86de184
Add notes
Jul 17, 2023
e9d2494
Notes at the end of Lilith and Clair's chat
Jul 18, 2023
f68188e
implement support for `public foo, bar` at toplevel only and add tests
Jul 18, 2023
29e9fff
Make the cases where public is parsed differently even more strict
Jul 19, 2023
a47914a
add another test
Jul 19, 2023
c3ea832
stop using AbstractPattern in tests for compatibility
Jul 19, 2023
22754c8
add comment
Jul 19, 2023
e216d04
add broken tests
Jul 28, 2023
38a4009
more tests
Jul 28, 2023
19d306c
change peek behavior, add warning for using public as identifier at t…
Jul 28, 2023
6e07301
fix tests
Jul 29, 2023
fd80712
use consistent versions in diagnostic tests
Jul 29, 2023
2ad7164
use old kw syntax for tests to pass on 1.0–1.4
Jul 29, 2023
a60facf
Clarify comment
c42f Jul 30, 2023
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: 12 additions & 1 deletion src/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,11 @@ end
#
# flisp: parse-eq
function parse_eq(ps::ParseState)
parse_assignment(ps, parse_comma)
if peek(ps) == K"export"
parse_comma(ps)
else
parse_assignment(ps, parse_comma)
end
LilithHafner marked this conversation as resolved.
Show resolved Hide resolved
end

# parse_eq_star is used where commas are special, for example in an argument list
Expand Down Expand Up @@ -1978,6 +1982,13 @@ function parse_resword(ps::ParseState)
# export \n a ==> (export a)
# export \$a, \$(a*b) ==> (export (\$ a) (\$ (parens (call-i a * b))))
bump(ps, TRIVIA_FLAG)

# export scoped=true a, b ==> (export (= scoped true) b)
while peek(ps, 1) == K"Identifier" &&
peek(ps, 2) == K"="
parse_assignment(ps, x->parse_atsym(x, false))
LilithHafner marked this conversation as resolved.
Show resolved Hide resolved
end

parse_comma_separated(ps, x->parse_atsym(x, false))
emit(ps, mark, K"export")
elseif word in KSet"import using"
Expand Down