[Truffle] Add more Module#private_class_method.

jruby · Apr 27, 2015 · 4a0cede · nirvdrum · Apr 28, 2015 · bjfish
1 parent 869a321
commit 4a0cede
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/spec/truffle/tags/core/module/private_class_method_tags.txt b/spec/truffle/tags/core/module/private_class_method_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -1464,14 +1464,19 @@ public RubyModule privateClassMethod(RubyModule module, Object... args) {
 
                 if (arg instanceof RubySymbol) {
                     methodName = arg.toString();
+                } else if (arg instanceof RubyString) {
+                    methodName = ((RubyString) arg).toString();
                 } else {
-                    throw new UnsupportedOperationException();
+                    // TODO BF 26-APR-2015 the message could be improved to match MRI
+                    CompilerDirectives.transferToInterpreter();
+                    throw new RaiseException(getContext().getCoreLibrary().typeError(" is not a symbol", this));
                 }
 
                 final InternalMethod method = ModuleOperations.lookupMethod(moduleSingleton, methodName);
 
                 if (method == null) {
-                    throw new RuntimeException("Couldn't find method " + arg.toString());
+                    CompilerDirectives.transferToInterpreter();
+                    throw new RaiseException(getContext().getCoreLibrary().nameErrorUndefinedMethod(methodName, module, this));
                 }
 
                 moduleSingleton.addMethod(this, method.withVisibility(Visibility.PRIVATE));
@@ -1923,6 +1928,7 @@ public RubyModule removeMethod(RubyModule module, Object[] args) {
                     name = ((RubyString) arg).toString();
                 } else {
                     // TODO BF 9-APR-2015 the MRI message calls inspect for error message i think
+                    CompilerDirectives.transferToInterpreter();
                     throw new RaiseException(getContext().getCoreLibrary().typeError(" is not a symbol", this));
                 }
                 module.removeMethod(this, name);