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

Fix string macro parsing #4

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix string macro parsing #4

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
485bfdd
Fix string macro parsing
ScottPJones Nov 2, 2020
c0e6aa2
Update src/julia-parser.scm
ScottPJones Nov 6, 2020
c8ece9f
Update julia-parser.scm
ScottPJones Nov 6, 2020
f3637e6
Update julia-parser.scm
ScottPJones Nov 6, 2020
3aa6d7a
Update test/syntax.jl
ScottPJones Nov 7, 2020
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: 4 additions & 2 deletions src/julia-parser.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,11 +1272,13 @@
(parse-raw-literal s t)))
(nxt (peek-token s))
(macname (macroify-name ex (macsuffix t))))
(if (and (symbol? nxt) (not (operator? nxt))
(if (and (or (symbol? nxt) (number? nxt) (large-number? nxt)) (not (operator? nxt))
(not (ts:space? s)))
;; string literal suffix, "s"x
(loop `(macrocall ,macname ,startloc ,macstr
ScottPJones marked this conversation as resolved.
Show resolved Hide resolved
,(string (take-token s))))
,(if (symbol? nxt)
(string (take-token s))
(take-token s))))
(loop `(macrocall ,macname ,startloc ,macstr))))
ex))
(else ex))))))
Expand Down
3 changes: 3 additions & 0 deletions test/syntax.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ macro test999_str(args...); args; end
a
b""" == ("a\nb",)

# make sure a trailing integer, not just a symbol, is allowed also
@test test999"foo"123 == ("foo", 123)

# issue #5997
@test_throws ParseError Meta.parse(": x")
@test_throws ParseError Meta.parse("""begin
Expand Down