Skip to content

Commit bbed5b2

Browse files
committedJun 1, 2018
[refactor] correct a typo that has made it being a public method
1 parent b087544 commit bbed5b2

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed
 

‎core/src/main/java/org/jruby/RubyModule.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -3895,10 +3895,6 @@ public IRubyObject getConstantNoConstMissing(String name, boolean inherit) {
38953895
return getConstantNoConstMissing(name, inherit, true);
38963896
}
38973897

3898-
public IRubyObject getConstantNoConstMissingSKipAutoload(String name) {
3899-
return getConstantSkipAutoload(name, true, true);
3900-
}
3901-
39023898
public IRubyObject getConstantNoConstMissing(String name, boolean inherit, boolean includeObject) {
39033899
IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, true);
39043900

@@ -3909,6 +3905,15 @@ public IRubyObject getConstantNoConstMissing(String name, boolean inherit, boole
39093905
return constant;
39103906
}
39113907

3908+
public final IRubyObject getConstantNoConstMissingSkipAutoload(String name) {
3909+
return getConstantSkipAutoload(name, true, true);
3910+
}
3911+
3912+
@Deprecated
3913+
public IRubyObject getConstantNoConstMissingSKipAutoload(String name) {
3914+
return getConstantSkipAutoload(name, true, true);
3915+
}
3916+
39123917
// returns UNDEF for un-loaded autoload constants
39133918
private IRubyObject getConstantSkipAutoload(String name, boolean inherit, boolean includeObject) {
39143919
IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, false);

‎core/src/main/java/org/jruby/ir/instructions/InheritanceSearchConstInstr.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public String[] toStringNonOperandArgs() {
6464

6565
private Object cache(Ruby runtime, RubyModule module) {
6666
String id = getId();
67-
Object constant = module.getConstantNoConstMissingSKipAutoload(id);
67+
Object constant = module.getConstantNoConstMissingSkipAutoload(id);
6868
if (constant == null) {
6969
constant = UndefinedValue.UNDEFINED;
7070
} else {

‎core/src/main/java/org/jruby/ir/targets/ConstantLookupSite.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public IRubyObject inheritanceSearchConst(ThreadContext context, IRubyObject cmV
177177
}
178178

179179
// Inheritance lookup
180-
IRubyObject constant = module.getConstantNoConstMissingSKipAutoload(name);
180+
IRubyObject constant = module.getConstantNoConstMissingSkipAutoload(name);
181181

182182
if (constant == null) {
183183
constant = UndefinedValue.UNDEFINED;
@@ -207,7 +207,7 @@ public IRubyObject noCacheInheritanceSearchConst(ThreadContext context, IRubyObj
207207

208208
// Inheritance lookup
209209

210-
IRubyObject constant = module.getConstantNoConstMissingSKipAutoload(name);
210+
IRubyObject constant = module.getConstantNoConstMissingSkipAutoload(name);
211211

212212
if (constant == null) {
213213
constant = UndefinedValue.UNDEFINED;

0 commit comments

Comments
 (0)
Please sign in to comment.