jruby · Jan 16, 2015 · Jan 16, 2015 · Jan 16, 2015 · Jan 16, 2015 · Jan 16, 2015
diff --git a/core/src/main/java/org/jruby/RubyEnumerable.java b/core/src/main/java/org/jruby/RubyEnumerable.java
@@ -968,21 +968,11 @@ public static IRubyObject each_with_index19(ThreadContext context, IRubyObject s
         return block.isGiven() ? each_with_indexCommon19(context, self, block, args) : enumeratorizeWithSize(context, self, "each_with_index", args, enumSizeFn(context, self));
     }
 
-    @JRubyMethod
-    public static IRubyObject enum_with_index(ThreadContext context, IRubyObject self, Block block) {
-        return block.isGiven() ? each_with_indexCommon(context, self, block) : enumeratorize(context.runtime, self, "enum_with_index");
-    }
-
     @JRubyMethod
     public static IRubyObject each_with_object(ThreadContext context, IRubyObject self, IRubyObject arg, Block block) {
         return block.isGiven() ? each_with_objectCommon19(context, self, block, arg) : enumeratorizeWithSize(context, self, "each_with_object", new IRubyObject[] { arg }, enumSizeFn(context, self));
     }
 
-    @JRubyMethod
-    public static IRubyObject with_object(ThreadContext context, IRubyObject self, final IRubyObject arg, final Block block) {
-        return block.isGiven() ? each_with_objectCommon19(context, self, block, arg) : enumeratorize(context.runtime, self, "with_object", arg);
-    }
-
     @JRubyMethod(rest = true)
     public static IRubyObject each_entry(ThreadContext context, final IRubyObject self, final IRubyObject[] args, final Block block) {
         return block.isGiven() ? each_entryCommon(context, self, args, block) : enumeratorizeWithSize(context, self, "each_entry", args, enumSizeFn(context, self));

diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -410,37 +410,6 @@ public static final FileTime getBirthtimeWithNIO(String pathString) {
         return null;
     }
 
-    @JRubyMethod(required = 1)
-    public IRubyObject lchmod(ThreadContext context, IRubyObject arg) {
-        int mode = (int) arg.convertToInteger().getLongValue();
-
-        if (!new File(getPath()).exists()) {
-            throw context.runtime.newErrnoENOENTError(getPath());
-        }
-
-        return context.runtime.newFixnum(context.runtime.getPosix().lchmod(getPath(), mode));
-    }
-
-    // TODO: this method is not present in MRI!
-    @JRubyMethod(required = 2)
-    public IRubyObject lchown(ThreadContext context, IRubyObject arg1, IRubyObject arg2) {
-        int owner = -1;
-        if (!arg1.isNil()) {
-            owner = RubyNumeric.num2int(arg1);
-        }
-
-        int group = -1;
-        if (!arg2.isNil()) {
-            group = RubyNumeric.num2int(arg2);
-        }
-
-        if (!new File(getPath()).exists()) {
-            throw context.runtime.newErrnoENOENTError(getPath());
-        }
-
-        return context.runtime.newFixnum(context.runtime.getPosix().lchown(getPath(), owner, group));
-    }
-
     @JRubyMethod
     public IRubyObject lstat(ThreadContext context) {
         checkClosed(context);

diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -342,18 +342,6 @@ public RubyString to_s(IRubyObject arg0) {
         return getRuntime().newString(bl);
     }
 
-    /** fix_id2name
-     * 
-     */
-    @JRubyMethod
-    public IRubyObject id2name() {
-        RubySymbol symbol = RubySymbol.getSymbolLong(getRuntime(), value);
-
-        if (symbol != null) return getRuntime().newString(symbol.asJavaString());
-
-        return getRuntime().getNil();
-    }
-
     /** fix_to_sym
      * 
      */
@@ -597,7 +585,6 @@ public RubyBoolean even_p(ThreadContext context) {
         return context.runtime.getFalse();
     }
 
-    @JRubyMethod
     public IRubyObject pred(ThreadContext context) {
         return context.runtime.newFixnum(value-1);
     }
@@ -1223,6 +1210,11 @@ public IRubyObject succ(ThreadContext context) {
         return ((RubyFixnum) this).op_plus_one(context);
     }
 
+    @JRubyMethod
+    public IRubyObject bit_length(ThreadContext context) {
+        return context.runtime.newFixnum(64 - Long.numberOfLeadingZeros(value));
+    }
+
     @Override
     public IRubyObject id() {
         if (value <= Long.MAX_VALUE / 2 && value >= Long.MIN_VALUE / 2) {

diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -1451,14 +1451,6 @@ public void visit(IRubyObject key, IRubyObject value) {
         return modified[0];
     }
 
-    /** rb_hash_sort
-     *
-     */
-    @JRubyMethod
-    public IRubyObject sort(ThreadContext context, Block block) {
-        return to_a().sort_bang(context, block);
-    }
-
     /** rb_hash_index
      *
      */
@@ -1494,14 +1486,6 @@ public void visit(IRubyObject key, IRubyObject value) {
         }
     }
 
-    /** rb_hash_indexes
-     *
-     */
-    @JRubyMethod(name = {"indexes", "indices"}, rest = true)
-    public RubyArray indices(ThreadContext context, IRubyObject[] indices) {
-        return values_at(context, indices);
-    }
-
     /** rb_hash_keys
      *
      */

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1038,13 +1038,6 @@ public Binding convertToBinding(IRubyObject scope) {
         }
     };
 
-
-    @JRubyMethod(module = true, visibility = PRIVATE)
-    public static IRubyObject callcc(ThreadContext context, IRubyObject recv, Block block) {
-        RubyContinuation continuation = new RubyContinuation(context.runtime);
-        return continuation.enter(context, continuation, block);
-    }
-
     public static IRubyObject caller(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         return caller20(context, recv, args, block);
     }
@@ -1627,7 +1620,7 @@ public static IRubyObject exec(ThreadContext context, IRubyObject recv, IRubyObj
     /* Actual exec definition which calls this internal version is specified 
      * in /core/src/main/ruby/jruby/kernel/kernel.rb.
      */
-    @JRubyMethod(required = 4, module = true, visibility = PRIVATE)
+    @JRubyMethod(required = 4, visibility = PRIVATE)
     public static IRubyObject _exec_internal(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Ruby runtime = context.runtime;
 

diff --git a/core/src/main/java/org/jruby/RubyMarshal.java b/core/src/main/java/org/jruby/RubyMarshal.java
@@ -44,6 +44,7 @@
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Constants;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.marshal.MarshalStream;
 import org.jruby.runtime.marshal.UnmarshalStream;
@@ -71,7 +72,7 @@ public static RubyModule createMarshalModule(Ruby runtime) {
         return module;
     }
 
-    @JRubyMethod(required = 1, optional = 2, module = true)
+    @JRubyMethod(required = 1, optional = 2, module = true, visibility = Visibility.PRIVATE)
     public static IRubyObject dump(IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
         Ruby runtime = recv.getRuntime();
         IRubyObject objectToDump = args[0];
@@ -119,7 +120,7 @@ private static void setBinmodeIfPossible(ThreadContext context, IRubyObject io)
         if (io.respondsTo("binmode")) io.callMethod(context, "binmode");
     }
 
-    @JRubyMethod(name = {"load", "restore"}, required = 1, optional = 1, module = true)
+    @JRubyMethod(name = {"load", "restore"}, required = 1, optional = 1, module = true, visibility = Visibility.PRIVATE)
     public static IRubyObject load(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
         Ruby runtime = context.runtime;
         IRubyObject in = args[0];

diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -34,6 +34,7 @@
 import org.jruby.ext.jruby.JRubyLibrary;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyClass;
+import org.jruby.internal.runtime.methods.AliasMethod;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.ProcMethod;
 import org.jruby.internal.runtime.methods.UndefinedMethod;
@@ -301,5 +302,13 @@ public IRubyObject super_method(ThreadContext context) {
         RubyModule superClass = Helpers.findImplementerIfNecessary(receiver.getMetaClass(), implementationModule).getSuperClass();
         return super_method(context, receiver, superClass);
     }
+
+    @JRubyMethod
+    public IRubyObject original_name(ThreadContext context) {
+        if (method instanceof AliasMethod) {
+            return context.runtime.newString(((AliasMethod)method).getOldName());
+        }
+        return name(context);
+    }
 }
 
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -2132,6 +2132,11 @@ public IRubyObject instance_method(IRubyObject symbol) {
         return newMethod(null, symbol.asJavaString(), false, null);
     }
 
+    @JRubyMethod(name = "public_instance_method", required = 1)
+    public IRubyObject public_instance_method(IRubyObject symbol) {
+        return newMethod(null, symbol.asJavaString(), false, PUBLIC);
+    }
+
     /** rb_class_protected_instance_methods
      *
      */

diff --git a/core/src/main/java/org/jruby/RubyProcess.java b/core/src/main/java/org/jruby/RubyProcess.java
@@ -188,7 +188,7 @@ public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
             return invokedynamic(context, runtime.newFixnum(status), MethodNames.OP_EQUAL, other);
         }
 
-        @JRubyMethod(name = {"to_i", "to_int"})
+        @JRubyMethod(name = {"to_i"})
         public IRubyObject to_i(ThreadContext context) {
             return to_i(context.runtime);
         }
@@ -315,7 +315,7 @@ public IRubyObject to_i() {
 
     @JRubyModule(name="Process::UID")
     public static class UserID {
-        @JRubyMethod(name = "change_privilege", module = true)
+        @JRubyMethod(name = "change_privilege", module = true, visibility = PRIVATE)
         public static IRubyObject change_privilege(IRubyObject self, IRubyObject arg) {
             throw self.getRuntime().newNotImplementedError("Process::UID::change_privilege not implemented yet");
         }
@@ -324,7 +324,7 @@ public static IRubyObject change_privilege(IRubyObject self, IRubyObject arg) {
         public static IRubyObject eid(IRubyObject self) {
             return euid(self.getRuntime());
         }
-        @JRubyMethod(name = "eid", module = true)
+        @JRubyMethod(name = "eid", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self) {
             return euid(context.runtime);
         }
@@ -333,25 +333,25 @@ public static IRubyObject eid(ThreadContext context, IRubyObject self) {
         public static IRubyObject eid(IRubyObject self, IRubyObject arg) {
             return eid(self.getRuntime(), arg);
         }
-        @JRubyMethod(name = "eid=", module = true)
+        @JRubyMethod(name = "eid=", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self, IRubyObject arg) {
             return eid(context.runtime, arg);
         }
         public static IRubyObject eid(Ruby runtime, IRubyObject arg) {
             return euid_set(runtime, arg);
         }
 
-        @JRubyMethod(name = "grant_privilege", module = true)
+        @JRubyMethod(name = "grant_privilege", module = true, visibility = PRIVATE)
         public static IRubyObject grant_privilege(IRubyObject self, IRubyObject arg) {
             throw self.getRuntime().newNotImplementedError("Process::UID::grant_privilege not implemented yet");
         }
 
-        @JRubyMethod(name = "re_exchange", module = true)
+        @JRubyMethod(name = "re_exchange", module = true, visibility = PRIVATE)
         public static IRubyObject re_exchange(ThreadContext context, IRubyObject self) {
             return switch_rb(context, self, Block.NULL_BLOCK);
         }
 
-        @JRubyMethod(name = "re_exchangeable?", module = true)
+        @JRubyMethod(name = "re_exchangeable?", module = true, visibility = PRIVATE)
         public static IRubyObject re_exchangeable_p(IRubyObject self) {
             throw self.getRuntime().newNotImplementedError("Process::UID::re_exchangeable? not implemented yet");
         }
@@ -360,15 +360,15 @@ public static IRubyObject re_exchangeable_p(IRubyObject self) {
         public static IRubyObject rid(IRubyObject self) {
             return rid(self.getRuntime());
         }
-        @JRubyMethod(name = "rid", module = true)
+        @JRubyMethod(name = "rid", module = true, visibility = PRIVATE)
         public static IRubyObject rid(ThreadContext context, IRubyObject self) {
             return rid(context.runtime);
         }
         public static IRubyObject rid(Ruby runtime) {
             return uid(runtime);
         }
 
-        @JRubyMethod(name = "sid_available?", module = true)
+        @JRubyMethod(name = "sid_available?", module = true, visibility = PRIVATE)
         public static IRubyObject sid_available_p(IRubyObject self) {
             throw self.getRuntime().newNotImplementedError("Process::UID::sid_available not implemented yet");
         }
@@ -400,7 +400,7 @@ public static IRubyObject switch_rb(ThreadContext context, IRubyObject self, Blo
 
     @JRubyModule(name="Process::GID")
     public static class GroupID {
-        @JRubyMethod(name = "change_privilege", module = true)
+        @JRubyMethod(name = "change_privilege", module = true, visibility = PRIVATE)
         public static IRubyObject change_privilege(IRubyObject self, IRubyObject arg) {
             throw self.getRuntime().newNotImplementedError("Process::GID::change_privilege not implemented yet");
         }
@@ -409,7 +409,7 @@ public static IRubyObject change_privilege(IRubyObject self, IRubyObject arg) {
         public static IRubyObject eid(IRubyObject self) {
             return eid(self.getRuntime());
         }
-        @JRubyMethod(name = "eid", module = true)
+        @JRubyMethod(name = "eid", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self) {
             return eid(context.runtime);
         }
@@ -421,25 +421,25 @@ public static IRubyObject eid(Ruby runtime) {
         public static IRubyObject eid(IRubyObject self, IRubyObject arg) {
             return eid(self.getRuntime(), arg);
         }
-        @JRubyMethod(name = "eid=", module = true)
+        @JRubyMethod(name = "eid=", module = true, visibility = PRIVATE)
         public static IRubyObject eid(ThreadContext context, IRubyObject self, IRubyObject arg) {
             return eid(context.runtime, arg);
         }
         public static IRubyObject eid(Ruby runtime, IRubyObject arg) {
             return RubyProcess.egid_set(runtime, arg);
         }
 
-        @JRubyMethod(name = "grant_privilege", module = true)
+        @JRubyMethod(name = "grant_privilege", module = true, visibility = PRIVATE)
         public static IRubyObject grant_privilege(IRubyObject self, IRubyObject arg) {
             throw self.getRuntime().newNotImplementedError("Process::GID::grant_privilege not implemented yet");
         }
 
-        @JRubyMethod(name = "re_exchange", module = true)
+        @JRubyMethod(name = "re_exchange", module = true, visibility = PRIVATE)
         public static IRubyObject re_exchange(ThreadContext context, IRubyObject self) {
             return switch_rb(context, self, Block.NULL_BLOCK);
         }
 
-        @JRubyMethod(name = "re_exchangeable?", module = true)
+        @JRubyMethod(name = "re_exchangeable?", module = true, visibility = PRIVATE)
         public static IRubyObject re_exchangeable_p(IRubyObject self) {
             throw self.getRuntime().newNotImplementedError("Process::GID::re_exchangeable? not implemented yet");
         }
@@ -448,15 +448,15 @@ public static IRubyObject re_exchangeable_p(IRubyObject self) {
         public static IRubyObject rid(IRubyObject self) {
             return rid(self.getRuntime());
         }
-        @JRubyMethod(name = "rid", module = true)
+        @JRubyMethod(name = "rid", module = true, visibility = PRIVATE)
         public static IRubyObject rid(ThreadContext context, IRubyObject self) {
             return rid(context.runtime);
         }
         public static IRubyObject rid(Ruby runtime) {
             return gid(runtime);
         }
 
-        @JRubyMethod(name = "sid_available?", module = true)
+        @JRubyMethod(name = "sid_available?", module = true, visibility = PRIVATE)
         public static IRubyObject sid_available_p(IRubyObject self) {
             throw self.getRuntime().newNotImplementedError("Process::GID::sid_available not implemented yet");
         }

diff --git a/core/src/main/java/org/jruby/RubySignal.java b/core/src/main/java/org/jruby/RubySignal.java
@@ -58,7 +58,7 @@ public static void createSignal(Ruby runtime) {
         //registerThreadDumpSignalHandler(runtime);
     }
 
-    @JRubyMethod(module = true)
+    @JRubyMethod(meta = true)
     public static IRubyObject list(ThreadContext context, IRubyObject recv) {
         Ruby runtime = recv.getRuntime();
         RubyHash names = RubyHash.newHash(runtime);
@@ -79,27 +79,27 @@ public static IRubyObject list(ThreadContext context, IRubyObject recv) {
         return names;
     }
 
-    @JRubyMethod(required = 2, module = true)
+    @JRubyMethod(required = 2, meta = true)
     public static IRubyObject __jtrap_kernel(final IRubyObject recv, IRubyObject block, IRubyObject sig) {
         return SIGNALS.trap(recv, block, sig);
     }
 
-    @JRubyMethod(required = 1, module = true)
+    @JRubyMethod(required = 1, meta = true)
     public static IRubyObject __jtrap_platform_kernel(final IRubyObject recv, IRubyObject sig) {
         return SIGNALS.restorePlatformDefault(recv, sig);
     }
 
-    @JRubyMethod(required = 1, module = true)
+    @JRubyMethod(required = 1, meta = true)
     public static IRubyObject __jtrap_osdefault_kernel(final IRubyObject recv, IRubyObject sig) {
         return SIGNALS.restoreOSDefault(recv, sig);
     }
 
-    @JRubyMethod(required = 1, module = true)
+    @JRubyMethod(required = 1, meta = true)
     public static IRubyObject __jtrap_restore_kernel(final IRubyObject recv, IRubyObject sig) {
         return SIGNALS.ignore(recv, sig);
     }
 
-    @JRubyMethod(required = 1, module = true)
+    @JRubyMethod(required = 1, meta = true)
     public static IRubyObject signame(ThreadContext context, final IRubyObject recv, IRubyObject rubySig) {
         long sig = rubySig.convertToInteger().getLongValue();
         String signame = signo2signm(sig);