[Truffle] - Implementing Module#private_constant method

jruby · Apr 11, 2014 · ba4cf5b · ba4cf5b
1 parent 2966b95
commit ba4cf5b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 1 deletion.
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
@@ -648,7 +648,11 @@ public PrivateConstantNode(PrivateConstantNode prev) {
         @Specialization
         public RubyModule privateConstant(RubyModule module, Object[] args) {
             final Node callNode = (Node) args[args.length - 1];
-            getContext().getRuntime().getWarnings().warn(IRubyWarnings.ID.TRUFFLE, callNode.getSourceSection().getSource().getName(), callNode.getSourceSection().getStartLine(), "private_constant does nothing at the moment");
+            for (Object ob : args) {
+                if (ob instanceof RubySymbol){
+                    module.setConstantPrivate((RubySymbol) ob);
+                }
+            }
             return module;
         }
     }

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
@@ -251,6 +251,35 @@ public Object lookupConstant(String constantName) {
         return lookupParent.lookupConstant(constantName);
     }
 
+    public RubyConstant lookupRubyConstant(String constantName) {
+        Object value;
+        value = getConstants().get(constantName);
+
+        if (value instanceof RubyConstant) {
+            return ((RubyConstant) value);
+        }
+
+        if (parentModule != null) {
+            value = parentModule.lookupRubyConstant(constantName);
+        }
+
+        if (value instanceof RubyConstant) {
+            return ((RubyConstant) value);
+        }
+
+        return lookupParent.lookupRubyConstant(constantName);
+    }
+
+    public void setConstantPrivate(RubySymbol constant) {
+        RubyConstant rubyConstant = lookupRubyConstant(constant.toString());
+
+        if (rubyConstant != null) {
+            rubyConstant.isPrivate = true;
+        } else {
+            // raises an exception
+        }
+    }
+
     @Override
     public Object lookupClassVariable(String variableName) {
         // Look in this module

diff --git a/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupFork.java b/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupFork.java
@@ -53,6 +53,16 @@ public Object lookupConstant(String constantName) {
         return second.lookupConstant(constantName);
     }
 
+    public RubyModule.RubyConstant lookupRubyConstant(String constantName) {
+        final Object firstResult = first.lookupConstant(constantName);
+
+        if (firstResult instanceof RubyModule.RubyConstant) {
+            return ((RubyModule.RubyConstant) firstResult);
+        }
+
+        return second.lookupRubyConstant(constantName);
+    }
+
     @Override
     public Object lookupClassVariable(String classVariable) {
         final Object firstResult = first.lookupClassVariable(classVariable);

diff --git a/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupNode.java b/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupNode.java
@@ -12,6 +12,7 @@
 import java.util.*;
 
 import com.oracle.truffle.api.*;
+import org.jruby.truffle.runtime.core.RubyModule;
 import org.jruby.truffle.runtime.methods.*;
 
 /**
@@ -34,4 +35,6 @@ public interface LookupNode {
 
     void getMethods(Map<String, RubyMethod> methods);
 
+    RubyModule.RubyConstant lookupRubyConstant(String constantName);
+
 }
diff --git a/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupTerminal.java b/core/src/main/java/org/jruby/truffle/runtime/lookup/LookupTerminal.java
@@ -13,6 +13,7 @@
 
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.utilities.*;
+import org.jruby.truffle.runtime.core.RubyModule;
 import org.jruby.truffle.runtime.methods.*;
 
 /**
@@ -52,5 +53,6 @@ public Set<String> getClassVariables() {
 
     public void getMethods(Map<String, RubyMethod> methods) {
     }
+    public RubyModule.RubyConstant lookupRubyConstant(String name) { return null; }
 
 }