Skip to content

Commit 45bd4f3

Browse files
tomasstupkatomasstupka
committed
renamed ForeignArray2R -> ConvertForeignObjectNode
1 parent 928ec91 commit 45bd4f3

File tree

26 files changed

+104
-101
lines changed

26 files changed

+104
-101
lines changed

‎com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/MathFunctionsNodes.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
3939
import com.oracle.truffle.r.runtime.data.nodes.GetReadonlyData;
4040
import com.oracle.truffle.r.runtime.ffi.interop.UnsafeAdapter;
41-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
41+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
4242
import com.oracle.truffle.r.runtime.nmath.BesselFunctions;
4343
import com.oracle.truffle.r.runtime.nmath.Beta;
4444
import com.oracle.truffle.r.runtime.nmath.Choose;
@@ -695,7 +695,7 @@ abstract static class BesselExNode extends Node {
695695

696696
@Child private Node bIsPointerNode = Message.IS_POINTER.createNode();
697697
@Child private Node bAsPointerNode;
698-
@Child private ForeignArray2R bForeignArray2R;
698+
@Child private ConvertForeignObjectNode bConvertForeign;
699699

700700
public abstract double execute(BesselExCaller caller, Object b);
701701

@@ -717,11 +717,11 @@ protected double besselEx(BesselExCaller caller, Object b,
717717
throw RInternalError.shouldNotReachHere("IS_POINTER message returned true, AS_POINTER should not fail");
718718
}
719719
} else {
720-
if (bForeignArray2R == null) {
720+
if (bConvertForeign == null) {
721721
CompilerDirectives.transferToInterpreterAndInvalidate();
722-
bForeignArray2R = insert(ForeignArray2R.create());
722+
bConvertForeign = insert(ConvertForeignObjectNode.create());
723723
}
724-
bVec = (RAbstractDoubleVector) bForeignArray2R.convert(bTO);
724+
bVec = (RAbstractDoubleVector) bConvertForeign.convert(bTO);
725725
}
726726

727727
return caller.call(bReadonlyData.execute(bVec.materialize()));

‎com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RandFunctionsNodes.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
3838
import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
3939
import com.oracle.truffle.r.runtime.data.nodes.VectorAccess.SequentialIterator;
40-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
40+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
4141
import com.oracle.truffle.r.runtime.nmath.MathFunctions;
4242
import com.oracle.truffle.r.runtime.nmath.MathFunctions.Function2_1;
4343
import com.oracle.truffle.r.runtime.nmath.MathFunctions.Function2_2;
@@ -214,8 +214,8 @@ public abstract static class RfRMultinomNode extends FFIUpCallNode.Arg4 {
214214
@Child private Node probAsPointerNode;
215215
@Child private Node rNIsPointerNode = Message.IS_POINTER.createNode();
216216
@Child private Node rNAsPointerNode;
217-
@Child private ForeignArray2R probForeignArray2R;
218-
@Child private ForeignArray2R rNForeignArray2R;
217+
@Child private ConvertForeignObjectNode probConvertForeign;
218+
@Child private ConvertForeignObjectNode rNConvertForeign;
219219
@Child private DoRMultinomNode doRMultinomNode = RandFunctionsNodesFactory.DoRMultinomNodeGen.create();
220220

221221
@Specialization
@@ -237,11 +237,11 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {
237237
throw RInternalError.shouldNotReachHere("IS_POINTER message returned true, AS_POINTER should not fail");
238238
}
239239
} else {
240-
if (probForeignArray2R == null) {
240+
if (probConvertForeign == null) {
241241
CompilerDirectives.transferToInterpreterAndInvalidate();
242-
probForeignArray2R = insert(ForeignArray2R.create());
242+
probConvertForeign = insert(ConvertForeignObjectNode.create());
243243
}
244-
probVector = (RAbstractDoubleVector) probForeignArray2R.convert(probTO);
244+
probVector = (RAbstractDoubleVector) probConvertForeign.convert(probTO);
245245
}
246246

247247
RAbstractIntVector rNVector;
@@ -259,11 +259,11 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {
259259
throw RInternalError.shouldNotReachHere("IS_POINTER message returned true, AS_POINTER should not fail");
260260
}
261261
} else {
262-
if (rNForeignArray2R == null) {
262+
if (rNConvertForeign == null) {
263263
CompilerDirectives.transferToInterpreterAndInvalidate();
264-
rNForeignArray2R = insert(ForeignArray2R.create());
264+
rNConvertForeign = insert(ConvertForeignObjectNode.create());
265265
}
266-
rNVector = (RAbstractIntVector) rNForeignArray2R.convert(probTO);
266+
rNVector = (RAbstractIntVector) rNConvertForeign.convert(probTO);
267267
}
268268

269269
doRMultinomNode.execute(n, probVector, k, rNVector);

‎com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
7676
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
7777
import com.oracle.truffle.r.runtime.env.REnvironment;
78-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
78+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
7979
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
8080

8181
@ImportStatic(RRuntime.class)
@@ -153,13 +153,13 @@ protected Object asVector(Object x, String mode,
153153
@Cached("fromMode(cachedMode)") RType type,
154154
@Cached("createCast(type)") CastNode cast,
155155
@Cached("create(type)") DropAttributesNode drop,
156-
@Cached("create()") ForeignArray2R foreignArray2R) {
156+
@Cached("create()") ConvertForeignObjectNode convertForeign) {
157157
if (RRuntime.isForeignObject(x)) {
158158
if (type == RType.List) {
159159
// already returns list, no need to cast
160-
return foreignArray2R.convertToList((TruffleObject) x, true, true);
160+
return convertForeign.convertToList((TruffleObject) x, true, true);
161161
}
162-
Object o = foreignArray2R.convert((TruffleObject) x, true, true);
162+
Object o = convertForeign.convert((TruffleObject) x, true, true);
163163
if (!RRuntime.isForeignObject(o)) {
164164
return cast == null ? o : cast.doCast(o);
165165
}

‎com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Unlist.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
6565
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
6666
import com.oracle.truffle.r.runtime.interop.Foreign2R;
67-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
67+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
6868

6969
@ImportStatic({Message.class, RRuntime.class})
7070
@RBuiltin(name = "unlist", kind = INTERNAL, dispatch = RDispatch.INTERNAL_GENERIC, parameterNames = {"x", "recursive", "use.names"}, behavior = PURE)
@@ -83,9 +83,9 @@ public abstract class Unlist extends RBuiltinNode.Arg3 {
8383
@Child private RecursiveLength recursiveLengthNode;
8484
@Child private GetNamesAttributeNode getNames = GetNamesAttributeNode.create();
8585
@Child private Node hasSizeNode;
86-
@Child private ForeignArray2R foreignArray2RNode;
86+
@Child private ConvertForeignObjectNode convertForeignNode;
8787

88-
@ImportStatic({Message.class, RRuntime.class, ForeignArray2R.class})
88+
@ImportStatic({Message.class, RRuntime.class, ConvertForeignObjectNode.class})
8989
@TypeSystemReference(RTypes.class)
9090
protected abstract static class UnlistLength extends Node {
9191

@@ -110,7 +110,7 @@ protected int getLength(Object operand) {
110110
}
111111
}
112112

113-
@ImportStatic({Message.class, RRuntime.class, ForeignArray2R.class})
113+
@ImportStatic({Message.class, RRuntime.class, ConvertForeignObjectNode.class})
114114
@TypeSystemReference(RTypes.class)
115115
protected abstract static class RecursiveLength extends Node {
116116

@@ -292,12 +292,12 @@ protected Object unlistPairList(RPairList list, boolean recursive, boolean useNa
292292
@Specialization(guards = {"isForeignArray(obj)"})
293293
protected Object unlistForeignArray(VirtualFrame frame, TruffleObject obj, boolean recursive, boolean useNames,
294294
@SuppressWarnings("unused") @Cached("HAS_SIZE.createNode()") Node hasSize,
295-
@Cached("create()") ForeignArray2R foreignArray2R) {
296-
return unlistForeign(frame, obj, recursive, useNames, foreignArray2R);
295+
@Cached("create()") ConvertForeignObjectNode convertForeign) {
296+
return unlistForeign(frame, obj, recursive, useNames, convertForeign);
297297
}
298298

299-
private Object unlistForeign(VirtualFrame frame, TruffleObject obj, boolean recursive, boolean useNames, ForeignArray2R foreignArray2R) {
300-
Object result = foreignArray2R.convert(obj, recursive);
299+
private Object unlistForeign(VirtualFrame frame, TruffleObject obj, boolean recursive, boolean useNames, ConvertForeignObjectNode convertForeign) {
300+
Object result = convertForeign.convert(obj, recursive);
301301
if (result instanceof RAbstractListVector) {
302302
result = execute(frame, result, recursive, useNames);
303303
}
@@ -316,7 +316,7 @@ protected Object unlist(Object o, Object recursive, Object useNames) {
316316
}
317317

318318
protected boolean isForeignArray(Object obj) {
319-
return ForeignArray2R.isForeignArray(obj, getHasSizeNode());
319+
return ConvertForeignObjectNode.isForeignArray(obj, getHasSizeNode());
320320
}
321321

322322
/**
@@ -329,12 +329,12 @@ private RAbstractVector foreignToVector(TruffleObject obj, boolean recursive) {
329329
return (RAbstractVector) getForeignArray2RNode().convert(obj, recursive);
330330
}
331331

332-
private ForeignArray2R getForeignArray2RNode() {
333-
if (foreignArray2RNode == null) {
332+
private ConvertForeignObjectNode getForeignArray2RNode() {
333+
if (convertForeignNode == null) {
334334
CompilerDirectives.transferToInterpreterAndInvalidate();
335-
foreignArray2RNode = insert(ForeignArray2R.create());
335+
convertForeignNode = insert(ConvertForeignObjectNode.create());
336336
}
337-
return foreignArray2RNode;
337+
return convertForeignNode;
338338
}
339339

340340
private Node getHasSizeNode() {

‎com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
import com.oracle.truffle.r.runtime.interop.FastRInteropTryException;
105105
import com.oracle.truffle.r.runtime.interop.FastrInteropTryContextState;
106106
import com.oracle.truffle.r.runtime.interop.Foreign2R;
107-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
107+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
108108
import com.oracle.truffle.r.runtime.interop.R2Foreign;
109109

110110
public class FastRInterop {
@@ -967,12 +967,12 @@ public abstract static class AsVector extends RBuiltinNode.Arg3 {
967967
@TruffleBoundary
968968
public Object asVector(TruffleObject obj, boolean recursive, boolean dropDimensions,
969969
@Cached("HAS_SIZE.createNode()") Node hasSize,
970-
@Cached("create()") ForeignArray2R array2R) {
970+
@Cached("create()") ConvertForeignObjectNode convertForeign) {
971971
if (isArrayProfile.profile(ForeignAccess.sendHasSize(hasSize, obj))) {
972-
return array2R.convert(obj, recursive, dropDimensions);
972+
return convertForeign.convert(obj, recursive, dropDimensions);
973973
} else {
974974
// a non-array we can convert only to List
975-
return array2R.convertToList(obj, recursive, dropDimensions);
975+
return convertForeign.convertToList(obj, recursive, dropDimensions);
976976
}
977977
}
978978

‎com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
import com.oracle.truffle.r.runtime.data.nodes.VectorAccess.RandomIterator;
6969
import com.oracle.truffle.r.runtime.env.REnvironment;
7070
import com.oracle.truffle.r.runtime.interop.Foreign2R;
71-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
71+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
7272
import com.oracle.truffle.r.runtime.interop.ForeignTypeCheck;
7373
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
7474

@@ -291,7 +291,7 @@ protected Object accessFieldByVectorPositions(TruffleObject object, Object[] pos
291291
elements[i] = foreign2RNode.execute(res);
292292
typeCheck.check(elements[i]);
293293
}
294-
return ForeignArray2R.asAbstractVector(elements, typeCheck.getType());
294+
return ConvertForeignObjectNode.asAbstractVector(elements, typeCheck.getType());
295295
} catch (InteropException e) {
296296
CompilerDirectives.transferToInterpreter();
297297
throw RError.interopError(RError.findParentRBase(this), e, object);

‎com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanScalarNode.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import com.oracle.truffle.r.runtime.RType;
4343
import com.oracle.truffle.r.runtime.data.RComplex;
4444
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
45-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
45+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
4646
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
4747
import com.oracle.truffle.r.runtime.ops.BooleanOperation;
4848
import com.oracle.truffle.r.runtime.ops.BooleanOperationFactory;
@@ -155,10 +155,10 @@ protected static Class<? extends RAbstractVector> getNumericVectorClass(Object v
155155

156156
@Specialization(guards = {"isForeignObject(operand)"})
157157
protected byte doForeignVector(TruffleObject operand,
158-
@Cached("create()") ForeignArray2R foreignArray2R,
158+
@Cached("create()") ConvertForeignObjectNode convertForeign,
159159
@Cached("createRecursive()") LogicalScalarCastNode recursive) {
160-
if (foreignArray2R.isForeignArray(operand)) {
161-
Object o = foreignArray2R.convert(operand);
160+
if (convertForeign.isForeignArray(operand)) {
161+
Object o = convertForeign.convert(operand);
162162
return recursive.executeCast(o);
163163
}
164164
return doFallback(operand);

‎com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
import com.oracle.truffle.r.runtime.RType;
4242
import com.oracle.truffle.r.runtime.data.RTypes;
4343
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
44-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
44+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
4545
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
4646

4747
@TypeSystemReference(RTypes.class)
48-
@ImportStatic({ForeignArray2R.class, Message.class})
48+
@ImportStatic({ConvertForeignObjectNode.class, Message.class})
4949
public abstract class CastTypeNode extends RBaseNode {
5050

5151
protected static final int NUMBER_OF_TYPES = RType.values().length;
@@ -83,8 +83,8 @@ protected static Object doCast(TruffleObject value, RType type,
8383
@Cached("type") RType cachedType,
8484
@Cached("createCast(cachedType)") CastNode cast,
8585
@Cached("HAS_SIZE.createNode()") Node hasSize,
86-
@Cached("create()") ForeignArray2R foreignArray2R) {
87-
return cast.doCast(foreignArray2R.convert(value));
86+
@Cached("create()") ConvertForeignObjectNode convertForeign) {
87+
return cast.doCast(convertForeign.convert(value));
8888
}
8989

9090
@TruffleBoundary

‎com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/casts/CastForeignNode.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@
2929
import com.oracle.truffle.r.nodes.unary.CastNode;
3030
import com.oracle.truffle.r.runtime.RRuntime;
3131
import com.oracle.truffle.r.runtime.data.RInteropScalar;
32-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
32+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
3333

34+
/**
35+
* Cast pipelines internal. You probably want to use {@link ConvertForeignObjectNode}.
36+
*/
3437
public final class CastForeignNode extends CastNode {
3538

36-
@Child private ForeignArray2R foreignArray2R;
39+
@Child private ConvertForeignObjectNode convertForeign;
3740

3841
@CompilationFinal private ConditionProfile isForeign;
3942
@CompilationFinal private ConditionProfile isInteropScalar;
@@ -43,9 +46,9 @@ protected Object execute(Object obj) {
4346
if (!RRuntime.isForeignObject(obj)) {
4447
return obj;
4548
}
46-
if (foreignArray2R == null) {
49+
if (convertForeign == null) {
4750
CompilerDirectives.transferToInterpreterAndInvalidate();
48-
foreignArray2R = insert(ForeignArray2R.create());
51+
convertForeign = insert(ConvertForeignObjectNode.create());
4952
}
5053
if (isForeign == null) {
5154
CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -55,8 +58,8 @@ protected Object execute(Object obj) {
5558
CompilerDirectives.transferToInterpreterAndInvalidate();
5659
isInteropScalar = ConditionProfile.createBinaryProfile();
5760
}
58-
if (isForeign.profile(foreignArray2R.isForeignArray(obj))) {
59-
return foreignArray2R.convert((TruffleObject) obj);
61+
if (isForeign.profile(convertForeign.isForeignArray(obj))) {
62+
return convertForeign.convert((TruffleObject) obj);
6063
} else if (isInteropScalar.profile(isInteropScalar(obj))) {
6164
return ((RInteropScalar) obj).getRValue();
6265
} else {

‎com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ForNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@
5151
import com.oracle.truffle.r.runtime.RRuntime;
5252
import com.oracle.truffle.r.runtime.context.RContext;
5353
import com.oracle.truffle.r.runtime.data.RNull;
54-
import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
54+
import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
5555
import com.oracle.truffle.r.runtime.nodes.RCodeBuilder;
5656
import com.oracle.truffle.r.runtime.nodes.RNode;
5757
import com.oracle.truffle.r.runtime.nodes.RSyntaxCall;
5858
import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
5959
import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
6060
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
6161

62-
@ImportStatic({RRuntime.class, ForeignArray2R.class, Message.class})
62+
@ImportStatic({RRuntime.class, ConvertForeignObjectNode.class, Message.class})
6363
@NodeChild(value = "range", type = RNode.class)
6464
public abstract class ForNode extends AbstractLoopNode implements RSyntaxNode, RSyntaxCall {
6565

0 commit comments

Comments
 (0)