Skip to content

Don't assume that SubString has pointer and copy instead #506

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 5 commits into from
Oct 6, 2024
Merged

Don't assume that SubString has pointer and copy instead #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2ab29e
Don't assume that `SubString` has `pointer` and copy instead
LilithHafner Sep 16, 2024
e1d2877
Add InlineStrings as test dep
LilithHafner Sep 16, 2024
550545c
inline InlineStrings into tests
LilithHafner Sep 16, 2024
a652159
use Test.GenericString for testing
LilithHafner Sep 16, 2024
73a395f
put back empty [deps] section
LilithHafner Sep 16, 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
2 changes: 1 addition & 1 deletion src/parse_stream.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ function ParseStream(text::String, index::Integer=1; version=VERSION)
ParseStream(unsafe_wrap(Vector{UInt8}, text),
text, index, version)
end
function ParseStream(text::SubString, index::Integer=1; version=VERSION)
function ParseStream(text::SubString{String}, index::Integer=1; version=VERSION)
# See also IOBuffer(SubString("x"))
ParseStream(unsafe_wrap(Vector{UInt8}, pointer(text), sizeof(text)),
text, index, version)
Expand Down
13 changes: 12 additions & 1 deletion test/parse_stream.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ using JuliaSyntax: ParseStream,
peek, peek_token,
bump, bump_trivia, bump_invisible,
emit, emit_diagnostic, TRIVIA_FLAG, INFIX_FLAG,
ParseStreamPosition, first_child_position, last_child_position
ParseStreamPosition, first_child_position, last_child_position,
parsestmt

# Here we manually issue parse events in the order the Julia parser would issue
# them
Expand Down Expand Up @@ -147,3 +148,13 @@ end
@test first_child_position(st, position(st)) == ParseStreamPosition(4, 1)
@test last_child_position(st, position(st)) == ParseStreamPosition(7, 2)
end

@testset "SubString{GenericString} (issue #505)" begin
x = Test.GenericString("1 2")
@test x == "1 2"
y = split(x)[1]
@test y == "1"
@test y isa SubString{GenericString}
@test ParseStream(y) isa ParseStream
@test parsestmt(Expr, y) == parsestmt(Expr, "1")
end
Loading