Skip to content

Commit 487a236

Browse files
committed
Fix ECJ building errors
There were errors like: ``` 1. ERROR in /Users/andrykonchin/projects/truffleruby-ws/truffleruby/src/main/java/org/truffleruby/core/numeric/IntegerNodes.java (at line 44) import org.truffleruby.core.numeric.IntegerNodesFactory.DivNodeFactory; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The import org.truffleruby.core.numeric.IntegerNodesFactory cannot be resolved ``` So importing generated classes don't work.
1 parent f38a27b commit 487a236

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/main/java/org/truffleruby/core/numeric/IntegerNodes.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
import org.truffleruby.core.cast.FloatToIntegerNode;
4242
import org.truffleruby.core.cast.ToRubyIntegerNode;
4343
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;
4944
import org.truffleruby.core.proc.RubyProc;
5045
import org.truffleruby.core.string.RubyString;
5146
import org.truffleruby.language.NoImplicitCastsToLong;
@@ -233,7 +228,7 @@ public abstract static class MulNode extends CoreMethodArrayArgumentsNode {
233228

234229
@NeverDefault
235230
public static MulNode create() {
236-
return MulNodeFactory.create(null);
231+
return IntegerNodesFactory.MulNodeFactory.create(null);
237232
}
238233

239234
public abstract Object executeMul(Object a, Object b);
@@ -493,7 +488,7 @@ protected static boolean isLongMinValue(long a) {
493488
@CoreMethod(names = "div", required = 1)
494489
public abstract static class IDivNode extends CoreMethodArrayArgumentsNode {
495490

496-
@Child private DivNode divNode = DivNodeFactory.create(null);
491+
@Child private DivNode divNode = IntegerNodesFactory.DivNodeFactory.create(null);
497492

498493
@Specialization
499494
Object idiv(Object a, Object b,
@@ -1197,7 +1192,7 @@ public abstract static class LeftShiftNode extends CoreMethodArrayArgumentsNode
11971192
static final long MAX_INT = Integer.MAX_VALUE;
11981193

11991194
public static LeftShiftNode create() {
1200-
return LeftShiftNodeFactory.create(null);
1195+
return IntegerNodesFactory.LeftShiftNodeFactory.create(null);
12011196
}
12021197

12031198
public abstract Object executeLeftShift(Object a, Object b);
@@ -1301,7 +1296,7 @@ static Object leftShiftCoerced(Object a, Object b,
13011296
private Object negateAndRightShift(Object a, Object b) {
13021297
if (rightShiftNode == null) {
13031298
CompilerDirectives.transferToInterpreterAndInvalidate();
1304-
rightShiftNode = insert(RightShiftNodeFactory.create(null));
1299+
rightShiftNode = insert(IntegerNodesFactory.RightShiftNodeFactory.create(null));
13051300
}
13061301

13071302
if (negNode == null) {
@@ -1339,7 +1334,7 @@ public abstract static class RightShiftNode extends CoreMethodArrayArgumentsNode
13391334
static final long MAX_INT = Integer.MAX_VALUE;
13401335

13411336
public static RightShiftNode create() {
1342-
return RightShiftNodeFactory.create(null);
1337+
return IntegerNodesFactory.RightShiftNodeFactory.create(null);
13431338
}
13441339

13451340
public abstract Object executeRightShift(Object a, Object b);
@@ -1422,7 +1417,7 @@ static Object rightShiftCoerced(Object a, Object b,
14221417
private Object negateAndLeftShift(Object a, Object b) {
14231418
if (leftShiftNode == null) {
14241419
CompilerDirectives.transferToInterpreterAndInvalidate();
1425-
leftShiftNode = insert(LeftShiftNodeFactory.create(null));
1420+
leftShiftNode = insert(IntegerNodesFactory.LeftShiftNodeFactory.create(null));
14261421
}
14271422

14281423
if (negNode == null) {
@@ -1762,7 +1757,7 @@ public abstract static class PowNode extends PrimitiveArrayArgumentsNode {
17621757
protected Object recursivePow(Object a, Object b) {
17631758
if (recursivePowNode == null) {
17641759
CompilerDirectives.transferToInterpreterAndInvalidate();
1765-
recursivePowNode = insert(PowNodeFactory.create(null));
1760+
recursivePowNode = insert(IntegerNodesFactory.PowNodeFactory.create(null));
17661761
}
17671762

17681763
return recursivePowNode.executePow(a, b);

0 commit comments

Comments
 (0)