Skip to content

Fix SyntaxNode->Expr conversion with SubString source code #528

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
Jan 17, 2025
Merged

Fix SyntaxNode->Expr conversion with SubString source code #528

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
12 changes: 7 additions & 5 deletions src/expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function _expr_leaf_val(node::SyntaxNode)
node.val
end

function _leaf_to_Expr(source, txtbuf, head, srcrange, node)
function _leaf_to_Expr(source, txtbuf, txtbuf_offset, head, srcrange, node)
k = kind(head)
if k == K"MacroName" && view(source, srcrange) == "."
return Symbol("@__dot__")
Expand All @@ -77,7 +77,9 @@ function _leaf_to_Expr(source, txtbuf, head, srcrange, node)
Expr(:error) :
Expr(:error, "$(_token_error_descriptions[k]): `$(source[srcrange])`")
else
val = isnothing(node) ? parse_julia_literal(txtbuf, head, srcrange) : _expr_leaf_val(node)
val = isnothing(node) ?
parse_julia_literal(txtbuf, head, srcrange .+ txtbuf_offset) :
_expr_leaf_val(node)
if val isa Union{Int128,UInt128,BigInt}
# Ignore the values of large integers and convert them back to
# symbolic/textural form for compatibility with the Expr
Expand Down Expand Up @@ -547,7 +549,7 @@ function build_tree(::Type{Expr}, stream::ParseStream;
end
k = kind(head)
if isnothing(nodechildren)
ex = _leaf_to_Expr(source, txtbuf, head, srcrange, nothing)
ex = _leaf_to_Expr(source, txtbuf, 0, head, srcrange, nothing)
else
resize!(childranges, length(nodechildren))
resize!(childheads, length(nodechildren))
Expand All @@ -568,8 +570,8 @@ end
function _to_expr(node)
file = sourcefile(node)
if is_leaf(node)
offset, txtbuf = _unsafe_wrap_substring(sourcetext(file))
return _leaf_to_Expr(file, txtbuf, head(node), byte_range(node) .+ offset, node)
txtbuf_offset, txtbuf = _unsafe_wrap_substring(sourcetext(file))
return _leaf_to_Expr(file, txtbuf, txtbuf_offset, head(node), byte_range(node), node)
end
cs = children(node)
args = Any[_to_expr(c) for c in cs]
Expand Down
6 changes: 6 additions & 0 deletions test/expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,3 +824,9 @@
Expr(:import, Expr(:as, Expr(:., :A, :+), :y))
end
end

@testset "SyntaxNode->Expr conversion" begin
src = repeat('a', 1000) * '\n' * "@hi"
@test Expr(parsestmt(SyntaxNode, SubString(src, 1001:lastindex(src)))) ==
Expr(:macrocall, Symbol("@hi"), LineNumberNode(2))
end
Loading