[Truffle] Encapsulate the RubyModule constructor.

jruby · Jul 23, 2015 · 3e46d10 · 3e46d10
1 parent 7addc75
commit 3e46d10
Showing 3 changed files with 7 additions and 3 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
@@ -82,6 +82,10 @@ public static RubyModuleModel getModel(RubyBasicObject module) {
         return ((RubyModule) module).model;
     }
 
+    public static RubyModule createRubyModule(RubyContext context, RubyBasicObject selfClass, RubyBasicObject lexicalParent, String name, Node currentNode) {
+        return new RubyModule(context, selfClass, lexicalParent, name, currentNode);
+    }
+
     @CoreMethod(names = "===", required = 1)
     public abstract static class ContainsInstanceNode extends CoreMethodArrayArgumentsNode {
 
@@ -1997,7 +2001,7 @@ public static class ModuleAllocator implements Allocator {
 
         @Override
         public RubyBasicObject allocate(RubyContext context, RubyBasicObject rubyClass, Node currentNode) {
-            return new RubyModule(context, rubyClass, null, null, currentNode);
+            return createRubyModule(context, rubyClass, null, null, currentNode);
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetModuleNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetModuleNode.java
@@ -52,7 +52,7 @@ public Object execute(VirtualFrame frame) {
         RubyBasicObject definingModule;
 
         if (constant == null) {
-            definingModule = new RubyModule(getContext(), getContext().getCoreLibrary().getModuleClass(), lexicalParent, name, this);
+            definingModule = ModuleNodes.createRubyModule(getContext(), getContext().getCoreLibrary().getModuleClass(), lexicalParent, name, this);
         } else {
             Object module = constant.getValue();
             if (!(RubyGuards.isRubyModule(module)) || !ModuleNodes.getModel((RubyBasicObject) module).isOnlyAModule()) {

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
@@ -582,7 +582,7 @@ private RubyBasicObject defineModule(String name) {
 
     private RubyBasicObject defineModule(RubyBasicObject lexicalParent, String name) {
         assert RubyGuards.isRubyModule(lexicalParent);
-        return new RubyModule(context, moduleClass, lexicalParent, name, node);
+        return ModuleNodes.createRubyModule(context, moduleClass, lexicalParent, name, node);
     }
 
     public void initializeAfterMethodsAdded() {