Merge branch 'master' into truffle-head

Author: eregon

core/src/main/java/org/jruby/Ruby.java

@@ -1758,12 +1758,12 @@ private void initBuiltins() {
         addLazyBuiltin("ffi-internal.jar", "ffi-internal", "org.jruby.ext.ffi.FFIService");
         addLazyBuiltin("tempfile.jar", "tempfile", "org.jruby.ext.tempfile.TempfileLibrary");
         addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.ext.fcntl.FcntlLibrary");
-        addLazyBuiltin("yecht.jar", "yecht", "YechtService");
         addLazyBuiltin("pathname.jar", "pathname", "org.jruby.ext.pathname.PathnameLibrary");
 
         addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
         addLazyBuiltin("mathn/rational.jar", "mathn/rational", "org.jruby.ext.mathn.Rational");
         addLazyBuiltin("psych.jar", "psych", "org.jruby.ext.psych.PsychLibrary");
+        addLazyBuiltin("ripper.jar", "ripper", "org.jruby.ext.ripper.RipperLibrary");
         addLazyBuiltin("coverage.jar", "coverage", "org.jruby.ext.coverage.CoverageLibrary");
 
         // TODO: implement something for these?

core/src/main/java/org/jruby/RubyString.java

@@ -2582,18 +2582,10 @@ private IRubyObject gsubCommon19(ThreadContext context, Block block, RubyString
     private IRubyObject gsubCommon19(ThreadContext context, Block block, RubyString repl,
             RubyHash hash, IRubyObject arg0, final boolean bang, int tuFlags, boolean useBackref) {
         Ruby runtime = context.runtime;
-
-        final Regex pattern, prepared;
-        final RubyRegexp regexp;
-        if (arg0 instanceof RubyRegexp) {
-            regexp = (RubyRegexp)arg0;
-            pattern = regexp.getPattern();
-            prepared = regexp.preparePattern(this);
-        } else {
-            regexp = null;
-            pattern = getStringPattern19(runtime, arg0);
-            prepared = RubyRegexp.preparePattern(runtime, pattern, this);
-        }
+        RubyRegexp regexp = arg0 instanceof RubyRegexp ? (RubyRegexp) arg0 :
+                RubyRegexp.newRegexp(runtime, RubyRegexp.quote19(getStringForPattern(arg0).getByteList(), false), new RegexpOptions());
+        Regex pattern = regexp.getPattern();
+        Regex prepared = regexp.preparePattern(this);
 
         int offset, cp, n, blen;
 

ext/ripper/src/main/java/org/jruby/ext/ripper/ByteListLexerSource.java renamed to core/src/main/java/org/jruby/ext/ripper/ByteListLexerSource.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());

ext/ripper/src/main/java/org/jruby/ext/ripper/GetsLexerSource.java renamed to core/src/main/java/org/jruby/ext/ripper/GetsLexerSource.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;