[Truffle] Proper exception for missing class var.

jruby · Jul 2, 2015 · 52250e5 · 52250e5
1 parent ebe28b9
commit 52250e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadClassVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadClassVariableNode.java
@@ -17,6 +17,7 @@
 import org.jruby.truffle.runtime.LexicalScope;
 import org.jruby.truffle.runtime.ModuleOperations;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyClass;
 import org.jruby.truffle.runtime.core.RubyModule;
 
@@ -48,9 +49,8 @@ public Object execute(VirtualFrame frame) {
         final Object value = ModuleOperations.lookupClassVariable(module, name);
 
         if (value == null) {
-            // TODO(CS): is this right?
-            // TODO: NameError!
-            return nil();
+            CompilerDirectives.transferToInterpreter();
+            throw new RaiseException(getContext().getCoreLibrary().nameErrorUninitializedClassVariable(module, name, this));
         }
 
         return value;