[Truffle] Implementing more Module#remove_method.

jruby · Apr 9, 2015 · f0b1605 · f0b1605
1 parent c1376d2
commit f0b1605
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/spec/truffle/tags/core/module/remove_method_tags.txt b/spec/truffle/tags/core/module/remove_method_tags.txt
@@ -1,6 +1,2 @@
-fails:Module#remove_method is a private method
-fails:Module#remove_method requires multiple arguments
-fails:Module#remove_method does not remove any instance methods when argument not given
 fails:Module#remove_method raises a NameError when attempting to remove method further up the inheritance tree
 fails:Module#remove_method raises a NameError when attempting to remove a missing method
-fails:Module#remove_method on frozen instance does not raise exceptions when no arguments given
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
@@ -1694,7 +1694,7 @@ Object removeConstant(RubyModule module, String name) {
 
     }
 
-    @CoreMethod(names = "remove_method", required = 1)
+    @CoreMethod(names = "remove_method", argumentsAsArray = true, visibility = Visibility.PRIVATE)
     public abstract static class RemoveMethodNode extends CoreMethodNode {
 
         public RemoveMethodNode(RubyContext context, SourceSection sourceSection) {
@@ -1706,18 +1706,24 @@ public RemoveMethodNode(RemoveMethodNode prev) {
         }
 
         @Specialization
-        public RubyModule removeMethod(RubyModule module, RubyString name) {
+        public RubyModule removeMethod(RubyModule module, Object[] args) {
             notDesignedForCompilation();
 
-            module.removeMethod(this, name.toString());
-            return module;
-        }
+            for (Object arg : args) {
+                final String name;
 
-        @Specialization
-        public RubyModule removeMethod(RubyModule module, RubySymbol name) {
-            notDesignedForCompilation();
+                if (arg instanceof RubySymbol) {
+                    name = ((RubySymbol) arg).toString();
+                } else if (arg instanceof RubyString) {
+                    name = ((RubyString) arg).toString();
+                } else {
+                    // TODO BF 9-APR-2015 the MRI message calls inspect for error message i think
+                    throw new RaiseException(getContext().getCoreLibrary().typeError(" is not a symbol", this));
+                }
+                module.removeMethod(this, name);
+
+            }
 
-            module.removeMethod(this, name.toString());
             return module;
         }