Skip to content

Commit 94213b9

Browse files
committed
Remove RubyContextNode
1 parent 6d75b61 commit 94213b9

File tree

60 files changed

+140
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+140
-160
lines changed

src/main/java/org/truffleruby/cext/CExtNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
import org.truffleruby.interop.TranslateInteropExceptionNode;
7171
import org.truffleruby.core.string.ImmutableRubyString;
7272
import org.truffleruby.language.LexicalScope;
73-
import org.truffleruby.language.RubyContextNode;
73+
import org.truffleruby.language.RubyBaseNode;
7474
import org.truffleruby.language.RubyDynamicObject;
7575
import org.truffleruby.language.RubyGuards;
7676
import org.truffleruby.language.RubyNode;
@@ -1016,7 +1016,7 @@ protected int size(Object string,
10161016

10171017
}
10181018

1019-
public abstract static class StringToNativeNode extends RubyContextNode {
1019+
public abstract static class StringToNativeNode extends RubyBaseNode {
10201020

10211021
public static StringToNativeNode create() {
10221022
return StringToNativeNodeGen.create();

src/main/java/org/truffleruby/cext/UnwrapNode.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.truffleruby.cext.UnwrapNodeGen.UnwrapNativeNodeGen;
2626
import org.truffleruby.language.NotProvided;
2727
import org.truffleruby.language.RubyBaseNode;
28-
import org.truffleruby.language.RubyContextNode;
2928
import org.truffleruby.language.control.RaiseException;
3029

3130
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -158,7 +157,7 @@ public static NativeToWrapperNode create() {
158157
}
159158

160159
@ImportStatic(ValueWrapperManager.class)
161-
public abstract static class ToWrapperNode extends RubyContextNode {
160+
public abstract static class ToWrapperNode extends RubyBaseNode {
162161

163162
public abstract ValueWrapper execute(Object value);
164163

@@ -198,7 +197,7 @@ protected int getCacheLimit() {
198197
}
199198

200199
@ImportStatic(ValueWrapperManager.class)
201-
public abstract static class UnwrapCArrayNode extends RubyContextNode {
200+
public abstract static class UnwrapCArrayNode extends RubyBaseNode {
202201

203202
public abstract Object[] execute(Object cArray);
204203

src/main/java/org/truffleruby/core/array/ArrayAppendManyNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import static org.truffleruby.core.array.ArrayHelpers.setStoreAndSize;
1414

1515
import org.truffleruby.core.array.library.ArrayStoreLibrary;
16-
import org.truffleruby.language.RubyContextNode;
16+
import org.truffleruby.language.RubyBaseNode;
1717
import org.truffleruby.language.objects.shared.PropagateSharingNode;
1818

1919
import com.oracle.truffle.api.dsl.Cached;
@@ -23,7 +23,7 @@
2323
import com.oracle.truffle.api.profiles.ConditionProfile;
2424

2525
@ImportStatic(ArrayGuards.class)
26-
public abstract class ArrayAppendManyNode extends RubyContextNode {
26+
public abstract class ArrayAppendManyNode extends RubyBaseNode {
2727

2828
@Child private PropagateSharingNode propagateSharingNode = PropagateSharingNode.create();
2929

src/main/java/org/truffleruby/core/array/ArrayBuilderNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.truffleruby.core.array.library.ArrayStoreLibrary.ArrayAllocator;
1414
import org.truffleruby.core.array.ArrayBuilderNodeFactory.AppendArrayNodeGen;
1515
import org.truffleruby.core.array.ArrayBuilderNodeFactory.AppendOneNodeGen;
16-
import org.truffleruby.language.RubyContextNode;
16+
import org.truffleruby.language.RubyBaseNode;
1717

1818
import com.oracle.truffle.api.CompilerDirectives;
1919
import com.oracle.truffle.api.dsl.ImportStatic;
@@ -28,7 +28,7 @@
2828
* <li>The element(s) added do not match the strategy.
2929
* <li>The being-built storage no longer matches the strategy, due to the node having been replaced by another thread or
3030
* by another usage (e.g. recursive) of this ArrayBuilderNode. */
31-
public abstract class ArrayBuilderNode extends RubyContextNode {
31+
public abstract class ArrayBuilderNode extends RubyBaseNode {
3232

3333
public static class BuilderState {
3434
protected int capacity;
@@ -140,7 +140,7 @@ public synchronized ArrayAllocator updateStrategy(ArrayStoreLibrary.ArrayAllocat
140140

141141
}
142142

143-
public abstract static class ArrayBuilderBaseNode extends RubyContextNode {
143+
public abstract static class ArrayBuilderBaseNode extends RubyBaseNode {
144144

145145
protected ArrayAllocator replaceNodes(ArrayStoreLibrary.ArrayAllocator strategy, int size) {
146146
final ArrayBuilderProxyNode parent = (ArrayBuilderProxyNode) getParent();

src/main/java/org/truffleruby/core/array/ArrayConvertNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import com.oracle.truffle.api.dsl.Cached;
1313
import com.oracle.truffle.api.dsl.Specialization;
1414
import com.oracle.truffle.api.profiles.ConditionProfile;
15-
import org.truffleruby.language.RubyContextNode;
15+
import org.truffleruby.language.RubyBaseNode;
1616
import org.truffleruby.language.dispatch.DispatchNode;
1717

1818
/** Attempts converting its argument to an array by calling #to_ary, or if that doesn't work, by wrapping it inside a
1919
* one-element array. */
20-
public abstract class ArrayConvertNode extends RubyContextNode {
20+
public abstract class ArrayConvertNode extends RubyBaseNode {
2121

2222
public abstract RubyArray execute(Object value);
2323

src/main/java/org/truffleruby/core/array/ArrayDupNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.truffleruby.RubyLanguage;
1313
import org.truffleruby.core.array.library.ArrayStoreLibrary;
1414
import org.truffleruby.core.klass.RubyClass;
15-
import org.truffleruby.language.RubyContextNode;
15+
import org.truffleruby.language.RubyBaseNode;
1616

1717
import com.oracle.truffle.api.dsl.Cached;
1818
import com.oracle.truffle.api.dsl.ImportStatic;
@@ -23,7 +23,7 @@
2323

2424
/** Dup an array, without using any method lookup. This isn't a call - it's an operation on a core class. */
2525
@ImportStatic(ArrayGuards.class)
26-
public abstract class ArrayDupNode extends RubyContextNode {
26+
public abstract class ArrayDupNode extends RubyBaseNode {
2727

2828
public abstract RubyArray executeDup(RubyArray array);
2929

src/main/java/org/truffleruby/core/array/ArrayEachIteratorNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import org.truffleruby.core.array.library.ArrayStoreLibrary;
1313
import org.truffleruby.core.proc.RubyProc;
14-
import org.truffleruby.language.RubyContextNode;
14+
import org.truffleruby.language.RubyBaseNode;
1515

1616
import com.oracle.truffle.api.CompilerDirectives;
1717
import com.oracle.truffle.api.dsl.Cached;
@@ -25,7 +25,7 @@
2525

2626
@ImportStatic(ArrayGuards.class)
2727
@ReportPolymorphism
28-
public abstract class ArrayEachIteratorNode extends RubyContextNode {
28+
public abstract class ArrayEachIteratorNode extends RubyBaseNode {
2929

3030
public interface ArrayElementConsumerNode extends NodeInterface {
3131
void accept(RubyArray array, RubyProc block, Object element, int index);

src/main/java/org/truffleruby/core/array/ArrayEnsureCapacityNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package org.truffleruby.core.array;
1111

1212
import org.truffleruby.core.array.library.ArrayStoreLibrary;
13-
import org.truffleruby.language.RubyContextNode;
13+
import org.truffleruby.language.RubyBaseNode;
1414

1515
import com.oracle.truffle.api.dsl.Cached;
1616
import com.oracle.truffle.api.dsl.ImportStatic;
@@ -19,7 +19,7 @@
1919
import com.oracle.truffle.api.profiles.ConditionProfile;
2020

2121
@ImportStatic(ArrayGuards.class)
22-
public abstract class ArrayEnsureCapacityNode extends RubyContextNode {
22+
public abstract class ArrayEnsureCapacityNode extends RubyBaseNode {
2323

2424
public static ArrayEnsureCapacityNode create() {
2525
return ArrayEnsureCapacityNodeGen.create();

src/main/java/org/truffleruby/core/array/ArrayPopOneNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import static org.truffleruby.core.array.ArrayHelpers.setSize;
1313

1414
import org.truffleruby.core.array.library.ArrayStoreLibrary;
15-
import org.truffleruby.language.RubyContextNode;
15+
import org.truffleruby.language.RubyBaseNode;
1616

1717
import com.oracle.truffle.api.dsl.ImportStatic;
1818
import com.oracle.truffle.api.dsl.Specialization;
1919
import com.oracle.truffle.api.library.CachedLibrary;
2020

2121
@ImportStatic(ArrayGuards.class)
22-
public abstract class ArrayPopOneNode extends RubyContextNode {
22+
public abstract class ArrayPopOneNode extends RubyBaseNode {
2323

2424
public abstract Object executePopOne(RubyArray array);
2525

src/main/java/org/truffleruby/core/array/ArrayPrepareForCopyNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.oracle.truffle.api.dsl.Specialization;
1616
import com.oracle.truffle.api.library.CachedLibrary;
1717
import org.truffleruby.core.array.library.ArrayStoreLibrary;
18-
import org.truffleruby.language.RubyContextNode;
18+
import org.truffleruby.language.RubyBaseNode;
1919

2020
import java.util.Arrays;
2121

@@ -31,7 +31,7 @@
3131
* array may otherwise contain uninitialized elements (in particular, {@code null} values in {@code Object} arrays). */
3232
@ReportPolymorphism
3333
@ImportStatic(ArrayGuards.class)
34-
public abstract class ArrayPrepareForCopyNode extends RubyContextNode {
34+
public abstract class ArrayPrepareForCopyNode extends RubyBaseNode {
3535

3636
public static ArrayPrepareForCopyNode create() {
3737
return ArrayPrepareForCopyNodeGen.create();

0 commit comments

Comments
 (0)