Skip to content

Commit

Permalink
Showing 3 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -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);
}

}
Original file line number Diff line number Diff line change
@@ -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()) {
Original file line number Diff line number Diff line change
@@ -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() {

0 comments on commit 3e46d10

Please sign in to comment.