[Truffle] Pass {public,private}_constant specs.

jruby · Apr 15, 2015 · 97e6e09 · 97e6e09
1 parent caeedd4
commit 97e6e09
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/spec/truffle/tags/core/module/private_constant_tags.txt b/spec/truffle/tags/core/module/private_constant_tags.txt
diff --git a/spec/truffle/tags/core/module/public_constant_tags.txt b/spec/truffle/tags/core/module/public_constant_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
@@ -1607,9 +1607,11 @@ public PrivateConstantNode(PrivateConstantNode prev) {
         public RubyModule privateConstant(RubyModule module, Object[] args) {
             notDesignedForCompilation();
 
-            for (Object ob : args) {
-                if (ob instanceof RubySymbol){
-                    module.changeConstantVisibility(this, (RubySymbol) ob, true);
+            for (Object name : args) {
+                if (name instanceof RubySymbol) {
+                    module.changeConstantVisibility(this, name.toString(), true);
+                } else {
+                    throw new UnsupportedOperationException();
                 }
             }
             return module;
@@ -1631,9 +1633,11 @@ public PublicConstantNode(PublicConstantNode prev) {
         public RubyModule publicConstant(RubyModule module, Object[] args) {
             notDesignedForCompilation();
 
-            for (Object ob : args) {
-                if (ob instanceof RubySymbol){
-                    module.changeConstantVisibility(this, (RubySymbol) ob, false);
+            for (Object name : args) {
+                if (name instanceof RubySymbol) {
+                    module.changeConstantVisibility(this, name.toString(), false);
+                } else {
+                    throw new UnsupportedOperationException();
                 }
             }
             return module;

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -346,17 +346,17 @@ public void alias(Node currentNode, String newName, String oldName) {
     }
 
     @TruffleBoundary
-    public void changeConstantVisibility(Node currentNode, RubySymbol constant, boolean isPrivate) {
+    public void changeConstantVisibility(Node currentNode, String name, boolean isPrivate) {
         RubyNode.notDesignedForCompilation();
 
-        RubyConstant rubyConstant = ModuleOperations.lookupConstant(getContext(), LexicalScope.NONE, this, constant.toString());
         checkFrozen(currentNode);
+        RubyConstant rubyConstant = constants.get(name);
 
         if (rubyConstant != null) {
             rubyConstant.setPrivate(isPrivate);
             newLexicalVersion();
         } else {
-            throw new RaiseException(context.getCoreLibrary().nameErrorUninitializedConstant(this, constant.toString(), currentNode));
+            throw new RaiseException(context.getCoreLibrary().nameErrorUninitializedConstant(this, name, currentNode));
         }
     }