Skip to content

Commit 7627878

Browse files
committed
Rename hiddenVariable() to isHiddenVariable()
1 parent 34801cc commit 7627878

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

src/main/java/org/truffleruby/core/binding/BindingNodes.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,18 @@ public static void insertAncestorFrame(RubyContext context, DynamicObject bindin
125125
newFrame(binding, newFrameDescriptor(context));
126126
}
127127

128-
public static boolean hiddenVariable(Object name) {
128+
public static boolean isHiddenVariable(Object name) {
129129
if (name instanceof String) {
130-
return hiddenVariable((String) name);
130+
return isHiddenVariable((String) name);
131131
} else {
132132
return true;
133133
}
134134
}
135135

136-
public static boolean hiddenVariable(String name) {
136+
private static boolean isHiddenVariable(String name) {
137137
assert !name.isEmpty();
138-
return name.startsWith("$") || name.charAt(0) == TranslatorEnvironment.TEMP_PREFIX;
138+
return name.charAt(0) == '$' || // Frame-local global variable
139+
name.charAt(0) == TranslatorEnvironment.TEMP_PREFIX;
139140
}
140141

141142
@CoreMethod(names = { "dup", "clone" })
@@ -166,7 +167,7 @@ public RubyNode coerceToString(RubyNode name) {
166167

167168
@Specialization(guards = {
168169
"name == cachedName",
169-
"!hiddenVariable(cachedName)",
170+
"!isHiddenVariable(cachedName)",
170171
"getFrameDescriptor(binding) == descriptor"
171172
}, limit = "getCacheLimit()")
172173
public boolean localVariableDefinedCached(DynamicObject binding, String name,
@@ -177,13 +178,13 @@ public boolean localVariableDefinedCached(DynamicObject binding, String name,
177178
}
178179

179180
@TruffleBoundary
180-
@Specialization(guards = "!hiddenVariable(name)")
181+
@Specialization(guards = "!isHiddenVariable(name)")
181182
public boolean localVariableDefinedUncached(DynamicObject binding, String name) {
182183
return FindDeclarationVariableNodes.findFrameSlotOrNull(name, getFrame(binding)) != null;
183184
}
184185

185186
@TruffleBoundary
186-
@Specialization(guards = "hiddenVariable(name)")
187+
@Specialization(guards = "isHiddenVariable(name)")
187188
public Object localVariableDefinedLastLine(DynamicObject binding, String name) {
188189
throw new RaiseException(getContext(), coreExceptions().nameError("Bad local variable name", binding, name, this));
189190
}
@@ -205,7 +206,7 @@ public RubyNode coerceToString(RubyNode name) {
205206
return NameToJavaStringNodeGen.create(name);
206207
}
207208

208-
@Specialization(guards = "!hiddenVariable(name)")
209+
@Specialization(guards = "!isHiddenVariable(name)")
209210
public Object localVariableGetUncached(DynamicObject binding, String name,
210211
@Cached("create(null)") FindDeclarationVariableNodes.FindAndReadDeclarationVariableNode readNode) {
211212
MaterializedFrame frame = getFrame(binding);
@@ -217,7 +218,7 @@ public Object localVariableGetUncached(DynamicObject binding, String name,
217218
}
218219

219220
@TruffleBoundary
220-
@Specialization(guards = "hiddenVariable(name)")
221+
@Specialization(guards = "isHiddenVariable(name)")
221222
public Object localVariableGetLastLine(DynamicObject binding, String name) {
222223
throw new RaiseException(getContext(), coreExceptions().nameError("Bad local variable name", binding, name, this));
223224
}
@@ -242,7 +243,7 @@ public RubyNode coerceToString(RubyNode name) {
242243

243244
@Specialization(guards = {
244245
"name == cachedName",
245-
"!hiddenVariable(cachedName)",
246+
"!isHiddenVariable(cachedName)",
246247
"getFrameDescriptor(binding) == cachedFrameDescriptor",
247248
"cachedFrameSlot != null"
248249
}, limit = "getCacheLimit()")
@@ -257,7 +258,7 @@ public Object localVariableSetCached(DynamicObject binding, String name, Object
257258

258259
@Specialization(guards = {
259260
"name == cachedName",
260-
"!hiddenVariable(cachedName)",
261+
"!isHiddenVariable(cachedName)",
261262
"getFrameDescriptor(binding) == cachedFrameDescriptor",
262263
"cachedFrameSlot == null"
263264
}, limit = "getCacheLimit()")
@@ -273,7 +274,7 @@ public Object localVariableSetNewCached(DynamicObject binding, String name, Obje
273274
}
274275

275276
@TruffleBoundary
276-
@Specialization(guards = "!hiddenVariable(name)")
277+
@Specialization(guards = "!isHiddenVariable(name)")
277278
public Object localVariableSetUncached(DynamicObject binding, String name, Object value) {
278279
MaterializedFrame frame = getFrame(binding);
279280
final FrameSlotAndDepth frameSlot = FindDeclarationVariableNodes.findFrameSlotOrNull(name, frame);
@@ -290,7 +291,7 @@ public Object localVariableSetUncached(DynamicObject binding, String name, Objec
290291
}
291292

292293
@TruffleBoundary
293-
@Specialization(guards = "hiddenVariable(name)")
294+
@Specialization(guards = "isHiddenVariable(name)")
294295
public Object localVariableSetLastLine(DynamicObject binding, String name, Object value) {
295296
throw new RaiseException(getContext(), coreExceptions().nameError("Bad local variable name", binding, name, this));
296297
}
@@ -333,8 +334,7 @@ public static DynamicObject listLocalVariables(RubyContext context, Materialized
333334

334335
private static void addNamesFromFrame(RubyContext context, Frame frame, final Set<Object> names) {
335336
for (FrameSlot slot : frame.getFrameDescriptor().getSlots()) {
336-
if (slot.getIdentifier() instanceof String &&
337-
!hiddenVariable((String) slot.getIdentifier())) {
337+
if (!isHiddenVariable(slot.getIdentifier())) {
338338
names.add(context.getSymbolTable().getSymbol((String) slot.getIdentifier()));
339339
}
340340
}

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
import org.truffleruby.language.objects.PropertyFlags;
129129
import org.truffleruby.language.objects.ReadObjectFieldNode;
130130
import org.truffleruby.language.objects.ReadObjectFieldNodeGen;
131-
import org.truffleruby.language.objects.SelfNode;
132131
import org.truffleruby.language.objects.ShapeCachingGuards;
133132
import org.truffleruby.language.objects.SingletonClassNode;
134133
import org.truffleruby.language.objects.TaintNode;
@@ -699,7 +698,7 @@ protected MaterializedFrame getBindingFrame(DynamicObject binding) {
699698

700699
protected static boolean assignsNewUserVariables(FrameDescriptor descriptor) {
701700
for (FrameSlot slot : descriptor.getSlots()) {
702-
if (!BindingNodes.hiddenVariable(slot.getIdentifier())) {
701+
if (!BindingNodes.isHiddenVariable(slot.getIdentifier())) {
703702
return true;
704703
}
705704
}

src/main/java/org/truffleruby/debug/LexicalScope.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.truffleruby.RubyContext;
2727
import org.truffleruby.core.binding.BindingNodes;
2828
import org.truffleruby.language.arguments.RubyArguments;
29-
import org.truffleruby.parser.TranslatorEnvironment;
3029

3130
import java.util.Collections;
3231
import java.util.HashMap;
@@ -89,7 +88,7 @@ private static Object getArguments(Frame frame) {
8988
}
9089

9190
private static boolean isInternal(FrameSlot slot) {
92-
return BindingNodes.hiddenVariable(slot.getIdentifier());
91+
return BindingNodes.isHiddenVariable(slot.getIdentifier());
9392
}
9493

9594
@ExportLibrary(InteropLibrary.class)

0 commit comments

Comments
 (0)