jruby · Jan 6, 2015 · Jan 6, 2015 · Jan 6, 2015
Showing with 21 additions and 54 deletions.

+19 −9 core/src/main/java/org/jruby/AbstractRubyMethod.java

+0 −26 core/src/main/java/org/jruby/RubyMethod.java

+0 −17 core/src/main/java/org/jruby/RubyUnboundMethod.java

+2 −2 core/src/main/java/org/jruby/util/io/PosixShim.java
diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -36,11 +36,13 @@
 import org.jruby.ext.jruby.JRubyLibrary;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.ProcMethod;
+import org.jruby.internal.runtime.methods.UndefinedMethod;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.BlockBody;
 import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.CompiledBlockCallback19;
 import org.jruby.runtime.CompiledBlockLight19;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.PositionAware;
 import org.jruby.runtime.ThreadContext;
@@ -82,20 +84,15 @@ public RubyFixnum arity() {
         return getRuntime().newFixnum(method.getArity().getValue());
     }
 
-    @JRubyMethod(name = "eql?", required = 1, compat = CompatVersion.RUBY1_9)
+    @JRubyMethod(name = "eql?", required = 1)
     public IRubyObject op_eql19(ThreadContext context, IRubyObject other) {
         return op_equal(context, other);
     }
 
     public abstract AbstractRubyMethod rbClone();
 
-    @JRubyMethod(name = "name", compat = CompatVersion.RUBY1_8)
+    @JRubyMethod(name = "name")
     public IRubyObject name(ThreadContext context) {
-        return context.runtime.newString(methodName);
-    }
-
-    @JRubyMethod(name = "name", compat = CompatVersion.RUBY1_9)
-    public IRubyObject name19(ThreadContext context) {
         return context.runtime.newSymbol(methodName);
     }
 
@@ -108,7 +105,7 @@ public IRubyObject owner(ThreadContext context) {
         return implementationModule;
     }
 
-    @JRubyMethod(name = "source_location", compat = CompatVersion.RUBY1_9)
+    @JRubyMethod(name = "source_location")
     public IRubyObject source_location(ThreadContext context) {
         Ruby runtime = context.runtime;
 
@@ -138,9 +135,22 @@ public int getLine() {
         return -1;
     }
 
-    @JRubyMethod(name = "parameters", compat = CompatVersion.RUBY1_9)
+    @JRubyMethod(name = "parameters")
     public IRubyObject parameters(ThreadContext context) {
         return JRubyLibrary.MethodExtensions.methodArgs(this);
     }
+
+    protected IRubyObject super_method(ThreadContext context, IRubyObject receiver, RubyModule superClass) {
+        if (superClass == null) return context.runtime.getNil();
+
+        DynamicMethod newMethod = superClass.searchMethod(methodName);
+        if (newMethod == UndefinedMethod.INSTANCE) return context.runtime.getNil();
+
+        if (receiver == null) {
+            return RubyUnboundMethod.newUnboundMethod(superClass, methodName, superClass, originName, newMethod);
+        } else {
+            return RubyMethod.newMethod(superClass, methodName, superClass, originName, newMethod, receiver);
+        }
+    }
 }
 
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -246,19 +246,6 @@ public IRubyObject inspect() {
         return str;
     }
 
-    public IRubyObject name(ThreadContext context) {
-        return name19(context);
-    }
-
-    @JRubyMethod(name = "name")
-    public IRubyObject name19(ThreadContext context) {
-        return context.runtime.newSymbol(methodName);
-    }
-
-    public String getMethodName() {
-        return methodName;
-    }
-
     @JRubyMethod
     public IRubyObject receiver(ThreadContext context) {
         return receiver;
@@ -314,18 +301,5 @@ public IRubyObject super_method(ThreadContext context) {
         RubyModule superClass = Helpers.findImplementerIfNecessary(receiver.getMetaClass(), implementationModule).getSuperClass();
         return super_method(context, receiver, superClass);
     }
-
-    protected IRubyObject super_method(ThreadContext context, IRubyObject receiver, RubyModule superClass) {
-        if (superClass == null) return context.runtime.getNil();
-
-        DynamicMethod newMethod = superClass.searchMethod(methodName);
-        if (newMethod == UndefinedMethod.INSTANCE) return context.runtime.getNil();
-
-        if (receiver == null) {
-            return RubyUnboundMethod.newUnboundMethod(superClass, methodName, superClass, originName, newMethod);
-        } else {
-            return newMethod(superClass, methodName, superClass, originName, newMethod, receiver);
-        }
-    }
 }
 
diff --git a/core/src/main/java/org/jruby/RubyUnboundMethod.java b/core/src/main/java/org/jruby/RubyUnboundMethod.java
@@ -138,23 +138,6 @@ public IRubyObject inspect() {
         return str;
     }
 
-    @Override
-    public IRubyObject name(ThreadContext context) {
-        return name19(context);
-    }
-
-    @JRubyMethod(name = "name")
-    @Override
-    public IRubyObject name19(ThreadContext context) {
-        return context.runtime.newSymbol(methodName);
-    }
-
-    @JRubyMethod
-    @Override
-    public IRubyObject owner(ThreadContext context) {
-        return implementationModule;
-    }
-
     @JRubyMethod
     public IRubyObject super_method(ThreadContext context ) {
         return super_method(context, null, implementationModule.getSuperClass());

diff --git a/core/src/main/java/org/jruby/util/io/PosixShim.java b/core/src/main/java/org/jruby/util/io/PosixShim.java
@@ -83,8 +83,8 @@ public int write(ChannelFD fd, byte[] bytes, int offset, int length, boolean non
         try {
             if (nonblock) {
                 // TODO: figure out what nonblocking writes against atypical streams (files?) actually do
-                // Ff we can't set the channel nonblocking, I'm not sure what we can do to
-                // pretend the channel is blocking.
+                // If we can't set the channel nonblocking, I'm not sure what we can do to
+                // pretend the channel is nonblocking.
             }
 
             int written = fd.chWrite.write(tmp);