Skip to content

Commit b3e7c1d

Browse files
author
Nicolas Laurent
committed
move the WithContext#createArray methods to RubyContext[Source]Node, and add createEmptyArray method
1 parent b302541 commit b3e7c1d

File tree

3 files changed

+44
-18
lines changed

3 files changed

+44
-18
lines changed

src/main/java/org/truffleruby/language/RubyContextNode.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
import com.oracle.truffle.api.CompilerDirectives;
1717
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
18+
import org.truffleruby.core.array.ArrayHelpers;
19+
import org.truffleruby.core.array.RubyArray;
1820
import org.truffleruby.core.rope.Rope;
1921
import org.truffleruby.core.string.CoreStrings;
2022
import org.truffleruby.core.symbol.CoreSymbols;
@@ -60,4 +62,24 @@ public CoreStrings coreStrings() {
6062
public CoreSymbols coreSymbols() {
6163
return getLanguage().coreSymbols;
6264
}
65+
66+
public RubyArray createArray(Object store, int size) {
67+
return ArrayHelpers.createArray(getContext(), getLanguage(), store, size);
68+
}
69+
70+
public RubyArray createArray(int[] store) {
71+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
72+
}
73+
74+
public RubyArray createArray(long[] store) {
75+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
76+
}
77+
78+
public RubyArray createArray(Object[] store) {
79+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
80+
}
81+
82+
public RubyArray createEmptyArray() {
83+
return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
84+
}
6385
}

src/main/java/org/truffleruby/language/RubyContextSourceNode.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import com.oracle.truffle.api.CompilerDirectives;
1717
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
1818
import com.oracle.truffle.api.frame.VirtualFrame;
19+
import org.truffleruby.core.array.ArrayHelpers;
20+
import org.truffleruby.core.array.RubyArray;
1921
import org.truffleruby.core.rope.Rope;
2022
import org.truffleruby.core.string.CoreStrings;
2123
import org.truffleruby.core.symbol.CoreSymbols;
@@ -101,6 +103,26 @@ public CoreSymbols coreSymbols() {
101103
return getLanguage().coreSymbols;
102104
}
103105

106+
public RubyArray createArray(Object store, int size) {
107+
return ArrayHelpers.createArray(getContext(), getLanguage(), store, size);
108+
}
109+
110+
public RubyArray createArray(int[] store) {
111+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
112+
}
113+
114+
public RubyArray createArray(long[] store) {
115+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
116+
}
117+
118+
public RubyArray createArray(Object[] store) {
119+
return ArrayHelpers.createArray(getContext(), getLanguage(), store);
120+
}
121+
122+
public RubyArray createEmptyArray() {
123+
return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
124+
}
125+
104126
@Override
105127
public String toString() {
106128
return super.toString() + " at " + RubyContext.fileLine(getSourceSection());

src/main/java/org/truffleruby/language/RubyNode.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import org.truffleruby.RubyContext;
2424
import org.truffleruby.RubyLanguage;
2525
import org.truffleruby.core.CoreLibrary;
26-
import org.truffleruby.core.array.ArrayHelpers;
27-
import org.truffleruby.core.array.RubyArray;
2826
import org.truffleruby.core.exception.CoreExceptions;
2927
import org.truffleruby.core.kernel.TraceManager;
3028
import org.truffleruby.core.method.RubyMethod;
@@ -256,22 +254,6 @@ default Encoding getLocaleEncoding() {
256254
return getContext().getEncodingManager().getLocaleEncoding();
257255
}
258256

259-
default RubyArray createArray(Object store, int size) {
260-
return ArrayHelpers.createArray(getContext(), store, size);
261-
}
262-
263-
default RubyArray createArray(int[] store) {
264-
return ArrayHelpers.createArray(getContext(), store);
265-
}
266-
267-
default RubyArray createArray(long[] store) {
268-
return ArrayHelpers.createArray(getContext(), store);
269-
}
270-
271-
default RubyArray createArray(Object[] store) {
272-
return ArrayHelpers.createArray(getContext(), store);
273-
}
274-
275257
default RubyBignum createBignum(BigInteger value) {
276258
return BignumOperations.createBignum(value);
277259
}

0 commit comments

Comments
 (0)