[Truffle] Fix a couple cases of Module#class_variable_get.

jruby · Apr 20, 2015 · c0a8a73 · c0a8a73
1 parent ff7a1d0
commit c0a8a73
Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/spec/truffle/tags/core/module/class_variable_get_tags.txt b/spec/truffle/tags/core/module/class_variable_get_tags.txt
@@ -1,9 +1,6 @@
 fails:Module#class_variable_get returns the value of the class variable with the given name
-fails:Module#class_variable_get raises a NameError for a class variable named '@@'
-fails:Module#class_variable_get raises a NameError for a class variables with the given name defined in an extended module
 fails:Module#class_variable_get returns class variables defined in the metaclass and accessed by class methods
 fails:Module#class_variable_get returns class variables defined in the metaclass and accessed by instance methods
 fails:Module#class_variable_get returns a class variable defined in a metaclass
-fails:Module#class_variable_get raises a NameError when an uninitialized class variable is accessed
 fails:Module#class_variable_get converts a non string/symbol/fixnum name to string using to_str
 fails:Module#class_variable_get raises a TypeError when the given names can't be converted to strings using to_str
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
@@ -737,7 +737,8 @@ public boolean isClassVariableDefined(RubyModule module, RubySymbol name) {
     }
 
     @CoreMethod(names = "class_variable_get", required = 1)
-    public abstract static class ClassVariableGetNode extends CoreMethodNode {
+    @NodeChildren({ @NodeChild("module"), @NodeChild("name") })
+    public abstract static class ClassVariableGetNode extends RubyNode {
 
         public ClassVariableGetNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
@@ -747,16 +748,24 @@ public ClassVariableGetNode(ClassVariableGetNode prev) {
             super(prev);
         }
 
-        @Specialization
-        public Object getClassVariable(RubyModule module, RubyString name) {
-            notDesignedForCompilation();
-            return ModuleOperations.lookupClassVariable(module, RubyContext.checkClassVariableName(getContext(), name.toString(), this));
+        @CreateCast("name")
+        public RubyNode coerceToString(RubyNode name) {
+            return SymbolOrToStrNodeFactory.create(getContext(), getSourceSection(), name);
         }
 
         @Specialization
-        public Object getClassVariable(RubyModule module, RubySymbol name) {
+        public Object getClassVariable(RubyModule module, String name) {
             notDesignedForCompilation();
-            return ModuleOperations.lookupClassVariable(module, RubyContext.checkClassVariableName(getContext(), name.toString(), this));
+
+            RubyContext.checkClassVariableName(getContext(), name, this);
+            Object value = ModuleOperations.lookupClassVariable(module, name);
+
+            if (value == null) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().nameErrorUninitializedClassVariable(module, name, this));
+            } else {
+                return value;
+            }
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -867,6 +867,11 @@ public RubyException nameErrorUninitializedConstant(RubyModule module, String na
         return nameError(String.format("uninitialized constant %s::%s", module.getName(), name), name, currentNode);
     }
 
+    public RubyException nameErrorUninitializedClassVariable(RubyModule module, String name, Node currentNode) {
+        CompilerAsserts.neverPartOfCompilation();
+        return nameError(String.format("uninitialized class variable %s in %s", name, module.getName()), name, currentNode);
+    }
+
     public RubyException nameErrorPrivateConstant(RubyModule module, String name, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
         return nameError(String.format("private constant %s::%s referenced", module.getName(), name), name, currentNode);