|
41 | 41 | import org.truffleruby.core.cast.FloatToIntegerNode;
|
42 | 42 | import org.truffleruby.core.cast.ToRubyIntegerNode;
|
43 | 43 | import org.truffleruby.core.encoding.Encodings;
|
44 |
| -import org.truffleruby.core.numeric.IntegerNodesFactory.DivNodeFactory; |
45 |
| -import org.truffleruby.core.numeric.IntegerNodesFactory.LeftShiftNodeFactory; |
46 |
| -import org.truffleruby.core.numeric.IntegerNodesFactory.MulNodeFactory; |
47 |
| -import org.truffleruby.core.numeric.IntegerNodesFactory.PowNodeFactory; |
48 |
| -import org.truffleruby.core.numeric.IntegerNodesFactory.RightShiftNodeFactory; |
49 | 44 | import org.truffleruby.core.proc.RubyProc;
|
50 | 45 | import org.truffleruby.core.string.RubyString;
|
51 | 46 | import org.truffleruby.language.NoImplicitCastsToLong;
|
@@ -233,7 +228,7 @@ public abstract static class MulNode extends CoreMethodArrayArgumentsNode {
|
233 | 228 |
|
234 | 229 | @NeverDefault
|
235 | 230 | public static MulNode create() {
|
236 |
| - return MulNodeFactory.create(null); |
| 231 | + return IntegerNodesFactory.MulNodeFactory.create(null); |
237 | 232 | }
|
238 | 233 |
|
239 | 234 | public abstract Object executeMul(Object a, Object b);
|
@@ -493,7 +488,7 @@ protected static boolean isLongMinValue(long a) {
|
493 | 488 | @CoreMethod(names = "div", required = 1)
|
494 | 489 | public abstract static class IDivNode extends CoreMethodArrayArgumentsNode {
|
495 | 490 |
|
496 |
| - @Child private DivNode divNode = DivNodeFactory.create(null); |
| 491 | + @Child private DivNode divNode = IntegerNodesFactory.DivNodeFactory.create(null); |
497 | 492 |
|
498 | 493 | @Specialization
|
499 | 494 | Object idiv(Object a, Object b,
|
@@ -1197,7 +1192,7 @@ public abstract static class LeftShiftNode extends CoreMethodArrayArgumentsNode
|
1197 | 1192 | static final long MAX_INT = Integer.MAX_VALUE;
|
1198 | 1193 |
|
1199 | 1194 | public static LeftShiftNode create() {
|
1200 |
| - return LeftShiftNodeFactory.create(null); |
| 1195 | + return IntegerNodesFactory.LeftShiftNodeFactory.create(null); |
1201 | 1196 | }
|
1202 | 1197 |
|
1203 | 1198 | public abstract Object executeLeftShift(Object a, Object b);
|
@@ -1301,7 +1296,7 @@ static Object leftShiftCoerced(Object a, Object b,
|
1301 | 1296 | private Object negateAndRightShift(Object a, Object b) {
|
1302 | 1297 | if (rightShiftNode == null) {
|
1303 | 1298 | CompilerDirectives.transferToInterpreterAndInvalidate();
|
1304 |
| - rightShiftNode = insert(RightShiftNodeFactory.create(null)); |
| 1299 | + rightShiftNode = insert(IntegerNodesFactory.RightShiftNodeFactory.create(null)); |
1305 | 1300 | }
|
1306 | 1301 |
|
1307 | 1302 | if (negNode == null) {
|
@@ -1339,7 +1334,7 @@ public abstract static class RightShiftNode extends CoreMethodArrayArgumentsNode
|
1339 | 1334 | static final long MAX_INT = Integer.MAX_VALUE;
|
1340 | 1335 |
|
1341 | 1336 | public static RightShiftNode create() {
|
1342 |
| - return RightShiftNodeFactory.create(null); |
| 1337 | + return IntegerNodesFactory.RightShiftNodeFactory.create(null); |
1343 | 1338 | }
|
1344 | 1339 |
|
1345 | 1340 | public abstract Object executeRightShift(Object a, Object b);
|
@@ -1422,7 +1417,7 @@ static Object rightShiftCoerced(Object a, Object b,
|
1422 | 1417 | private Object negateAndLeftShift(Object a, Object b) {
|
1423 | 1418 | if (leftShiftNode == null) {
|
1424 | 1419 | CompilerDirectives.transferToInterpreterAndInvalidate();
|
1425 |
| - leftShiftNode = insert(LeftShiftNodeFactory.create(null)); |
| 1420 | + leftShiftNode = insert(IntegerNodesFactory.LeftShiftNodeFactory.create(null)); |
1426 | 1421 | }
|
1427 | 1422 |
|
1428 | 1423 | if (negNode == null) {
|
@@ -1762,7 +1757,7 @@ public abstract static class PowNode extends PrimitiveArrayArgumentsNode {
|
1762 | 1757 | protected Object recursivePow(Object a, Object b) {
|
1763 | 1758 | if (recursivePowNode == null) {
|
1764 | 1759 | CompilerDirectives.transferToInterpreterAndInvalidate();
|
1765 |
| - recursivePowNode = insert(PowNodeFactory.create(null)); |
| 1760 | + recursivePowNode = insert(IntegerNodesFactory.PowNodeFactory.create(null)); |
1766 | 1761 | }
|
1767 | 1762 |
|
1768 | 1763 | return recursivePowNode.executePow(a, b);
|
|
0 commit comments