Merge pull request JuliaLang#12045 from JuliaLang/jcb/12027

check macro identifier length before calling string.dec
jiahao · Jul 9, 2015 · 083dc41 · 083dc41
2 parents e8c52d7 + 30529d3
commit 083dc41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/julia-parser.scm b/src/julia-parser.scm
@@ -2072,9 +2072,11 @@
  (or (simple-string-literal? e)
  (and (length= e 3) (eq? (car e) 'macrocall)
  (simple-string-literal? (caddr e))
- (let ((mname (string (cadr e))))
- (equal? (string.sub mname (string.dec mname (length mname) 4))
- "_str")))))
+ (let* ((mname (string (cadr e)))
+ (len (length mname)))
+ (and (> len 4)
+ (equal? (string.sub mname (string.dec mname len 4))
+ "_str"))))))
 
 (define (parse-docstring s production)
  (let* ((isstr (eqv? (peek-token s) #\"))

diff --git a/test/parser.jl b/test/parser.jl
@@ -146,3 +146,10 @@ macro test999_str(args...); args; end
 @test parseall("a = \$\nb") == Expr(:block, Expr(:(=), :a, :$), :b)
 @test parseall(":(a = &\nb)") == Expr(:quote, Expr(:(=), :a, Expr(:&, :b)))
 @test parseall(":(a = \$\nb)") == Expr(:quote, Expr(:(=), :a, Expr(:$, :b)))
+
+# issue 11970
+@test parseall("""
+macro f(args...) end; @f ""
+""") == Expr(:toplevel,
+ Expr(:macro, Expr(:call, :f, Expr(:..., :args)), Expr(:block,)),
+ Expr(:macrocall, symbol("@f"), ""))