[Truffle] Rename RubyMethod.withNewVisibility to just withVisibility.

* The semantics are better reflected with that name.
jruby · Oct 13, 2014 · 4db3eb0 · 4db3eb0
1 parent 754bf41
commit 4db3eb0
Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java b/core/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
@@ -173,7 +173,7 @@ private static void addMethod(RubyClass rubyObjectClass, MethodDetails methodDet
     }
 
     private static void addMethod(RubyModule module, RubyMethod method, List<String> aliases, Visibility visibility) {
-        method = method.withNewVisibility(visibility);
+        method = method.withVisibility(visibility);
 
         module.addMethod(null, method);
         for (String alias : aliases) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -775,7 +775,7 @@ public NilPlaceholder moduleFunction(RubyModule module, Object... args) {
                         throw new UnsupportedOperationException();
                     }
 
-                    module.getSingletonClass(this).addMethod(this, method.withNewVisibility(Visibility.PUBLIC));
+                    module.getSingletonClass(this).addMethod(this, method.withVisibility(Visibility.PUBLIC));
                 }
             }
 
@@ -886,7 +886,7 @@ public RubyModule publicClassMethod(RubyModule module, Object... args) {
                     throw new RuntimeException("Couldn't find method " + arg.toString());
                 }
 
-                moduleSingleton.addMethod(this, method.withNewVisibility(Visibility.PUBLIC));
+                moduleSingleton.addMethod(this, method.withVisibility(Visibility.PUBLIC));
             }
 
             return module;
@@ -945,7 +945,7 @@ public RubyModule privateClassMethod(RubyModule module, Object... args) {
                     throw new RuntimeException("Couldn't find method " + arg.toString());
                 }
 
-                moduleSingleton.addMethod(this, method.withNewVisibility(Visibility.PRIVATE));
+                moduleSingleton.addMethod(this, method.withVisibility(Visibility.PRIVATE));
             }
 
             return module;

diff --git a/core/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java b/core/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java
@@ -9,10 +9,8 @@
  */
 package org.jruby.truffle.nodes.methods;
 
-import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.frame.*;
-import com.oracle.truffle.api.nodes.*;
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.*;
 import org.jruby.truffle.runtime.*;
@@ -71,8 +69,8 @@ public Object execute(VirtualFrame frame) {
         final RubyMethod methodWithDeclaringModule = methodObject.withDeclaringModule(module);
 
         if (moduleFunctionFlag) {
-            module.addMethod(this, methodWithDeclaringModule.withNewVisibility(Visibility.PRIVATE));
-            module.getSingletonClass(this).addMethod(this, methodWithDeclaringModule.withNewVisibility(Visibility.PUBLIC));
+            module.addMethod(this, methodWithDeclaringModule.withVisibility(Visibility.PRIVATE));
+            module.getSingletonClass(this).addMethod(this, methodWithDeclaringModule.withVisibility(Visibility.PUBLIC));
         } else {
             module.addMethod(this, methodWithDeclaringModule);
         }

diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -19,7 +19,6 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.core.ArrayNodes;
-import org.jruby.truffle.nodes.core.MathNodes;
 import org.jruby.truffle.runtime.ModuleOperations;
 import org.jruby.truffle.runtime.NilPlaceholder;
 import org.jruby.truffle.runtime.RubyCallStack;
@@ -326,7 +325,7 @@ public void initializeAfterMethodsAdded() {
         // Just create a dummy object for $stdout - we can use Kernel#print and a special method TruffleDebug.flush_stdout
 
         final RubyBasicObject stdout = new RubyBasicObject(objectClass);
-        stdout.getSingletonClass(null).addMethod(null, ModuleOperations.lookupMethod(stdout.getMetaClass(), "print").withNewVisibility(Visibility.PUBLIC));
+        stdout.getSingletonClass(null).addMethod(null, ModuleOperations.lookupMethod(stdout.getMetaClass(), "print").withVisibility(Visibility.PUBLIC));
         stdout.getSingletonClass(null).addMethod(null, ModuleOperations.lookupMethod(truffleDebugModule.getSingletonClass(null), "flush_stdout").withNewName("flush"));
         globalVariablesObject.setInstanceVariable("$stdout", stdout);
 

diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/core/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -319,7 +319,7 @@ public void visibilityMethod(RubyNode currentNode, Object[] arguments, Visibilit
                  * a different visibility to this module.
                  */
 
-                addMethod(currentNode, method.withNewVisibility(visibility));
+                addMethod(currentNode, method.withVisibility(visibility));
             }
         }
     }

diff --git a/core/src/main/java/org/jruby/truffle/runtime/methods/RubyMethod.java b/core/src/main/java/org/jruby/truffle/runtime/methods/RubyMethod.java
@@ -78,7 +78,7 @@ public RubyMethod withNewName(String newName) {
         return new RubyMethod(sharedMethodInfo, newName, declaringModule, visibility, undefined, callTarget, declarationFrame);
     }
 
-    public RubyMethod withNewVisibility(Visibility newVisibility) {
+    public RubyMethod withVisibility(Visibility newVisibility) {
         if (newVisibility == visibility) {
             return this;
         } else {