jruby · Feb 15, 2015 · Feb 15, 2015
diff --git a/core/src/main/java/org/jruby/parser/Parser.java b/core/src/main/java/org/jruby/parser/Parser.java
@@ -127,9 +127,16 @@ public Node parse(String file, LexerSource lexerSource, DynamicScope blockScope,
                 case NOT_ASCII_COMPATIBLE:
                     throw runtime.newArgumentError(e.getMessage());
                 default:
+                    int line = e.getPosition().getLine();
+
+                    // Detailed source positions always have the right line number so they don't need to be adjusted.
+                    if (! (e.getPosition() instanceof DetailedSourcePosition)) {
+                        line++;
+                    }
+
                     StringBuilder buffer = new StringBuilder(100);
                     buffer.append(e.getPosition().getFile()).append(':');
-                    buffer.append(e.getPosition().getLine() + 1).append(": ");
+                    buffer.append(line).append(": ");
                     buffer.append(e.getMessage());
 
                     throw runtime.newSyntaxError(buffer.toString());

diff --git a/core/src/test/java/org/jruby/parser/DetailedSourcePositionTest.java b/core/src/test/java/org/jruby/parser/DetailedSourcePositionTest.java
@@ -165,6 +165,17 @@ public void testRegression2() {
         // assertEquals(8, position.getLength());
     }
 
+    public void testSyntaxError() {
+        try {
+            parse("3.to_i(\n");
+        } catch (org.jruby.exceptions.RaiseException e) {
+            final String syntaxErrorMessage = e.getException().message.asJavaString();
+
+            // There's no easy way to get at the source position information, but it is embedded in the syntax error message.
+            assertEquals("test:1: syntax error, unexpected end-of-file\n", syntaxErrorMessage);
+        }
+    }
+
     private class FoundException extends RuntimeException {
 
         private final Node node;

diff --git a/spec/truffle/tags/core/kernel/eval_tags.txt b/spec/truffle/tags/core/kernel/eval_tags.txt
@@ -1,6 +1,5 @@
 fails:Kernel#eval evaluates within the scope of the eval
 fails:Kernel#eval evaluates such that consts are scoped to the class of the eval
-fails:Kernel#eval sets constants at the toplevel from inside a block
 fails:Kernel#eval uses the filename of the binding if none is provided
 fails:Kernel#eval uses the receiver as self inside the eval
 fails:Kernel#eval returns from the scope calling #eval when evaluating 'return'

diff --git a/spec/truffle/tags/rubysl/rubysl-erb/spec/filename_tags.txt b/spec/truffle/tags/rubysl/rubysl-erb/spec/filename_tags.txt