fix #15763, disallow newline immediately after if

JuliaLang · Apr 8, 2016 · 7e38439 · 7e38439
1 parent b76bc89
commit 7e38439
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/julia-parser.scm b/src/julia-parser.scm
@@ -1094,6 +1094,9 @@
                 ,body)))
 
        ((if)
+	(if (newline? (peek-token s))
+	    (error (string "missing condition in \"if\" at " current-filename
+			   ":" (- (input-port-line (ts:port s)) 1))))
         (let* ((test (parse-cond s))
                (then (if (memq (require-token s) '(else elseif))
                          '(block)

diff --git a/test/parse.jl b/test/parse.jl
@@ -401,3 +401,7 @@ test_parseerror("0x1.0p", "invalid numeric constant \"0x1.0\"")
 @test expand(Base.parse_input_line("""
               try = "No"
            """)) == Expr(:error, "unexpected \"=\"")
+
+# issue #15763
+test_parseerror("if\nfalse\nend", "missing condition in \"if\" at none:1")
+test_parseerror("if false\nelseif\nend", "missing condition in \"elseif\" at none:2")