jruby · Dec 22, 2017 · Dec 22, 2017 · Dec 22, 2017 · Dec 22, 2017 · Dec 22, 2017
diff --git a/core/src/main/java/org/jruby/RubyArgsFile.java b/core/src/main/java/org/jruby/RubyArgsFile.java
@@ -46,7 +46,9 @@
 import org.jruby.exceptions.RaiseException;
 import org.jruby.internal.runtime.GlobalVariable;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.CallSite;
 import org.jruby.runtime.IAccessor;
+import org.jruby.runtime.JavaSites;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -444,6 +446,28 @@ public static IRubyObject each_charCommon(ThreadContext context, IRubyObject rec
         return recv;
     }
 
+    @JRubyMethod
+    public static IRubyObject each_codepoint(ThreadContext context, IRubyObject recv, Block block) {
+        if (!block.isGiven()) return RubyEnumerator.enumeratorize(context.runtime, recv, "each_line");
+        ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
+
+        CallSite each_codepoint = sites(context).each_codepoint;
+        while (data.next_argv(context)) {
+            each_codepoint.call(context, recv, data.currentFile, block);
+        }
+
+        return context.nil;
+    }
+
+    @JRubyMethod
+    public static IRubyObject codepoints(ThreadContext context, IRubyObject recv, Block block) {
+        context.runtime.getWarnings().warn("ARGF#codepoints is deprecated; use #each_codepoint instead");
+
+        if (!block.isGiven()) return RubyEnumerator.enumeratorize(context.runtime, recv, "each_line");
+
+        return each_codepoint(context, recv, block);
+    }
+
     /** Invoke a block for each line.
      *
      */
@@ -809,4 +833,8 @@ private static RubyIO getCurrentDataFile(ThreadContext context, String errorMess
 
         return (RubyIO) data.currentFile;
     }
+
+    private static JavaSites.ArgfSites sites(ThreadContext context) {
+        return context.sites.Argf;
+    }
 }
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -1432,7 +1432,7 @@ public IRubyObject each_key(final ThreadContext context, final Block block) {
 
     @JRubyMethod(name = "transform_values")
     public IRubyObject transform_values(final ThreadContext context, final Block block) {
-        return ((RubyHash)dup()).transform_values_bang(context, block);
+        return (new RubyHash(context.runtime, context.runtime.getHash(), this)).transform_values_bang(context, block);
     }
 
     @JRubyMethod(name = "transform_values!")

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -3813,7 +3813,10 @@ public static IRubyObject readlines(ThreadContext context, IRubyObject recv, IRu
         IRubyObject io = openKeyArgs(context, recv, args, opt);
         if (io.isNil()) return io;
 
-        IRubyObject[] methodArguments = processReadlinesMethodArguments(context, args);
+        IRubyObject[] methodArguments = Arrays.copyOfRange(args, 1, args.length);
+
+        // replace with coerced, so we don't coerce again later
+        if (!opt.isNil()) methodArguments[methodArguments.length - 1] = opt;
 
         return readlinesCommon(context, (RubyIO) io, methodArguments);
     }

diff --git a/core/src/main/java/org/jruby/anno/TypePopulator.java b/core/src/main/java/org/jruby/anno/TypePopulator.java
@@ -95,18 +95,18 @@ public void populate(final RubyModule target, final Class clazz) {
                 final String name = entry.getKey();
                 final List<JavaMethodDescriptor> methods = entry.getValue();
                 target.defineAnnotatedMethod(name, methods, methodFactory);
-                addBoundMethodsUnlessOmited(runtime, name, methods);
+                addBoundMethodsUnlessOmitted(runtime, name, methods);
             }
 
             for (Map.Entry<String, List<JavaMethodDescriptor>> entry : clumper.getAnnotatedMethods().entrySet()) {
                 final String name = entry.getKey();
                 final List<JavaMethodDescriptor> methods = entry.getValue();
                 target.defineAnnotatedMethod(name, methods, methodFactory);
-                addBoundMethodsUnlessOmited(runtime, name, methods);
+                addBoundMethodsUnlessOmitted(runtime, name, methods);
             }
         }
 
-        private static void addBoundMethodsUnlessOmited(final Ruby runtime, final String name, final List<JavaMethodDescriptor> methods) {
+        private static void addBoundMethodsUnlessOmitted(final Ruby runtime, final String name, final List<JavaMethodDescriptor> methods) {
             final int size = methods.size();
             if ( size == 1 ) {
                 final JavaMethodDescriptor desc = methods.get(0);

diff --git a/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java b/core/src/main/java/org/jruby/ext/tracepoint/TracePoint.java
@@ -12,12 +12,14 @@
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.EventHook;
+import org.jruby.runtime.JavaSites;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.RubyEvent;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.Visibility;
+import org.jruby.util.TypeConverter;
 
 public class TracePoint extends RubyObject {
     public static void createTracePointClass(Ruby runtime) {
@@ -47,40 +49,39 @@ public TracePoint(Ruby runtime, RubyClass klass) {
     public IRubyObject initialize(ThreadContext context, IRubyObject[] _events, final Block block) {
         final Ruby runtime = context.runtime;
 
-        if (!block.isGiven()) throw runtime.newThreadError("must be called with a block");
+        if (!block.isGiven()) throw runtime.newArgumentError("must be called with a block");
 
         ArrayList<RubyEvent> events = new ArrayList<RubyEvent>(_events.length);
         for (int i = 0; i < _events.length; i++) {
-            IRubyObject _event = _events[i];
-            if (_event instanceof RubySymbol || _event instanceof RubyString) {
-                String eventName = _event.asJavaString().toUpperCase();
-                RubyEvent event = null;
-                try {
-                    event = RubyEvent.valueOf(eventName);
-                } catch (IllegalArgumentException iae) {}
-
-                if (event == null) throw runtime.newArgumentError("unknown event: " + eventName);
-
-                // a_call is call | b_call | c_call, and same as a_return.
-                if (event == RubyEvent.A_CALL) {
-                    events.add(RubyEvent.CALL);
-                    events.add(RubyEvent.B_CALL);
-                    events.add(RubyEvent.C_CALL);
-                } else if (event == RubyEvent.A_RETURN) {
-                    events.add(RubyEvent.RETURN);
-                    events.add(RubyEvent.B_RETURN);
-                    events.add(RubyEvent.C_RETURN);
-                } else {
-                    events.add(event);
-                }
+            RubySymbol _event = (RubySymbol) TypeConverter.convertToType(context, _events[i], runtime.getSymbol(), sites(context).to_sym);
+
+            String eventName = _event.asJavaString().toUpperCase();
+            RubyEvent event = null;
+            try {
+                event = RubyEvent.valueOf(eventName);
+            } catch (IllegalArgumentException iae) {}
+
+            if (event == null) throw runtime.newArgumentError("unknown event: " + eventName);
+
+            // a_call is call | b_call | c_call, and same as a_return.
+            if (event == RubyEvent.A_CALL) {
+                events.add(RubyEvent.CALL);
+                events.add(RubyEvent.B_CALL);
+                events.add(RubyEvent.C_CALL);
+            } else if (event == RubyEvent.A_RETURN) {
+                events.add(RubyEvent.RETURN);
+                events.add(RubyEvent.B_RETURN);
+                events.add(RubyEvent.C_RETURN);
+            } else {
+                events.add(event);
             }
         }
 
         EnumSet<RubyEvent> _eventSet;
         if (events.size() > 0) {
             _eventSet = EnumSet.copyOf(events);
         } else {
-            _eventSet = EnumSet.allOf(RubyEvent.class);
+            _eventSet = EnumSet.of(RubyEvent.LINE);
         }
 
         final EnumSet<RubyEvent> eventSet = _eventSet;
@@ -133,7 +134,7 @@ public boolean isInterestedInEvent(RubyEvent event) {
     public IRubyObject binding(ThreadContext context) {
         checkInside(context);
 
-        return context.nil;
+        return binding == null ? context.nil : binding;
     }
 
     @JRubyMethod
@@ -186,7 +187,16 @@ public IRubyObject lineno(ThreadContext context) {
     public IRubyObject method_id(ThreadContext context) {
         checkInside(context);
 
-        return name == null ? context.nil : context.runtime.newString(name);
+        return name == null ? context.nil : context.runtime.newSymbol(name);
+    }
+
+    @JRubyMethod
+    public IRubyObject callee_id(ThreadContext context) {
+        checkInside(context);
+
+        // TODO: actually get called name, requires modifying trace handling in bindings
+
+        return name == null ? context.nil : context.runtime.newSymbol(name);
     }
 
     @JRubyMethod
@@ -268,6 +278,10 @@ public void updateEnabled(ThreadContext context, boolean toggle) {
     private void checkInside(ThreadContext context) throws RaiseException {
         if (!inside) throw context.runtime.newRuntimeError("access from outside");
     }
+
+    private static JavaSites.TracePointSites sites(ThreadContext context) {
+        return context.sites.TracePoint;
+    }
 
     private EventHook hook;
     private volatile boolean enabled = false;

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRDumper.java b/core/src/main/java/org/jruby/ir/persistence/IRDumper.java
@@ -372,7 +372,7 @@ private void printAnsiOp(String c, String pre, Operand op) {
     }
 
     private void print(Object obj) {
-        if (obj.getClass().isArray()) {
+        if (obj != null && obj.getClass().isArray()) {
             if (obj.getClass().getComponentType().isPrimitive()) {
                 switch (obj.getClass().getName().charAt(0)) {
                     case 'B': stream.print(Arrays.toString((boolean[]) obj)); break;

diff --git a/core/src/main/java/org/jruby/runtime/JavaSites.java b/core/src/main/java/org/jruby/runtime/JavaSites.java
@@ -40,6 +40,8 @@ public class JavaSites {
     public final WarningSites Warning = new WarningSites();
     public final ZlibSites Zlib = new ZlibSites();
     public final TimeoutSites Timeout = new TimeoutSites();
+    public final ArgfSites Argf = new ArgfSites();
+    public final TracePointSites TracePoint = new TracePointSites();
 
     public static class BasicObjectSites {
         public final CallSite respond_to = new FunctionalCachingCallSite("respond_to?");
@@ -409,6 +411,14 @@ public static class TimeoutSites {
         public final CallSite timeout = new FunctionalCachingCallSite("timeout");
     }
 
+    public static class ArgfSites {
+        public final CallSite each_codepoint = new FunctionalCachingCallSite("each_codepoint");
+    }
+
+    public static class TracePointSites {
+        public final CheckedSites to_sym = new CheckedSites("to_sym");
+    }
+
     public static class CheckedSites {
         public final RespondToCallSite respond_to_X;
         public final CachingCallSite respond_to_missing = new FunctionalCachingCallSite("respond_to_missing?");

diff --git a/core/src/main/java/org/jruby/util/io/Getline.java b/core/src/main/java/org/jruby/util/io/Getline.java
@@ -68,6 +68,7 @@ public static <Self, Return extends IRubyObject> Return getlineCall(ThreadContex
                 sepArg = arg0;
                 limArg = arg1;
                 optArg = arg2;
+                break;
         }
 
         opt = ArgsUtil.getOptionsArg(context.runtime, optArg);
@@ -79,7 +80,7 @@ public static <Self, Return extends IRubyObject> Return getlineCall(ThreadContex
                 limArg = arg1;
             }
         } else {
-            IRubyObject chompKwarg = ArgsUtil.extractKeywordArg(context, "chomp", optArg);
+            IRubyObject chompKwarg = ArgsUtil.extractKeywordArg(context, "chomp", opt);
             if (chompKwarg != null) {
                 chomp = chompKwarg.isTrue();
             }

diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -1586,7 +1586,7 @@ public IRubyObject getlineFast(ThreadContext context, Encoding enc, RubyIO io, b
                     if (e != -1) {
                         pending = (int) (e - p + 1);
                         if (chomp) {
-                            chomplen = ((pending > 1 &&  pBytes[e - 1] == '\r')?1:0) + 1;
+                            chomplen = ((pending > 1 && pBytes[e - 1] == '\r')?1:0) + 1;
                         }
                     }
                     if (str == null) {

diff --git a/rakelib/commands.rake b/rakelib/commands.rake
@@ -114,6 +114,7 @@ def mspec(mspec_options = {}, java_options = {}, &code)
     arg :line => "-T -J-Demma.verbosity.level=silent"
     arg :line => "-T -J#{JVM_MODEL}" if JVM_MODEL
     arg :line => "-T -J-XX:MaxPermSize=512M" if ENV_JAVA["java.version"] !~ /\A1\.8/
+    arg :line => "-T --debug'"
     arg :line => "-f #{ms[:format]}"
     arg :line => "-B #{ms[:spec_config]}" if ms[:spec_config]
     arg :line => "#{ms[:spec_target]}" if ms[:spec_target]

diff --git a/spec/tags/ruby/core/array/pack/buffer_tags.txt b/spec/tags/ruby/core/array/pack/buffer_tags.txt
diff --git a/spec/tags/ruby/core/file/printf_tags.txt b/spec/tags/ruby/core/file/printf_tags.txt
@@ -0,0 +1,27 @@
+fails:File#printf integer formats u converts argument as a decimal number
+fails:File#printf float formats g otherwise cuts fraction part to have only 6 digits at all
+fails:File#printf float formats G otherwise cuts fraction part to have only 6 digits at all
+fails:File#printf float formats a converts floating point argument as [-]0xh.hhhhp[+-]dd
+fails:File#printf float formats a displays Float::INFINITY as Inf
+fails:File#printf float formats a displays Float::NAN as NaN
+fails:File#printf float formats A converts floating point argument as [-]0xh.hhhhp[+-]dd and use uppercase X and P
+fails:File#printf float formats A displays Float::INFINITY as Inf
+fails:File#printf float formats A displays Float::NAN as NaN
+fails:File#printf flags space applies to numeric formats bBdiouxXeEfgGaA leaves a space at the start of non-negative numbers
+fails:File#printf flags space applies to numeric formats bBdiouxXeEfgGaA does not leave a space at the start of negative numbers
+fails:File#printf flags space applies to numeric formats bBdiouxXeEfgGaA treats several white spaces as one
+fails:File#printf flags (digit)$ specifies the absolute argument number for this field
+fails:File#printf flags # applies to format o does nothing for negative argument
+fails:File#printf flags # applies to formats aAeEfgG forces a decimal point to be added, even if no digits follow
+fails:File#printf flags # applies to gG does not remove trailing zeros
+fails:File#printf flags + applies to numeric formats bBdiouxXaAeEfgG adds a leading plus sign to non-negative numbers
+fails:File#printf flags - left-justifies the result of conversion if width is specified
+fails:File#printf flags 0 (zero) applies to numeric formats bBdiouxXaAeEfgG and width is specified pads with zeros, not spaces
+fails:File#printf flags * uses the previous argument as the field width
+fails:File#printf flags * left-justifies the result if width is negative
+fails:File#printf flags * uses the specified argument as the width if * is followed by a number and $
+fails:File#printf flags * left-justifies the result if specified with $ argument is negative
+fails:File#printf flags * raises ArgumentError when is mixed with width
+fails:File#printf width specifies the minimum number of characters that will be written to the result
+fails:File#printf precision float types controls the number of decimal places displayed in fraction part
+fails:File#printf reference by name %{name} style supports flags, width and precision