Skip to content

Commit

Permalink
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ public void unsafeSetLiveModule(DynamicObject liveModule) {
}

@TruffleBoundary
public DynamicObject resolveTargetModule() {
public DynamicObject resolveTargetModuleForClassVariables() {
LexicalScope scope = this;

// MRI logic: ignore lexical scopes (cref) referring to singleton classes
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ public ReadClassVariableNode(RubyContext context, SourceSection sourceSection,
public Object execute(VirtualFrame frame) {
// TODO CS 21-Feb-16 these two operations are uncached and use loops - same for isDefined below

final DynamicObject module = lexicalScope.resolveTargetModule();
final DynamicObject module = lexicalScope.resolveTargetModuleForClassVariables();

final Object value = ModuleOperations.lookupClassVariable(module, name);

@@ -51,7 +51,7 @@ public Object execute(VirtualFrame frame) {

@Override
public Object isDefined(VirtualFrame frame) {
final DynamicObject module = lexicalScope.resolveTargetModule();
final DynamicObject module = lexicalScope.resolveTargetModuleForClassVariables();

final Object value = ModuleOperations.lookupClassVariable(module, name);

Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ public Object execute(VirtualFrame frame) {

// TODO CS 21-Feb-16 these two operations are uncached and use loops

final DynamicObject module = lexicalScope.resolveTargetModule();
final DynamicObject module = lexicalScope.resolveTargetModuleForClassVariables();

ModuleOperations.setClassVariable(getContext(), module, name, rhsValue, this);

0 comments on commit cf89d2f

Please sign in to comment.