Merge branch 'fix_method_inspect_4995' into jruby-9.1

headius · headius · commit b85fa82974db · 2018-01-24T09:40:26.000-06:00
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -217,35 +217,62 @@ public RubyUnboundMethod unbind() {
     @JRubyMethod(name = {"inspect", "to_s"})
     @Override
     public IRubyObject inspect() {
-        StringBuilder buf = new StringBuilder("#<");
-        char delimeter = '#';
-        
-        buf.append(getMetaClass().getRealClass().getName()).append(": ");
+        Ruby runtime = getRuntime();
+        ThreadContext context = runtime.getCurrentContext();
+
+        RubyString str = RubyString.newString(runtime, "#<");
+        String sharp = "#";
         
+        str.catString(getType().getName()).catString(": ");
+
+        RubyModule definedClass;
+        RubyModule mklass = method.getImplementationClass();
+
+        if (method instanceof AliasMethod) {
+            definedClass = method.getRealMethod().getImplementationClass();
+        }
+        else {
+            definedClass = method.getDefinedClass();
+        }
+
+        if (definedClass.isIncluded()) {
+            definedClass = definedClass.getMetaClass();
+        }
+
         if (implementationModule.isSingleton()) {
             IRubyObject attached = ((MetaClass) implementationModule).getAttached();
             if (receiver == null) {
-                buf.append(implementationModule.inspect().toString());
+                str.cat19(inspect(context, implementationModule).convertToString());
             } else if (receiver == attached) {
-                buf.append(attached.inspect().toString());
-                delimeter = '.';
+                str.cat19(inspect(context, attached).convertToString());
+                sharp = ".";
             } else {
-                buf.append(receiver.inspect().toString());
-                buf.append('(').append(attached.inspect().toString()).append(')');
-                delimeter = '.';
+                str.cat19(inspect(context, receiver).convertToString());
+                str.catString("(");
+                str.cat19(inspect(context, attached).convertToString());
+                str.catString(")");
+                sharp = ".";
             }
         } else {
-            buf.append(originModule.getName());
-            
+            str.catString(originModule.getName());
             if (implementationModule != originModule) {
-                buf.append('(').append(implementationModule.getName()).append(')');
+                str.catString("(");
+                str.catString(implementationModule.getName());
+                str.catString(")");
             }
         }
-        
-        buf.append(delimeter).append(methodName).append('>');
-        
-        RubyString str = getRuntime().newString(buf.toString());
-        str.setTaint(isTaint());
+        str.catString(sharp);
+        str.catString(this.methodName);
+        if (!methodName.equals(method.getName())) {
+            str.catString("(");
+            str.catString(method.getName());
+            str.catString(")");
+        }
+        if (method.isNotImplemented()) {
+            str.catString(" (not-implemented)");
+        }
+        str.catString(">");
+
         return str;
     }
 
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -1215,6 +1215,11 @@ public final void addMethodAtBootTimeOnly(String name, DynamicMethod method) {
             method.setImplementationClass(methodLocation);
         }
 
+        // if method does not have a name already, set it
+        if (method.getName() == null) {
+            method.setName(name);
+        }
+
         methodLocation.getMethodsForWrite().put(name, method);
 
         getRuntime().addProfiledMethod(name, method);
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1341,6 +1341,11 @@ public final int cat19(ByteList other, int codeRange) {
         return ptr_cr_ret[0];
     }
 
+    public final RubyString catString(String str) {
+        cat19(encodeBytelist(str, getEncoding()), CR_UNKNOWN);
+        return this;
+    }
+
     public final RubyString cat(RubyString str) {
         return cat(str.getByteList());
     }

Original file line number	Diff line number	Diff line change
`@@ -1341,6 +1341,11 @@ public final int cat19(ByteList other, int codeRange) {`
`1341`	`1341`	`return ptr_cr_ret[0];`
`1342`	`1342`	`}`
`1343`	`1343`
	`1344`	`+ public final RubyString catString(String str) {`
	`1345`	`+ cat19(encodeBytelist(str, getEncoding()), CR_UNKNOWN);`
	`1346`	`+ return this;`
	`1347`	`+ }`
	`1348`	`+`
`1344`	`1349`	`public final RubyString cat(RubyString str) {`
`1345`	`1350`	`return cat(str.getByteList());`
`1346`	`1351`	`}`