[Truffle] Differentiate partial names from fully-formed module names.

jruby · Jun 5, 2015 · 410cdee · 410cdee
1 parent 16d21c5
commit 410cdee
Showing 2 changed files with 6 additions and 2 deletions.
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
@@ -1276,7 +1276,7 @@ public NameNode(RubyContext context, SourceSection sourceSection) {
         public Object name(RubyModule module) {
             CompilerDirectives.transferToInterpreter();
 
-            if (!module.hasName()) {
+            if (!module.hasPartialName()) {
                 return nil();
             }
 

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
@@ -417,7 +417,11 @@ public String getName() {
     }
 
     public boolean hasName() {
-        return name != null || givenBaseName != null;
+        return name != null;
+    }
+
+    public boolean hasPartialName() {
+        return hasName() || givenBaseName != null;
     }
 
     @Override