jruby · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017
Showing with 24 additions and 8 deletions.

+5 −2 core/src/main/java/org/jruby/RubyArray.java

+18 −5 core/src/main/java/org/jruby/RubyRange.java

+1 −1 core/src/main/ruby/jruby/kernel/proc.rb
diff --git a/core/src/main/java/org/jruby/RubyArray.java b/core/src/main/java/org/jruby/RubyArray.java
@@ -4645,8 +4645,11 @@ public RubyString pack(ThreadContext context, IRubyObject obj, IRubyObject maybe
         RubyString str;
 
         try {
-            IRubyObject buffer = opts.convertToHash().fastARef(runtime.newSymbol("buffer"));
-            if (buffer != null) {
+            IRubyObject buffer = ArgsUtil.extractKeywordArg(context, "buffer", opts);
+            if (!buffer.isNil() && !(buffer instanceof RubyString)) {
+                throw runtime.newTypeError("buffer must be String, not " + buffer.getType().getName());
+            }
+            if (buffer.isNil()) {
                 str = buffer.convertToString();
             } else {
                 str = RubyString.newString(runtime, "");

diff --git a/core/src/main/java/org/jruby/RubyRange.java b/core/src/main/java/org/jruby/RubyRange.java
@@ -273,6 +273,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block u
         if (this.isInited) {
             throw context.runtime.newNameError("`initialize' called twice", "initialize");
         }
+        checkFrozen();
         init(context, args[0], args[1], args.length > 2 && args[2].isTrue());
         return context.nil;
     }
@@ -878,8 +879,8 @@ public void marshalTo(Ruby runtime, Object obj, RubyClass type,
             marshalStream.registerLinkTarget(range);
             List<Variable<Object>> attrs = range.getVariableList();
 
-            attrs.add(new VariableEntry<Object>("begin", range.begin));
-            attrs.add(new VariableEntry<Object>("end", range.end));
+            attrs.add(new VariableEntry<Object>("begini", range.begin));
+            attrs.add(new VariableEntry<Object>("endi", range.end));
             attrs.add(new VariableEntry<Object>("excl", range.isExclusive ? runtime.getTrue() : runtime.getFalse()));
 
             marshalStream.dumpVariables(attrs);
@@ -895,9 +896,21 @@ public Object unmarshalFrom(Ruby runtime, RubyClass type,
             // FIXME: Maybe we can just gank these off the line directly?
             unmarshalStream.defaultVariablesUnmarshal(range);
 
-            range.begin = (IRubyObject) range.removeInternalVariable("begin");
-            range.end = (IRubyObject) range.removeInternalVariable("end");
-            range.isExclusive = ((IRubyObject) range.removeInternalVariable("excl")).isTrue();
+            IRubyObject begin = (IRubyObject) range.removeInternalVariable("begini");
+            IRubyObject end = (IRubyObject) range.removeInternalVariable("endi");
+            IRubyObject excl = (IRubyObject) range.removeInternalVariable("excl");
+
+            // try old names as well
+            if (begin == null) begin = (IRubyObject) range.removeInternalVariable("begin");
+            if (end == null) end = (IRubyObject) range.removeInternalVariable("end");
+
+            if (begin == null || end == null || excl == null) {
+                throw runtime.newArgumentError("bad value for range");
+            }
+
+            range.begin = begin;
+            range.end = end;
+            range.isExclusive = excl.isTrue();
 
             return range;
         }

diff --git a/core/src/main/ruby/jruby/kernel/proc.rb b/core/src/main/ruby/jruby/kernel/proc.rb
@@ -65,7 +65,7 @@ def self.__make_curry_proc__(proc, passed, arity)
         end
         __make_curry_proc__(proc, my_passed, arity)
       else
-        proc.call(*my_passed)
+        proc.call(*my_passed, &passed_proc)
       end
     end