jruby · Mar 20, 2015 · Mar 24, 2015 · Mar 24, 2015 · Mar 24, 2015 · Mar 24, 2015
Showing 679 changed files with 19,034 additions and 24,215 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -90,7 +90,8 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.7</version>
+      <version>0.8-SNAPSHOT</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -100,7 +101,8 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.6</version>
+      <version>0.7-SNAPSHOT</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/core/src/main/java/org/jruby/RubyGlobal.java b/core/src/main/java/org/jruby/RubyGlobal.java
@@ -124,7 +124,6 @@ public static void createGlobals(ThreadContext context, Ruby runtime) {
         runtime.defineGlobalConstant("RUBY_PATCHLEVEL", patchlevel);
         runtime.defineGlobalConstant("RUBY_RELEASE_DATE", release);
         runtime.defineGlobalConstant("RUBY_PLATFORM", platform);
-        runtime.defineGlobalConstant("RUBY_ENGINE", engine);
 
         IRubyObject description = runtime.newString(OutputStrings.getVersionString()).freeze(context);
         runtime.defineGlobalConstant("RUBY_DESCRIPTION", description);
@@ -142,6 +141,8 @@ public static void createGlobals(ThreadContext context, Ruby runtime) {
 
         // needs to be a fixnum, but our revision is a sha1 hash from git
         runtime.defineGlobalConstant("RUBY_REVISION", runtime.newFixnum(Constants.RUBY_REVISION));
+        runtime.defineGlobalConstant("RUBY_ENGINE", engine);
+        runtime.defineGlobalConstant("RUBY_ENGINE_VERSION", jrubyVersion);
 
         RubyInstanceConfig.Verbosity verbosity = runtime.getInstanceConfig().getVerbosity();
         runtime.defineVariable(new WarningGlobalVariable(runtime, "$-W", verbosity), GLOBAL);

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2154,12 +2154,12 @@ public boolean isEmpty() {
      */
     public RubyString append(IRubyObject other) {
         if (other instanceof RubyFixnum) {
-            cat(ConvertBytes.longToByteList(((RubyFixnum)other).getLongValue()));
+            cat(ConvertBytes.longToByteList(((RubyFixnum) other).getLongValue()));
             return this;
         } else if (other instanceof RubyFloat) {
-            return cat((RubyString)((RubyFloat)other).to_s());
+            return cat((RubyString) ((RubyFloat) other).to_s());
         } else if (other instanceof RubySymbol) {
-            cat(((RubySymbol)other).getBytes());
+            cat(((RubySymbol) other).getBytes());
             return this;
         }
         RubyString otherStr = other.convertToString();
@@ -2261,6 +2261,9 @@ public RubyString crypt(ThreadContext context, IRubyObject other) {
         POSIX posix = context.runtime.getPosix();
         byte[] keyBytes = Arrays.copyOfRange(value.unsafeBytes(), value.begin(), value.realSize());
         byte[] saltBytes = Arrays.copyOfRange(otherBL.unsafeBytes(), otherBL.begin(), otherBL.realSize());
+        if (saltBytes[0] == 0 || saltBytes[1] == 0) {
+            throw context.runtime.newArgumentError("salt too short(need >=2 bytes)");
+        }
         byte[] cryptedString = posix.crypt(keyBytes, saltBytes);
         // We differ from MRI in that we do not process salt to make it work and we will
         // return any errors via errno.
@@ -3838,6 +3841,7 @@ private static void setMatchString(RubyMatchData match, RubyString string, int p
         match.begin = pos;
         match.end = pos + len;
         match.charOffsetUpdated = false;
+        match.regs = null;
         match.infectBy(string);
     }
 
@@ -3851,78 +3855,6 @@ private static void setBackrefString(ThreadContext context, RubyString string, i
         context.setBackRef(match);
     }
 
-    private IRubyObject scanIter19(ThreadContext context, Regex pattern, Regex prepared, Encoding enc, Block block, RubyRegexp regexp, int tuFlags) {
-        Ruby runtime = context.runtime;
-        byte[]bytes = value.getUnsafeBytes();
-        int begin = value.getBegin();
-        int len = value.getRealSize();
-        int range = begin + len;
-        final Matcher matcher = prepared.matcher(bytes, begin, range);
-
-        int end = 0;
-        RubyMatchData match = null;
-        if (pattern.numberOfCaptures() == 0) {
-            while (RubyRegexp.matcherSearch(runtime, matcher, begin + end, range, Option.NONE) >= 0) {
-                end = StringSupport.positionEndForScan(value, matcher, enc, begin, range);
-                match = RubyRegexp.createMatchData19(context, this, matcher, pattern);
-                match.regexp = regexp;
-                RubyString substr = makeShared19(runtime, matcher.getBegin(), matcher.getEnd() - matcher.getBegin());
-                substr.infectBy(tuFlags);
-                match.infectBy(tuFlags);
-                context.setBackRef(match);
-                block.yield(context, substr);
-                modifyCheck(bytes, len, enc);
-            }
-        } else {
-            while (RubyRegexp.matcherSearch(runtime, matcher, begin + end, range, Option.NONE) >= 0) {
-                end = StringSupport.positionEndForScan(value, matcher, enc, begin, range);
-                match = RubyRegexp.createMatchData19(context, this, matcher, pattern);
-                match.regexp = regexp;
-                match.infectBy(tuFlags);
-                context.setBackRef(match);
-                block.yield(context, populateCapturesForScan(runtime, matcher, range, tuFlags, true));
-                modifyCheck(bytes, len, enc);
-            }
-        }
-        context.setBackRef(match == null ? runtime.getNil() : match);
-        return this;
-    }
-
-    private IRubyObject scanNoIter19(ThreadContext context, Regex pattern, Regex prepared, Encoding enc, RubyRegexp regexp, int tuFlags) {
-        Ruby runtime = context.runtime;
-        byte[]bytes = value.getUnsafeBytes();
-        int begin = value.getBegin();
-        int range = begin + value.getRealSize();
-        final Matcher matcher = prepared.matcher(bytes, begin, range);
-
-        RubyArray ary = runtime.newArray();
-
-        int end = 0;
-        if (pattern.numberOfCaptures() == 0) {
-            while (RubyRegexp.matcherSearch(runtime, matcher, begin + end, range, Option.NONE) >= 0) {
-                end = StringSupport.positionEndForScan(value, matcher, enc, begin, range);
-                RubyString substr = makeShared19(runtime, matcher.getBegin(), matcher.getEnd() - matcher.getBegin());
-                substr.infectBy(tuFlags);
-                ary.append(substr);
-            }
-        } else {
-            while (RubyRegexp.matcherSearch(runtime, matcher, begin + end, range, Option.NONE) >= 0) {
-                end = StringSupport.positionEndForScan(value, matcher, enc, begin, range);
-                ary.append(populateCapturesForScan(runtime, matcher, range, tuFlags, true));
-            }
-        }
-
-        if (ary.size() > 0) {
-            RubyMatchData match = RubyRegexp.createMatchData19(context, this, matcher, pattern);
-            match.regexp = regexp;
-            match.infectBy(tuFlags);
-            context.setBackRef(match);
-        } else {
-            context.setBackRef(runtime.getNil());
-        }
-        return ary;
-    }
-
     @JRubyMethod(name = "start_with?")
     public IRubyObject start_with_p(ThreadContext context) {
         return context.runtime.getFalse();

diff --git a/core/src/main/java/org/jruby/ext/ripper/ArgsTailHolder.java b/core/src/main/java/org/jruby/ext/ripper/ArgsTailHolder.java
@@ -0,0 +1,31 @@
+package org.jruby.ext.ripper;
+
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * Simple struct to temporarily hold values during part of parsing.
+ */
+public class ArgsTailHolder {
+    private final IRubyObject keywordArgs;
+    private final IRubyObject keywordRestArg;
+    private final IRubyObject blockArg;
+
+    public ArgsTailHolder(IRubyObject keywordArgs, IRubyObject keywordRestArg, IRubyObject blockArg) {
+        this.keywordArgs = keywordArgs;
+        this.keywordRestArg = keywordRestArg;
+        this.blockArg = blockArg;
+
+    }
+
+    public IRubyObject getBlockArg() {
+        return blockArg;
+    }
+
+    public IRubyObject getKeywordArgs() {
+        return keywordArgs;
+    }
+
+    public IRubyObject getKeywordRestArg() {
+        return keywordRestArg;
+    }
+}
diff --git a/core/src/main/java/org/jruby/ext/ripper/HeredocTerm.java b/core/src/main/java/org/jruby/ext/ripper/HeredocTerm.java
@@ -139,7 +139,10 @@ public int parseString(RipperLexer lexer, LexerSource src) throws java.io.IOExce
                 if (pend < lexer.lex_pend) str.append('\n');
                 lexer.lex_goto_eol();
                 if (lexer.nextc() == -1) {
-                    if (str != null) return error(lexer, len, str, eos);
+                    if (str != null) {
+                        str = null;
+                        return error(lexer, len, str, eos);
+                    }
                 }
             } while(!lexer.whole_match_p(eos, indent));
         } else {