Skip to content

Avoid use of GlobalRef in SyntaxNode trees #165

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
Nov 30, 2022
Merged

Avoid use of GlobalRef in SyntaxNode trees #165

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
6 changes: 5 additions & 1 deletion src/expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function reorder_parameters!(args, params_pos)
end

function _to_expr(node::SyntaxNode; iteration_spec=false, need_linenodes=true,
eq_to_kw=false, inside_vect_or_braces=false)
eq_to_kw=false, inside_vect_or_braces=false, inside_do=false)
if !haschildren(node)
val = node.val
if val isa Union{Int128,UInt128,BigInt}
Expand All @@ -44,6 +44,10 @@ function _to_expr(node::SyntaxNode; iteration_spec=false, need_linenodes=true,
val isa UInt128 ? Symbol("@uint128_str") :
Symbol("@big_str")
return Expr(:macrocall, GlobalRef(Core, macname), nothing, str)
elseif kind(node) == K"core_@doc"
return GlobalRef(Core, :var"@doc")
elseif kind(node) == K"core_@cmd"
return GlobalRef(Core, :var"@cmd")
else
return val
end
Expand Down
4 changes: 2 additions & 2 deletions src/syntax_tree.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ function SyntaxNode(source::SourceFile, raw::GreenNode{SyntaxHead}, position::In
elseif k == K"CmdMacroName"
Symbol("@$(normalize_identifier(val_str))_cmd")
elseif k == K"core_@doc"
GlobalRef(Core, :var"@doc")
Symbol("core_@doc")
elseif k == K"core_@cmd"
GlobalRef(Core, :var"@cmd")
Symbol("core_@cmd")
elseif is_syntax_kind(raw)
nothing
else
Expand Down
20 changes: 10 additions & 10 deletions test/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tests = [
"a;b;c" => "(toplevel a b c)"
"a;;;b;;" => "(toplevel a b)"
""" "x" a ; "y" b """ =>
"""(toplevel (macrocall :(Core.var"@doc") (string "x") a) (macrocall :(Core.var"@doc") (string "y") b))"""
"""(toplevel (macrocall core_@doc (string "x") a) (macrocall core_@doc (string "y") b))"""
"x y" => "x (error-t y)"
],
JuliaSyntax.parse_eq => [
Expand Down Expand Up @@ -457,7 +457,7 @@ tests = [
"module do \n end" => "(module true (error (do)) (block))"
"module \$A end" => "(module true (\$ A) (block))"
"module A \n a \n b \n end" => "(module true A (block a b))"
"""module A \n "x"\na\n end""" => """(module true A (block (macrocall :(Core.var"@doc") (string "x") a)))"""
"""module A \n "x"\na\n end""" => """(module true A (block (macrocall core_@doc (string "x") a)))"""
# export
"export a" => "(export a)" => Expr(:export, :a)
"export @a" => "(export @a)" => Expr(:export, Symbol("@a"))
Expand Down Expand Up @@ -750,9 +750,9 @@ tests = [
# __dot__ macro
"@. x" => "(macrocall @. x)" => Expr(:macrocall, Symbol("@__dot__"), LineNumberNode(1), :x)
# cmd strings
"``" => "(macrocall :(Core.var\"@cmd\") (cmdstring-r \"\"))"
"`cmd`" => "(macrocall :(Core.var\"@cmd\") (cmdstring-r \"cmd\"))"
"```cmd```" => "(macrocall :(Core.var\"@cmd\") (cmdstring-sr \"cmd\"))"
"``" => "(macrocall core_@cmd (cmdstring-r \"\"))"
"`cmd`" => "(macrocall core_@cmd (cmdstring-r \"cmd\"))"
"```cmd```" => "(macrocall core_@cmd (cmdstring-sr \"cmd\"))"
# literals
"42" => "42"
"1.0e-1000" => "0.0"
Expand Down Expand Up @@ -816,7 +816,7 @@ tests = [
# Triple-quoted dedenting:
"\"\"\"\nx\"\"\"" => raw"""(string-s "x")"""
"\"\"\"\n\nx\"\"\"" => raw"""(string-s "\n" "x")"""
"```\n x\n y```" => raw"""(macrocall :(Core.var"@cmd") (cmdstring-sr "x\n" "y"))"""
"```\n x\n y```" => raw"""(macrocall core_@cmd (cmdstring-sr "x\n" "y"))"""
# Various newlines (\n \r \r\n) and whitespace (' ' \t)
"\"\"\"\n x\n y\"\"\"" => raw"""(string-s "x\n" "y")"""
"\"\"\"\r x\r y\"\"\"" => raw"""(string-s "x\n" "y")"""
Expand Down Expand Up @@ -875,11 +875,11 @@ tests = [
""" "notdoc" ] """ => "(string \"notdoc\")"
""" "notdoc" \n] """ => "(string \"notdoc\")"
""" "notdoc" \n\n foo """ => "(string \"notdoc\")"
""" "doc" \n foo """ => """(macrocall :(Core.var"@doc") (string "doc") foo)"""
""" "doc" foo """ => """(macrocall :(Core.var"@doc") (string "doc") foo)"""
""" "doc \$x" foo """ => """(macrocall :(Core.var"@doc") (string "doc " x) foo)"""
""" "doc" \n foo """ => """(macrocall core_@doc (string "doc") foo)"""
""" "doc" foo """ => """(macrocall core_@doc (string "doc") foo)"""
""" "doc \$x" foo """ => """(macrocall core_@doc (string "doc " x) foo)"""
# Allow docstrings with embedded trailing whitespace trivia
"\"\"\"\n doc\n \"\"\" foo" => """(macrocall :(Core.var"@doc") (string-s "doc\\n") foo)"""
"\"\"\"\n doc\n \"\"\" foo" => """(macrocall core_@doc (string-s "doc\\n") foo)"""
],
]

Expand Down