fix JuliaLang#16686, line number of call on catch line

halleysfifthinc · Jun 1, 2016 · ff8560f · ff8560f
1 parent 4904241
commit ff8560f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/julia-parser.scm b/src/julia-parser.scm
@@ -1249,7 +1249,8 @@
  '(block)
  #f
  finalb)
- (let* ((var (if nl #f (parse-eq* s)))
+ (let* ((loc (line-number-node s))
+ (var (if nl #f (parse-eq* s)))
  (var? (and (not nl) (or (and (symbol? var) (not (eq? var 'false))
  (not (eq? var 'true)))
  (and (length= var 2) (eq? (car var) '$)))))
@@ -1259,7 +1260,7 @@
  (loop (require-token s)
  (if (or var? (not var))
  catch-block
- `(block ,(cadr catch-block) ,var ,@(cddr catch-block)))
+ `(block ,loc ,var ,@(cdr catch-block)))
  (if var? var 'false)
  finalb)))))
  ((and (eq? nxt 'finally)

diff --git a/test/parse.jl b/test/parse.jl
@@ -461,3 +461,18 @@ let isline(x) = isa(x,Expr) && x.head === :line
  @test count(isline, parse("begin; x+2; end").args) == 1
  @test count(isline, parse("begin; x+2; y+1; end").args) == 2
 end
+
+# issue #16686
+@test parse("try x
+ catch test()
+ y
+ end") == Expr(:try,
+ Expr(:block,
+ Expr(:line, 1, :none),
+ :x),
+ false,
+ Expr(:block,
+ Expr(:line, 2, :none),
+ Expr(:call, :test),
+ Expr(:line, 3, :none),
+ :y))