From d66555f1cc5770e9f97ce6160f1ba6d45d5087ce Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Mon, 2 May 2016 16:15:44 +0200
Subject: [PATCH] Remove remaining RFactor references.
Plus few new tests. BinaryBooleanNode: not the most optimal code for factors,
but factor specialization should be removed and dispatched to their R code.
---
.../truffle/r/nodes/builtin/base/AnyNA.java | 14 +-
.../r/nodes/builtin/base/AsDouble.java | 13 +-
.../r/nodes/builtin/base/AsInteger.java | 13 +-
.../r/nodes/builtin/base/AsVector.java | 45 +---
.../r/nodes/builtin/base/CopyDFAttr.java | 8 -
.../truffle/r/nodes/builtin/base/Format.java | 24 +-
.../r/nodes/builtin/base/Identical.java | 20 +-
.../truffle/r/nodes/builtin/base/IsNA.java | 22 +-
.../r/nodes/builtin/base/IsTypeFunctions.java | 35 +--
.../truffle/r/nodes/builtin/base/Match.java | 7 +-
.../truffle/r/nodes/builtin/base/NChar.java | 11 +-
.../nodes/builtin/base/PrettyPrinterNode.java | 72 ++----
.../truffle/r/nodes/builtin/base/Repeat.java | 12 +-
.../truffle/r/nodes/builtin/base/Split.java | 6 +-
.../r/nodes/builtin/base/Tabulate.java | 6 -
.../truffle/r/nodes/builtin/base/UnClass.java | 14 -
.../truffle/r/nodes/builtin/base/Unique.java | 28 +-
.../builtin/base/printer/FactorPrinter.java | 6 +-
.../vector/CachedExtractVectorNode.java | 14 +-
.../vector/CachedReplaceVectorNode.java | 23 +-
.../nodes/access/vector/PositionCastNode.java | 27 +-
.../r/nodes/binary/BinaryArithmeticNode.java | 45 +---
.../r/nodes/binary/BinaryBooleanNode.java | 59 ++---
.../r/nodes/binary/BinaryNodeBase.java | 65 +++++
.../nodes/function/WrapArgumentBaseNode.java | 1 -
.../r/nodes/helpers/InheritsCheckNode.java | 11 +-
.../truffle/r/nodes/helpers/RFactorNodes.java | 17 +-
.../r/nodes/unary/CastIntegerNode.java | 23 +-
.../r/nodes/unary/CastLogicalNode.java | 12 +-
.../r/nodes/unary/CastToContainerNode.java | 12 +-
.../r/nodes/unary/CastToVectorNode.java | 12 +-
.../truffle/r/nodes/unary/IsFactorNode.java | 9 +-
.../truffle/r/nodes/unary/PrecedenceNode.java | 26 +-
.../oracle/truffle/r/runtime/RDeparse.java | 31 +--
.../oracle/truffle/r/runtime/RSerialize.java | 45 +---
.../com/oracle/truffle/r/runtime/Utils.java | 2 +-
.../truffle/r/runtime/data/RAttributable.java | 4 +-
.../truffle/r/runtime/data/RDataFactory.java | 4 -
.../truffle/r/runtime/data/RFactor.java | 239 +-----------------
.../oracle/truffle/r/runtime/data/RTypes.java | 2 +-
.../truffle/r/runtime/data/RVector.java | 6 +-
.../r/runtime/data/closures/RClosures.java | 13 +-
.../RFactorToComplexVectorClosure.java | 1 -
.../RFactorToDoubleVectorClosure.java | 1 -
.../truffle/r/runtime/gnur/SEXPTYPE.java | 26 +-
.../oracle/truffle/r/runtime/nodes/RNode.java | 43 +---
.../truffle/r/test/ExpectedTestOutput.test | 28 ++
.../r/test/builtins/TestBuiltin_isna.java | 3 +
.../test/builtins/TestBuiltin_operators.java | 7 +
49 files changed, 279 insertions(+), 888 deletions(-)
create mode 100644 com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryNodeBase.java
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java
index 38789f6c31..f7be50677a 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java
@@ -33,17 +33,10 @@ import com.oracle.truffle.r.runtime.RBuiltinKind;
import com.oracle.truffle.r.runtime.RDispatch;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RList;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.ops.na.NACheck;
@RBuiltin(name = "anyNA", kind = RBuiltinKind.PRIMITIVE, parameterNames = {"x"}, dispatch = RDispatch.INTERNAL_GENERIC)
@@ -140,11 +133,6 @@ public abstract class AnyNA extends RBuiltinNode {
return doScalar(false);
}
- @Specialization
- protected byte isNA(RFactor value) {
- return doVector(value.getVector(), (v, i) -> naCheck.check(v.getDataAt(i)));
- }
-
protected AnyNA createRecursive() {
return AnyNANodeGen.create(null);
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
index fa8dec148f..5b8d1e5d48 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
@@ -30,13 +30,7 @@ import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.unary.CastDoubleNode;
import com.oracle.truffle.r.nodes.unary.CastDoubleNodeGen;
import com.oracle.truffle.r.runtime.RBuiltin;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDoubleSequence;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RNull;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@RBuiltin(name = "as.double", aliases = {"as.numeric"}, kind = PRIMITIVE, parameterNames = {"x", "..."})
@@ -116,9 +110,4 @@ public abstract class AsDouble extends RBuiltinNode {
initCast();
return (RDoubleVector) castDoubleNode.executeDouble(vector);
}
-
- @Specialization
- protected RDoubleVector asDouble(RFactor vector) {
- return asDouble(vector.getVector());
- }
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
index 5f760658c2..02ea4ef335 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
@@ -31,13 +31,7 @@ import com.oracle.truffle.r.nodes.unary.CastIntegerNode;
import com.oracle.truffle.r.nodes.unary.CastIntegerNodeGen;
import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.conn.RConnection;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RRaw;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -119,11 +113,6 @@ public abstract class AsInteger extends RBuiltinNode {
return (RAbstractIntVector) castIntNode.executeInt(vector);
}
- @Specialization
- protected RIntVector asInteger(RFactor factor) {
- return asInteger(factor.getVector());
- }
-
@Specialization
protected int asInteger(RConnection conn) {
return conn.getDescriptor();
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java
index 8e87d47dff..b7c3348fa9 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java
@@ -40,35 +40,9 @@ import com.oracle.truffle.r.nodes.function.ClassHierarchyNode;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNodeGen;
import com.oracle.truffle.r.nodes.function.S3FunctionLookupNode;
import com.oracle.truffle.r.nodes.function.UseMethodInternalNode;
-import com.oracle.truffle.r.nodes.unary.CastComplexNode;
-import com.oracle.truffle.r.nodes.unary.CastDoubleNode;
-import com.oracle.truffle.r.nodes.unary.CastExpressionNode;
-import com.oracle.truffle.r.nodes.unary.CastIntegerNode;
-import com.oracle.truffle.r.nodes.unary.CastListNode;
-import com.oracle.truffle.r.nodes.unary.CastListNodeGen;
-import com.oracle.truffle.r.nodes.unary.CastLogicalNode;
-import com.oracle.truffle.r.nodes.unary.CastRawNode;
-import com.oracle.truffle.r.nodes.unary.CastSymbolNode;
-import com.oracle.truffle.r.runtime.ArgumentsSignature;
-import com.oracle.truffle.r.runtime.RBuiltin;
-import com.oracle.truffle.r.runtime.RError;
-import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.RType;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDouble;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RInteger;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogical;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypes;
-import com.oracle.truffle.r.runtime.data.RVector;
+import com.oracle.truffle.r.nodes.unary.*;
+import com.oracle.truffle.r.runtime.*;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -98,6 +72,8 @@ public abstract class AsVector extends RBuiltinNode {
RStringVector clazz = classHierarchy.execute(x);
if (hasClassProfile.profile(clazz != null)) {
if (useMethod == null) {
+ // Note: this dispatch takes care of factor, because there is as.vector.factor
+ // specialization in R
CompilerDirectives.transferToInterpreterAndInvalidate();
useMethod = insert(new UseMethodInternalNode("as.vector", SIGNATURE, false));
}
@@ -197,17 +173,6 @@ public abstract class AsVector extends RBuiltinNode {
return result;
}
- @Specialization(guards = "modeIsAny(mode)")
- protected RAbstractVector asVector(RFactor x, @SuppressWarnings("unused") String mode) {
- RVector levels = x.getLevels(attrProfiles);
- RVector result = levels.createEmptySameType(x.getLength(), RDataFactory.COMPLETE_VECTOR);
- RIntVector factorData = x.getVector();
- for (int i = 0; i < result.getLength(); i++) {
- result.transferElementSameType(i, levels, factorData.getDataAt(i) - 1);
- }
- return result;
- }
-
@Specialization(guards = "modeIsAny(mode)")
protected RNull asVector(RNull x, @SuppressWarnings("unused") String mode) {
return x;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CopyDFAttr.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CopyDFAttr.java
index 101c464098..2d4ed6aa7b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CopyDFAttr.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CopyDFAttr.java
@@ -29,7 +29,6 @@ import com.oracle.truffle.r.nodes.builtin.RInvisibleBuiltinNode;
import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.data.RAttributable;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -45,11 +44,4 @@ public abstract class CopyDFAttr extends RInvisibleBuiltinNode {
res.resetAllAttributes(false);
return res.copyAttributesFrom(attrProfiles, in);
}
-
- @Specialization()
- protected RAttributable copy(RAbstractContainer in, RFactor out) {
- RVector res = out.getVector();
- res.resetAllAttributes(false);
- return res.copyAttributesFrom(attrProfiles, in);
- }
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Format.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Format.java
index f6abfbfb73..9d47816e0c 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Format.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Format.java
@@ -13,16 +13,20 @@ package com.oracle.truffle.r.nodes.builtin.base;
import static com.oracle.truffle.r.runtime.RBuiltinKind.INTERNAL;
-import com.oracle.truffle.api.*;
-import com.oracle.truffle.api.dsl.*;
-import com.oracle.truffle.api.profiles.*;
-import com.oracle.truffle.r.nodes.builtin.*;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.r.nodes.builtin.CastBuilder;
+import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.builtin.base.printer.AnyVectorToStringVectorWriter;
import com.oracle.truffle.r.nodes.builtin.base.printer.ValuePrinterNode;
import com.oracle.truffle.r.nodes.builtin.base.printer.ValuePrinterNodeGen;
-import com.oracle.truffle.r.nodes.unary.*;
-import com.oracle.truffle.r.runtime.*;
-import com.oracle.truffle.r.runtime.context.*;
+import com.oracle.truffle.r.nodes.unary.CastIntegerNode;
+import com.oracle.truffle.r.nodes.unary.CastIntegerNodeGen;
+import com.oracle.truffle.r.runtime.RBuiltin;
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.*;
@@ -157,12 +161,6 @@ public abstract class Format extends RBuiltinNode {
return value.materialize();
}
- @Specialization
- protected RStringVector format(RFactor value, RLogicalVector trimVec, RIntVector digitsVec, RIntVector nsmallVec, RIntVector widthVec, RIntVector justifyVec, RLogicalVector naEncodeVec,
- RAbstractVector sciVec, RAbstractStringVector decimalMark) {
- return format(value.getVector(), trimVec, digitsVec, nsmallVec, widthVec, justifyVec, naEncodeVec, sciVec, decimalMark);
- }
-
// TruffleDSL bug - should not need multiple guards here
protected void checkArgs(RLogicalVector trimVec, RIntVector digitsVec, RIntVector nsmallVec, RIntVector widthVec, RIntVector justifyVec, RLogicalVector naEncodeVec, RAbstractVector sciVec,
RAbstractStringVector decimalMark) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Identical.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Identical.java
index 3cafe87eb6..f1dfce08df 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Identical.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Identical.java
@@ -37,18 +37,8 @@ import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.conn.RConnection;
-import com.oracle.truffle.r.runtime.data.RAttributable;
-import com.oracle.truffle.r.runtime.data.RAttributes;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.RAttributes.RAttribute;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RS4Object;
-import com.oracle.truffle.r.runtime.data.RSymbol;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -273,14 +263,6 @@ public abstract class Identical extends RBuiltinNode {
return identicalAttr(x, y, numEq, singleNA, attribAsSet, ignoreBytecode, ignoreEnvironment);
}
- @Specialization
- protected byte doInternalIdenticalGeneric(RFactor x, RFactor y, boolean numEq, boolean singleNA, boolean attribAsSet, boolean ignoreBytecode, boolean ignoreEnvironment) {
- if (!recursive) {
- controlVisibility();
- }
- return doInternalIdenticalGeneric(x.getVector(), y.getVector(), numEq, singleNA, attribAsSet, ignoreBytecode, ignoreEnvironment);
- }
-
@SuppressWarnings("unused")
@Specialization
protected byte doInternalIdenticalGeneric(RFunction x, RAbstractContainer y, boolean numEq, boolean singleNA, boolean attribAsSet, boolean ignoreBytecode, boolean ignoreEnvironment) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java
index 5d2cc51956..329afd4da9 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java
@@ -29,25 +29,14 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.runtime.RBuiltin;
+import com.oracle.truffle.r.runtime.RDispatch;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-@RBuiltin(name = "is.na", kind = PRIMITIVE, parameterNames = {"x"})
+@RBuiltin(name = "is.na", kind = PRIMITIVE, parameterNames = {"x"}, dispatch = RDispatch.INTERNAL_GENERIC)
public abstract class IsNA extends RBuiltinNode {
@Child private IsNA recursiveIsNA;
@@ -172,11 +161,6 @@ public abstract class IsNA extends RBuiltinNode {
return RRuntime.asLogical(RRuntime.isNA(value));
}
- @Specialization
- protected RLogicalVector isNA(RFactor value) {
- return isNA(value.getVector());
- }
-
@Specialization
protected byte isNA(@SuppressWarnings("unused") RRaw value) {
controlVisibility();
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeFunctions.java
index 77b31b5054..34efd3d0d0 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeFunctions.java
@@ -31,19 +31,9 @@ import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
-import com.oracle.truffle.r.runtime.RBuiltin;
-import com.oracle.truffle.r.runtime.RBuiltinKind;
-import com.oracle.truffle.r.runtime.RError;
-import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.RType;
+import com.oracle.truffle.r.runtime.*;
import com.oracle.truffle.r.runtime.data.*;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.nodes.RNode;
/**
@@ -109,12 +99,6 @@ public class IsTypeFunctions {
return RRuntime.LOGICAL_TRUE;
}
- @Specialization
- protected byte isRecursive(RFactor arg) {
- controlVisibility();
- return RRuntime.LOGICAL_FALSE;
- }
-
protected boolean isListVector(RAbstractVector arg) {
return arg instanceof RList;
}
@@ -129,6 +113,8 @@ public class IsTypeFunctions {
@RBuiltin(name = "is.atomic", kind = PRIMITIVE, parameterNames = {"x"})
public abstract static class IsAtomic extends MissingAdapter {
+ @Child private InheritsCheckNode inheritsFactorCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
+
@Specialization
protected byte isAtomic(RNull arg) {
controlVisibility();
@@ -141,18 +127,16 @@ public class IsTypeFunctions {
return RRuntime.LOGICAL_TRUE;
}
- @Specialization
- protected byte isAtomic(RFactor arg) {
- controlVisibility();
- return RRuntime.LOGICAL_TRUE;
- }
-
protected static boolean isNonListVector(Object value) {
return value instanceof Integer || value instanceof Double || value instanceof RComplex || value instanceof String || value instanceof RRaw ||
(value instanceof RAbstractVector && !(value instanceof RList));
}
- @Specialization(guards = {"!isRMissing(value)", "!isRNull(value)", "!isRFactor(value)", "!isNonListVector(value)"})
+ protected boolean isFactor(Object value) {
+ return inheritsFactorCheck.execute(value);
+ }
+
+ @Specialization(guards = {"!isRMissing(value)", "!isRNull(value)", "!isFactor(value)", "!isNonListVector(value)"})
protected byte isType(Object value) {
controlVisibility();
return RRuntime.LOGICAL_FALSE;
@@ -420,6 +404,7 @@ public class IsTypeFunctions {
}
@Child private InheritsCheckNode inheritsCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
+
protected boolean isFactor(Object o) {
return inheritsCheck.execute(o);
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Match.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Match.java
index ffb11163d0..0211b1e052 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Match.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Match.java
@@ -41,12 +41,7 @@ import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.closures.RClosures;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.ops.na.NACheck;
import com.oracle.truffle.r.runtime.ops.na.NAProfile;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NChar.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NChar.java
index 2fd7dcd2d5..9fb021ee9d 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NChar.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NChar.java
@@ -29,6 +29,7 @@ import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
+import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
import com.oracle.truffle.r.nodes.unary.CastStringNode;
import com.oracle.truffle.r.nodes.unary.CastStringNodeGen;
import com.oracle.truffle.r.nodes.unary.ConversionFailedException;
@@ -38,7 +39,6 @@ import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RIntVector;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
@@ -49,6 +49,7 @@ import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
public abstract class NChar extends RBuiltinNode {
@Child private CastStringNode convertString;
+ @Child private InheritsCheckNode factorInheritsCheck;
private final RAttributeProfiles attrProfiles = RAttributeProfiles.create();
@@ -127,9 +128,15 @@ public abstract class NChar extends RBuiltinNode {
@Fallback
protected RIntVector nchar(Object obj, Object type, Object allowNA, Object keepNA) {
controlVisibility();
- if (obj instanceof RFactor) {
+ if (factorInheritsCheck == null) {
+ CompilerDirectives.transferToInterpreter();
+ factorInheritsCheck = insert(new InheritsCheckNode(RRuntime.CLASS_FACTOR));
+ }
+
+ if (factorInheritsCheck.execute(obj)) {
throw RError.error(this, RError.Message.REQUIRES_CHAR_VECTOR, "nchar");
}
+
if (obj instanceof RAbstractVector) {
RAbstractVector vector = (RAbstractVector) obj;
int len = vector.getLength();
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
index d4610cda7c..80c47dc37c 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
@@ -37,56 +37,20 @@ import com.oracle.truffle.api.nodes.RootNode;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.r.nodes.RRootNode;
import com.oracle.truffle.r.nodes.access.ConstantNode;
-import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.PrettyPrinterSingleListElementNodeGen;
-import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.PrettyPrinterSingleVectorElementNodeGen;
-import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.PrintDimNodeGen;
-import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.PrintVector2DimNodeGen;
-import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.PrintVectorMultiDimNodeGen;
+import com.oracle.truffle.r.nodes.builtin.base.PrettyPrinterNodeGen.*;
import com.oracle.truffle.r.nodes.function.FormalArguments;
+import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
+import com.oracle.truffle.r.nodes.helpers.RFactorNodes;
import com.oracle.truffle.r.nodes.unary.CastStringNode;
import com.oracle.truffle.r.nodes.unary.CastStringNodeGen;
-import com.oracle.truffle.r.runtime.ArgumentsSignature;
-import com.oracle.truffle.r.runtime.RArguments;
-import com.oracle.truffle.r.runtime.RDeparse;
-import com.oracle.truffle.r.runtime.RError;
-import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.*;
import com.oracle.truffle.r.runtime.conn.SocketConnections;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.data.RAttributable;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RAttributes;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.RAttributes.RAttribute;
-import com.oracle.truffle.r.runtime.data.RBuiltinDescriptor;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDouble;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RPromise;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RS4Object;
-import com.oracle.truffle.r.runtime.data.RString;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RVector;
import com.oracle.truffle.r.runtime.data.closures.RClosures;
import com.oracle.truffle.r.runtime.data.closures.RFactorToStringVectorClosure;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.nodes.RNode;
import com.oracle.truffle.r.runtime.ops.na.NACheck;
@@ -1185,7 +1149,7 @@ public abstract class PrettyPrinterNode extends RNode {
}
@TruffleBoundary
- @Specialization
+ @Specialization(guards = "!isFactor(operand)")
protected String prettyPrintListElement(RAbstractVector operand, Object listElementName, byte quote, byte right) {
return prettyPrintSingleElement(operand, listElementName, quote, right);
}
@@ -1220,10 +1184,22 @@ public abstract class PrettyPrinterNode extends RNode {
return prettyPrintSingleElement(operand, listElementName, quote, right);
}
+ @Child InheritsCheckNode factorInheritsCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
+ @Child RFactorNodes.GetLevels getFactorLevels;
+
+ protected boolean isFactor(Object o) {
+ return this.factorInheritsCheck.execute(o);
+ }
+
// TODO: this should be handled by an S3 function
- @Specialization
- protected String prettyPrintListElement(RFactor operand, Object listElementName, byte quote, byte right) {
- RVector vec = operand.getLevels(attrProfiles);
+ @Specialization(guards = "isFactor(factor)")
+ protected String prettyPrintListElement(RAbstractIntVector factor, Object listElementName, byte quote, byte right) {
+ if (getFactorLevels == null) {
+ CompilerDirectives.transferToInterpreter();
+ getFactorLevels = insert(new RFactorNodes.GetLevels());
+ }
+
+ RVector vec = getFactorLevels.execute(factor);
String[] strings;
if (vec == null) {
strings = new String[0];
@@ -1234,11 +1210,11 @@ public abstract class PrettyPrinterNode extends RNode {
strings[i] = (String) castStringNode.executeString(vec.getDataAtAsObject(i));
}
}
- return formatLevelStrings(operand, listElementName, right, vec, strings);
+ return formatLevelStrings(factor, listElementName, right, vec, strings);
}
@TruffleBoundary
- private String formatLevelStrings(RFactor operand, Object listElementName, byte right, RVector vec, String[] strings) {
+ private String formatLevelStrings(RAbstractIntVector operand, Object listElementName, byte right, RVector vec, String[] strings) {
StringBuilder sb = new StringBuilder(prettyPrintSingleElement(RClosures.createFactorToVector(operand, true, attrProfiles), listElementName, RRuntime.LOGICAL_FALSE, right));
sb.append("\nLevels:");
if (vec != null) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Repeat.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Repeat.java
index af4d67f6ff..cc1f2ce326 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Repeat.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Repeat.java
@@ -26,7 +26,6 @@ import static com.oracle.truffle.r.runtime.RBuiltinKind.PRIMITIVE;
import java.util.Arrays;
-import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -36,13 +35,7 @@ import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.RDispatch;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -67,8 +60,7 @@ import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
* </ul>
* </ol>
*/
-@RBuiltin(name = "rep", kind = PRIMITIVE, parameterNames = {"x", "times", "length.out", "each"},
- dispatch = RDispatch.INTERNAL_GENERIC)
+@RBuiltin(name = "rep", kind = PRIMITIVE, parameterNames = {"x", "times", "length.out", "each"}, dispatch = RDispatch.INTERNAL_GENERIC)
public abstract class Repeat extends RBuiltinNode {
protected abstract Object execute(RAbstractVector x, RAbstractIntVector times, int lengthOut, int each);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java
index f5108855d6..0edc9d0761 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java
@@ -36,8 +36,8 @@ import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.*;
/**
- * The {@code split} internal. Internal version of 'split' is invoked from 'split.default'
- * function implemented in R, which makes sure that the second argument is always a R factor.
+ * The {@code split} internal. Internal version of 'split' is invoked from 'split.default' function
+ * implemented in R, which makes sure that the second argument is always a R factor.
*
* TODO Can we find a way to efficiently write the specializations as generics? The code is
* identical except for the argument type.
@@ -45,12 +45,10 @@ import com.oracle.truffle.r.runtime.data.model.*;
@RBuiltin(name = "split", kind = INTERNAL, parameterNames = {"x", "f"})
public abstract class Split extends RBuiltinNode {
-
@Child private RFactorNodes.GetLevels getLevelNode = new RFactorNodes.GetLevels();
private final ConditionProfile noStringLevels = ConditionProfile.createBinaryProfile();
-
private static final int INITIAL_SIZE = 5;
private static final int SCALE_FACTOR = 2;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Tabulate.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Tabulate.java
index e10fb7d5ba..829cc8dcc9 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Tabulate.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Tabulate.java
@@ -22,7 +22,6 @@ import com.oracle.truffle.r.runtime.RBuiltinKind;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
@@ -55,11 +54,6 @@ public abstract class Tabulate extends RBuiltinNode {
return RDataFactory.createIntVector(ans, RDataFactory.COMPLETE_VECTOR);
}
- @Specialization
- protected RIntVector tabulate(RFactor bin, int nBins) {
- return tabulate(bin.getVector(), nBins);
- }
-
@SuppressWarnings("unused")
@Fallback
@TruffleBoundary
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UnClass.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UnClass.java
index 22fc1a5967..92572424d1 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UnClass.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UnClass.java
@@ -20,7 +20,6 @@ import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RLanguage;
import com.oracle.truffle.r.runtime.data.RS4Object;
import com.oracle.truffle.r.runtime.data.RVector;
@@ -48,19 +47,6 @@ public abstract class UnClass extends RBuiltinNode {
return arg;
}
- @Specialization
- @TruffleBoundary
- protected Object unClass(RFactor arg) {
- controlVisibility();
- RFactor resultFactor = arg;
- if (!resultFactor.isTemporary()) {
- resultFactor = resultFactor.copy();
- assert resultFactor.isTemporary();
- resultFactor.incRefCount();
- }
- return RVector.setVectorClassAttr(resultFactor.getVector(), null, arg);
- }
-
@Specialization
protected Object unClass(RLanguage arg) {
controlVisibility();
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Unique.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Unique.java
index 5f954d44f3..7e7efef62f 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Unique.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Unique.java
@@ -35,27 +35,8 @@ import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.runtime.RBuiltin;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.Utils;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
+import com.oracle.truffle.r.runtime.data.*;
+import com.oracle.truffle.r.runtime.data.model.*;
// Implements default S3 method
@RBuiltin(name = "unique", kind = INTERNAL, parameterNames = {"x", "incomparables", "fromLast", "nmax", "..."})
@@ -86,11 +67,6 @@ public abstract class Unique extends RBuiltinNode {
return vec;
}
- @Specialization
- protected RAbstractContainer doUnique(VirtualFrame frame, RFactor factor, byte incomparables, byte fromLast, Object nmax, RArgsValuesAndNames vararg) {
- return uniqueRecursive(frame, factor.getVector(), incomparables, fromLast, nmax, vararg);
- }
-
@SuppressWarnings("unused")
@Specialization
protected RStringVector doUnique(RAbstractStringVector vec, byte incomparables, byte fromLast, Object nmax, RArgsValuesAndNames vararg) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/FactorPrinter.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/FactorPrinter.java
index 75b6ff68fa..595240c694 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/FactorPrinter.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/FactorPrinter.java
@@ -44,9 +44,9 @@ final class FactorPrinter extends AbstractValuePrinter<RAbstractIntVector> {
@Override
protected void printValue(RAbstractIntVector operand, PrintContext printCtx) throws IOException {
- // TODO: this should be handled by an S3 function. Should it? For example, in C code for split,
- // there is direct call to getAttrib. This should be refactored to use AttributeAccess node or even
- // Factor.GetLevels node. The same holds for the access
+ // TODO: this should be handled by an S3 function. Should it? For example, in C code for
+ // split, there is direct call to getAttrib. This should be refactored to use
+ // AttributeAccess node or even Factor.GetLevels node. The same holds for the access
RVector levels = RFactor.getLevels(operand);
String[] strings;
if (levels == null) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java
index 6d2db86cdb..0b43bf6c4e 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java
@@ -39,19 +39,7 @@ import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RAttributes;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogical;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RString;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
-import com.oracle.truffle.r.runtime.data.RVector;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java
index c7302cf8db..cc23fc9465 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java
@@ -41,20 +41,7 @@ import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RError.Message;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RScalarVector;
-import com.oracle.truffle.r.runtime.data.RShareable;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
-import com.oracle.truffle.r.runtime.data.RVector;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -146,11 +133,7 @@ final class CachedReplaceVectorNode extends CachedVectorNode {
value = castType.getEmpty();
}
} else {
- if (!isList() && castValue instanceof RFactor) {
- value = ((RFactor) castValue).getVector();
- } else {
- value = (RTypedValue) castValue;
- }
+ value = (RTypedValue) castValue;
}
int appliedValueLength;
@@ -227,8 +210,6 @@ final class CachedReplaceVectorNode extends CachedVectorNode {
}
if (isList()) {
- // TODO: RFactor refactoring: with value instanceof RFactor and isList() == true, we can reach this point,
- // but we would not reach it if we simply set value = inner vector of RFactor
if (mode.isSubscript()) {
value = copyValueOnAssignment(value);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/PositionCastNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/PositionCastNode.java
index 8cbb1b12d1..6579b8088e 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/PositionCastNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/PositionCastNode.java
@@ -30,26 +30,8 @@ import com.oracle.truffle.r.nodes.unary.CastIntegerNode;
import com.oracle.truffle.r.nodes.unary.CastIntegerNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RType;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDouble;
-import com.oracle.truffle.r.runtime.data.REmpty;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RInteger;
-import com.oracle.truffle.r.runtime.data.RLogical;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RString;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.*;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.ops.na.NACheck;
@@ -93,11 +75,6 @@ abstract class PositionCastNode extends Node {
return position;
}
- @Specialization
- protected RAbstractVector doFactor(RFactor position) {
- return position.getVector();
- }
-
@Specialization
protected RAbstractVector doDouble(double position, @Cached("create()") NACheck check) {
if (mode.isSubscript()) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
index 40c2309c5c..a9c8c2fbf9 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
@@ -30,31 +30,29 @@ import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ValueProfile;
-import com.oracle.truffle.r.nodes.attributes.AttributeAccess;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
-import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.control.RLengthNode;
-import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
-import com.oracle.truffle.r.nodes.helpers.RFactorNodes;
import com.oracle.truffle.r.nodes.primitive.BinaryMapNode;
import com.oracle.truffle.r.nodes.profile.TruffleBoundaryNode;
import com.oracle.truffle.r.nodes.unary.UnaryArithmeticNode;
import com.oracle.truffle.r.nodes.unary.UnaryArithmeticNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RError.Message;
-import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
-import com.oracle.truffle.r.runtime.data.*;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.RDataFactory;
+import com.oracle.truffle.r.runtime.data.RMissing;
+import com.oracle.truffle.r.runtime.data.RNull;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.ops.BinaryArithmetic;
import com.oracle.truffle.r.runtime.ops.BinaryArithmeticFactory;
import com.oracle.truffle.r.runtime.ops.UnaryArithmeticFactory;
-public abstract class BinaryArithmeticNode extends RBuiltinNode {
+/**
+ * Represents a binary or unary operation from the 'arithmetic' subset of Ops R group. The concrete
+ * operation is implemented by factory object given as a constructor parameter, e.g.
+ * {@link com.oracle.truffle.r.runtime.ops.BinaryArithmetic.Add}
+ */
+public abstract class BinaryArithmeticNode extends BinaryNodeBase {
protected static final int CACHE_LIMIT = 5;
@@ -76,14 +74,14 @@ public abstract class BinaryArithmeticNode extends RBuiltinNode {
}
@Specialization(limit = "CACHE_LIMIT", guards = {"cached != null", "cached.isSupported(left, right)",
- "!isFactor(left)", "!isFactor(right)"})
+ "!isFactor(left)", "!isFactor(right)"})
protected Object doNumericVectorCached(Object left, Object right, //
@Cached("createFastCached(left, right)") BinaryMapNode cached) {
return cached.apply(left, right);
}
@Specialization(contains = "doNumericVectorCached", guards = {"isNumericVector(left)", "isNumericVector(right)",
- "!isFactor(left)", "!isFactor(right)"})
+ "!isFactor(left)", "!isFactor(right)"})
@TruffleBoundary
protected Object doNumericVectorGeneric(Object left, Object right, //
@Cached("binary.create()") BinaryArithmetic arithmetic, //
@@ -120,15 +118,10 @@ public abstract class BinaryArithmeticNode extends RBuiltinNode {
}
}
- @Child private InheritsCheckNode factorInheritCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
- protected boolean isFactor(Object value) {
- return factorInheritCheck.execute(value);
- }
-
@Specialization(guards = "isFactor(left) || isFactor(right)")
protected Object doFactor(VirtualFrame frame, RAbstractIntVector left, RAbstractIntVector right, @Cached("create()") RLengthNode lengthNode) {
Message warning;
- if (factorInheritCheck.execute(left)) {
+ if (isFactor(left)) {
warning = getFactorWarning(left);
} else {
warning = getFactorWarning(right);
@@ -137,18 +130,6 @@ public abstract class BinaryArithmeticNode extends RBuiltinNode {
return RDataFactory.createNAVector(Math.max(lengthNode.executeInteger(frame, left), lengthNode.executeInteger(frame, right)));
}
- @Child private RFactorNodes.GetOrdered isOrderedFactor = null;
- private Message getFactorWarning(RAbstractIntVector factor) {
- if (isOrderedFactor == null) {
- CompilerDirectives.transferToInterpreterAndInvalidate();
- isOrderedFactor = insert(new RFactorNodes.GetOrdered());
- }
-
- return isOrderedFactor.execute(factor) ?
- Message.NOT_MEANINGFUL_FOR_ORDERED_FACTORS :
- Message.NOT_MEANINGFUL_FOR_FACTORS;
- }
-
@Specialization
@SuppressWarnings("unused")
protected static Object doBothNull(RNull left, RNull right) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
index 86c2081bdd..70123f839c 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
@@ -28,8 +28,8 @@ import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
-import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.control.RLengthNode;
import com.oracle.truffle.r.nodes.primitive.BinaryMapNode;
import com.oracle.truffle.r.nodes.profile.TruffleBoundaryNode;
@@ -39,16 +39,9 @@ import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.conn.RConnection;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RInteger;
import com.oracle.truffle.r.runtime.data.closures.RClosures;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.ops.BinaryCompare;
import com.oracle.truffle.r.runtime.ops.BinaryLogic;
import com.oracle.truffle.r.runtime.ops.BinaryLogic.And;
@@ -56,7 +49,13 @@ import com.oracle.truffle.r.runtime.ops.BinaryLogic.Or;
import com.oracle.truffle.r.runtime.ops.BooleanOperation;
import com.oracle.truffle.r.runtime.ops.BooleanOperationFactory;
-public abstract class BinaryBooleanNode extends RBuiltinNode {
+/**
+ * Represents a binary or unary operation from the 'logical' subset of Ops R group. The concrete
+ * operation is implemented by factory object given as a constructor parameter, e.g.
+ * {@link com.oracle.truffle.r.runtime.ops.BinaryCompare.Equal} or
+ * {@link com.oracle.truffle.r.runtime.ops.BinaryLogic.And}.
+ */
+public abstract class BinaryBooleanNode extends BinaryNodeBase {
protected static final int CACHE_LIMIT = 5;
@@ -123,10 +122,6 @@ public abstract class BinaryBooleanNode extends RBuiltinNode {
(!isLogicOp(factory) && (value instanceof RAbstractStringVector || value instanceof RAbstractRawVector));
}
- protected static boolean isFactor(Object value) {
- return value instanceof RFactor;
- }
-
@Specialization(guards = {"isRConnection(left) || isRConnection(right)"})
protected Object doConnection(VirtualFrame frame, Object left, Object right, //
@Cached("createRecursive()") BinaryBooleanNode recursive) {
@@ -146,13 +141,15 @@ public abstract class BinaryBooleanNode extends RBuiltinNode {
@Cached("createRecursive()") BinaryBooleanNode recursive, //
@Cached("create()") RAttributeProfiles attrProfiles) {
Object recursiveLeft = left;
- if (recursiveLeft instanceof RFactor) {
- recursiveLeft = RClosures.createFactorToVector(((RFactor) recursiveLeft).getVector(), false, attrProfiles);
+ if (isFactor(left)) {
+ recursiveLeft = RClosures.createFactorToVector((RAbstractIntVector) left, false, attrProfiles);
}
+
Object recursiveRight = right;
- if (recursiveRight instanceof RFactor) {
- recursiveRight = RClosures.createFactorToVector(((RFactor) recursiveRight).getVector(), false, attrProfiles);
+ if (isFactor(right)) {
+ recursiveRight = RClosures.createFactorToVector((RAbstractIntVector) right, false, attrProfiles);
}
+
return recursive.execute(frame, recursiveLeft, recursiveRight);
}
@@ -163,34 +160,32 @@ public abstract class BinaryBooleanNode extends RBuiltinNode {
@Specialization(guards = {"isFactor(left) || isFactor(right)", "!meaningfulFactorOp(left, right)"})
protected Object doFactorNotMeaniningful(VirtualFrame frame, Object left, Object right, @Cached("create()") RLengthNode lengthNode) {
Message warning;
- if (left instanceof RFactor) {
- warning = getFactorWarning((RFactor) left);
+ if (isFactor(left)) {
+ warning = getFactorWarning((RAbstractIntVector) left);
} else {
- warning = getFactorWarning((RFactor) right);
+ warning = getFactorWarning((RAbstractIntVector) right);
}
RError.warning(this, warning, factory.create().opName());
return RDataFactory.createNAVector(Math.max(lengthNode.executeInteger(frame, left), lengthNode.executeInteger(frame, right)));
}
+ private ConditionProfile meaningfulOpForFactors = ConditionProfile.createBinaryProfile();
+
protected boolean meaningfulFactorOp(Object left, Object right) {
- if (factory == BinaryCompare.EQUAL || factory == BinaryCompare.NOT_EQUAL) {
+ if (meaningfulOpForFactors.profile(factory == BinaryCompare.EQUAL || factory == BinaryCompare.NOT_EQUAL)) {
return true;
- } else if (left instanceof RFactor) {
- boolean ordered = ((RFactor) left).isOrdered();
- if (right instanceof RFactor) {
- return ordered && ((RFactor) right).isOrdered();
+ } else if (isFactor(left)) {
+ boolean ordered = isOrderedFactor((RAbstractIntVector) left);
+ if (isFactor(right)) {
+ return ordered && isOrderedFactor((RAbstractIntVector) right);
}
return ordered;
} else {
- assert right instanceof RFactor;
- return ((RFactor) right).isOrdered();
+ assert isFactor(right) : "meaningfulFactorOp is expected to be invoked with at least one factor.";
+ return isOrderedFactor((RAbstractIntVector) right);
}
}
- private static Message getFactorWarning(RFactor factor) {
- return factor.isOrdered() ? Message.NOT_MEANINGFUL_FOR_ORDERED_FACTORS : Message.NOT_MEANINGFUL_FOR_FACTORS;
- }
-
@SuppressWarnings("unused")
@Specialization(guards = {"isRNullOrEmptyAndNotMissing(left, right)"})
protected static Object doEmptyOrNull(Object left, Object right) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryNodeBase.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryNodeBase.java
new file mode 100644
index 0000000000..4e2ff2270d
--- /dev/null
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryNodeBase.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.r.nodes.binary;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
+import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
+import com.oracle.truffle.r.nodes.helpers.RFactorNodes;
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
+
+/**
+ * Provides some shared code for nodes implemented in this package.
+ *
+ * TODO: for the time being, this code is only concerned with R factor class. Code specific to
+ * factors is necessary only because the proper R dispatch of operations implemented in this java
+ * package is not implemented yet. Once this is done, we can remove this base class. It also seems
+ * that {@link BinaryBooleanNode} and {@link BinaryArithmeticNode} are separate classes only to
+ * handle the difference in R specializations that implement them, e.g. Ops.factor handles
+ * 'arithmetic' subset of Ops differently than the 'logical'.
+ */
+abstract class BinaryNodeBase extends RBuiltinNode {
+
+ @Child private InheritsCheckNode factorInheritCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
+ @Child private RFactorNodes.GetOrdered isOrderedFactor = null;
+
+ protected boolean isFactor(Object value) {
+ return factorInheritCheck.execute(value);
+ }
+
+ protected boolean isOrderedFactor(RAbstractIntVector factor) {
+ if (isOrderedFactor == null) {
+ CompilerDirectives.transferToInterpreterAndInvalidate();
+ isOrderedFactor = insert(new RFactorNodes.GetOrdered());
+ }
+
+ return isOrderedFactor.execute(factor);
+ }
+
+ protected RError.Message getFactorWarning(RAbstractIntVector factor) {
+ return isOrderedFactor(factor) ? RError.Message.NOT_MEANINGFUL_FOR_ORDERED_FACTORS : RError.Message.NOT_MEANINGFUL_FOR_FACTORS;
+ }
+}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
index edbc963893..5210945655 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
@@ -23,7 +23,6 @@
package com.oracle.truffle.r.nodes.function;
import com.oracle.truffle.api.profiles.BranchProfile;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RFunction;
import com.oracle.truffle.r.runtime.data.RLanguage;
import com.oracle.truffle.r.runtime.data.RS4Object;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/InheritsCheckNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/InheritsCheckNode.java
index fbf600c93c..28a8070384 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/InheritsCheckNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/InheritsCheckNode.java
@@ -30,13 +30,14 @@ import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNode;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNodeGen;
import com.oracle.truffle.r.runtime.RType;
+import com.oracle.truffle.r.runtime.data.RMissing;
import com.oracle.truffle.r.runtime.data.RStringVector;
/**
- * Checks if given object has given R class. More specifically: whether its attribute
- * class is a vector that contains given class name as an element.
+ * Checks if given object has given R class. More specifically: whether its attribute class is a
+ * vector that contains given class name as an element.
*/
-public final class InheritsCheckNode extends Node {
+public class InheritsCheckNode extends Node {
@Child private ClassHierarchyNode classHierarchy = ClassHierarchyNodeGen.create(false, false);
private final ConditionProfile nullClassProfile = ConditionProfile.createBinaryProfile();
@@ -49,6 +50,10 @@ public final class InheritsCheckNode extends Node {
}
public boolean execute(Object value) {
+ if (value instanceof RMissing) {
+ return false;
+ }
+
RStringVector clazz = classHierarchy.execute(value);
if (nullClassProfile.profile(clazz != null)) {
for (int j = 0; j < clazz.getLength(); ++j) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
index 972f2dfc00..b05d17ea20 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
@@ -30,14 +30,17 @@ import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.nodes.attributes.AttributeAccess;
import com.oracle.truffle.r.nodes.unary.CastStringNode;
import com.oracle.truffle.r.nodes.unary.CastStringNodeGen;
-import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.*;
+import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
+import com.oracle.truffle.r.runtime.data.RDataFactory;
+import com.oracle.truffle.r.runtime.data.RStringVector;
+import com.oracle.truffle.r.runtime.data.RVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
/**
- * Contains helper nodes related to factors, special R class of {@link RAbstractIntVector}.
+ * Contains helper nodes related to factors, special R class of {@link RAbstractIntVector}. Note:
+ * there is also {@see IsFactorNode}, which implements a built-in, for checking factor class.
*/
public final class RFactorNodes {
@@ -74,8 +77,8 @@ public final class RFactorNodes {
private final ConditionProfile stringVectorLevels = ConditionProfile.createBinaryProfile();
/**
- * Returns the levels as a string vector. If the 'levels' attribute is not a string vector a cast is done.
- * May return null, if the 'levels' attribute is not present.
+ * Returns the levels as a string vector. If the 'levels' attribute is not a string vector a
+ * cast is done. May return null, if the 'levels' attribute is not present.
*/
public RStringVector execute(RAbstractIntVector factor) {
Object attr = attrAccess.execute(factor.getAttributes());
@@ -88,8 +91,8 @@ public final class RFactorNodes {
vec = (RVector) RRuntime.asAbstractVector(attr); // scalar to vector
} else {
notVectorBranch.enter();
- // N.B: when a factor is lacking the 'levels' attribute, GNU R uses range 1:14331272 as levels,
- // but probably only in 'split'. Following example prints a huge list:
+ // N.B: when a factor is lacking the 'levels' attribute, GNU R uses range 1:14331272
+ // as levels, but probably only in 'split'. Following example prints a huge list:
// { f <- factor(1:5); attr(f, 'levels') <- NULL; split(1:2, f) }
return null;
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java
index 9225582669..7b15cf7fed 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java
@@ -29,22 +29,8 @@ import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RDoubleSequence;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.*;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.ops.na.NAProfile;
public abstract class CastIntegerNode extends CastIntegerBaseNode {
@@ -215,11 +201,6 @@ public abstract class CastIntegerNode extends CastIntegerBaseNode {
return ret;
}
- @Specialization
- protected RIntVector doFactor(RFactor factor) {
- return factor.getVector();
- }
-
// TODO Should be type-variable and moved to CastNode
@Specialization(guards = {"args.getLength() == 1", "isIntVector(args.getArgument(0))"})
protected RIntVector doRArgsValuesAndNames(RArgsValuesAndNames args) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java
index 60510df19a..b41b5aeb67 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java
@@ -29,16 +29,7 @@ import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -173,6 +164,7 @@ public abstract class CastLogicalNode extends CastLogicalBaseNode {
}
@Child private InheritsCheckNode inheritsFactorCheck = new InheritsCheckNode(RRuntime.CLASS_FACTOR);
+
protected boolean isFactor(Object o) {
return inheritsFactorCheck.execute(o);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToContainerNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToContainerNode.java
index 260cca0912..c1a512ea7c 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToContainerNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToContainerNode.java
@@ -23,12 +23,7 @@
package com.oracle.truffle.r.nodes.unary;
import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.env.REnvironment;
@@ -52,11 +47,6 @@ public abstract class CastToContainerNode extends CastBaseNode {
return vector;
}
- @Specialization
- protected RFactor cast(RFactor factor) {
- return factor;
- }
-
@Specialization
protected RExpression cast(RExpression expression) {
return expression;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToVectorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToVectorNode.java
index 1734a58f8a..8f35c98a98 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToVectorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToVectorNode.java
@@ -24,12 +24,7 @@ package com.oracle.truffle.r.nodes.unary;
import com.oracle.truffle.api.dsl.NodeField;
import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RNull;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@NodeField(name = "nonVectorPreserved", type = boolean.class)
@@ -60,11 +55,6 @@ public abstract class CastToVectorNode extends CastNode {
return vector;
}
- @Specialization
- protected RAbstractVector cast(RFactor factor) {
- return factor.getVector();
- }
-
@Specialization
protected RList cast(RExpression expression) {
return expression.getList();
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
index 6596ce60af..bf740255bc 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
@@ -11,15 +11,14 @@
package com.oracle.truffle.r.nodes.unary;
+import static com.oracle.truffle.r.runtime.RRuntime.LOGICAL_FALSE;
+import static com.oracle.truffle.r.runtime.RRuntime.LOGICAL_TRUE;
+
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.helpers.InheritsCheckNode;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-
-import static com.oracle.truffle.r.runtime.RRuntime.LOGICAL_FALSE;
-import static com.oracle.truffle.r.runtime.RRuntime.LOGICAL_TRUE;
public abstract class IsFactorNode extends UnaryNode {
@@ -35,6 +34,8 @@ public abstract class IsFactorNode extends UnaryNode {
typeofNode = insert(TypeofNodeGen.create());
}
if (typeofNode.execute(x) != RType.Integer) {
+ // Note: R does not allow to set class 'factor' to an arbitrary object, unlike with
+ // data.frame
return LOGICAL_FALSE;
}
if (inheritsCheck == null) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java
index 8afec0273e..8c7b2e5314 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java
@@ -26,26 +26,7 @@ import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.ImportStatic;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDoubleSequence;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RS4Object;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
@@ -187,11 +168,6 @@ public abstract class PrecedenceNode extends RBaseNode {
return EXPRESSION_PRECEDENCE;
}
- @Specialization
- protected int doFactor(RFactor val, byte recursive) {
- return INT_PRECEDENCE;
- }
-
@Specialization
protected int doS4Object(RS4Object o, byte recursive) {
return LIST_PRECEDENCE;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java
index 207a3dd88d..c0c031affa 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java
@@ -23,38 +23,14 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.data.RAttributable;
-import com.oracle.truffle.r.runtime.data.RAttributes;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.RAttributes.RAttribute;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.REmpty;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RS4Object;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.gnur.SEXPTYPE;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxCall;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxConstant;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxFunction;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxVisitor;
+import com.oracle.truffle.r.runtime.nodes.*;
/**
* Deparsing R objects.
@@ -923,8 +899,7 @@ public class RDeparse {
}
/**
- * Handles {@link RList}, (@link RExpression}, and {@link RFactor}. Method name same as
- * GnuR.
+ * Handles {@link RList}, (@link RExpression}. Method name same as GnuR.
*/
private DeparseVisitor appendListContents(RAbstractListVector v) {
int n = v.getLength();
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java
index 31a0e7aef9..a45378ddf3 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java
@@ -11,21 +11,9 @@
*/
package com.oracle.truffle.r.runtime;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -34,37 +22,10 @@ import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.r.runtime.conn.RConnection;
import com.oracle.truffle.r.runtime.context.Engine.ParseException;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RAttributable;
-import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RAttributes;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.RAttributes.RAttribute;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.data.REmpty;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RPromise;
import com.oracle.truffle.r.runtime.data.RPromise.OptType;
import com.oracle.truffle.r.runtime.data.RPromise.PromiseType;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RScalar;
-import com.oracle.truffle.r.runtime.data.RShareable;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
-import com.oracle.truffle.r.runtime.data.RUnboundValue;
-import com.oracle.truffle.r.runtime.data.RVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
index 1c5e212911..388ff08a9c 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
@@ -415,7 +415,7 @@ public final class Utils {
SourceSection ss = sn != null ? sn.getSourceSection() : null;
// fabricate a srcref attribute from ss
Source source = ss != null ? ss.getSource() : null;
- String path = source != null ? source.getPath() : null;
+ String path = source != null ? source.getPath() : null;
if (path != null && RInternalSourceDescriptions.isInternal(path)) {
path = null;
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RAttributable.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RAttributable.java
index 8510ddcb14..f5ed54d6b2 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RAttributable.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RAttributable.java
@@ -49,8 +49,8 @@ public interface RAttributable extends RTypedValue {
RAttributes getAttributes();
/**
- * Returns the value of the {@code class} attribute or empty {@link RStringVector} if
- * class attribute is not set.
+ * Returns the value of the {@code class} attribute or empty {@link RStringVector} if class
+ * attribute is not set.
*/
default RStringVector getClassHierarchy() {
Object v = getAttr(RRuntime.CLASS_ATTR_KEY);
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java
index 51bb3a4873..8cb3a25303 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java
@@ -356,10 +356,6 @@ public final class RDataFactory {
return traceDataCreated(new RExpression(list));
}
- public static RFactor createFactor(RIntVector vector, boolean ordered) {
- return traceDataCreated(new RFactor(vector, ordered));
- }
-
public static RSymbol createSymbol(String name) {
assert name == name.intern();
return traceDataCreated(new RSymbol(name));
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RFactor.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RFactor.java
index 6f88c88fe5..367011fce4 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RFactor.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RFactor.java
@@ -22,232 +22,26 @@
*/
package com.oracle.truffle.r.runtime.data;
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.BranchProfile;
-import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.runtime.RRuntime;
-import com.oracle.truffle.r.runtime.RType;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
-public final class RFactor implements RShareable, RAbstractContainer {
+public final class RFactor {
- private final RIntVector vector;
-
- private final boolean ordered;
-
- public RFactor(RIntVector vector, boolean ordered) {
- this.vector = vector;
- this.ordered = ordered;
- }
-
- @Override
- public int[] getInternalStore() {
- return vector.getInternalStore();
- }
-
- @Override
- public RType getRType() {
- return RType.Integer;
- }
-
- public RIntVector getVector() {
- return vector;
- }
-
- public boolean isOrdered() {
- return ordered;
- }
-
- @Override
- public boolean isComplete() {
- return vector.isComplete();
- }
-
- @Override
- public int getLength() {
- return vector.getLength();
- }
-
- @Override
- public RAbstractContainer resize(int size) {
- return vector.resize(size);
- }
-
- @Override
- public boolean isTemporary() {
- return vector.isTemporary();
- }
-
- @Override
- public boolean isShared() {
- return vector.isShared();
- }
-
- @Override
- public void incRefCount() {
- vector.incRefCount();
- }
-
- @Override
- public void decRefCount() {
- vector.decRefCount();
- }
-
- @Override
- public boolean isSharedPermanent() {
- return vector.isSharedPermanent();
- }
-
- @Override
- public void makeSharedPermanent() {
- vector.makeSharedPermanent();
- }
-
- @Override
- public RShareable getNonShared() {
- RIntVector newVector = (RIntVector) vector.getNonShared();
- return newVector == vector ? this : RDataFactory.createFactor(newVector, ordered);
- }
-
- @Override
- public RFactor copy() {
- return RDataFactory.createFactor((RIntVector) vector.copy(), ordered);
- }
-
- @Override
- public RAttributes getAttributes() {
- return vector.getAttributes();
- }
-
- @Override
- public boolean hasDimensions() {
- return vector.hasDimensions();
- }
-
- @Override
- public int[] getDimensions() {
- return vector.getDimensions();
- }
-
- @Override
- public void setDimensions(int[] newDimensions) {
- vector.setDimensions(newDimensions);
- }
-
- @Override
- public Class<?> getElementClass() {
- return RFactor.class;
- }
-
- @Override
- public RFactor materializeNonShared() {
- RVector v = vector.materializeNonShared();
- return vector != v ? RDataFactory.createFactor((RIntVector) v, ordered) : this;
- }
-
- @Override
- public Object getDataAtAsObject(int index) {
- return vector.getDataAtAsObject(index);
- }
-
- @Override
- public RStringVector getNames(RAttributeProfiles attrProfiles) {
- return vector.getNames(attrProfiles);
- }
-
- @Override
- public void setNames(RStringVector newNames) {
- vector.setNames(newNames);
- }
-
- @Override
- public RList getDimNames(RAttributeProfiles attrProfiles) {
- return vector.getDimNames();
- }
-
- @Override
- public void setDimNames(RList newDimNames) {
- vector.setDimNames(newDimNames);
- }
-
- @Override
- public Object getRowNames(RAttributeProfiles attrProfiles) {
- return vector.getRowNames();
- }
-
- @Override
- public void setRowNames(RAbstractVector rowNames) {
- vector.setRowNames(rowNames);
- }
-
- @Override
- public RStringVector getClassHierarchy() {
- return vector.getClassHierarchy();
- }
-
- @Override
- public RStringVector getImplicitClass() {
- return vector.getImplicitClass();
- }
-
- @Override
- public boolean isObject(RAttributeProfiles attrProfiles) {
- return true;
- }
-
- @Override
- public RAttributes initAttributes() {
- return vector.initAttributes();
- }
-
- @Override
- public void initAttributes(RAttributes newAttributes) {
- vector.initAttributes(newAttributes);
- }
-
- @Override
- public void setAttr(String name, Object value) {
- vector.setAttr(name, value);
- }
-
- @Override
- public Object getAttr(RAttributeProfiles attrProfiles, String name) {
- return vector.getAttr(attrProfiles, name);
- }
-
- @Override
- public RAttributes resetAllAttributes(boolean nullify) {
- return vector.resetAllAttributes(nullify);
- }
-
- @Override
- public RShareable materializeToShareable() {
- return this;
- }
-
- public void setLevels(Object newLevels) {
- vector.setAttr(RRuntime.LEVELS_ATTR_KEY, newLevels);
- }
-
- @Override
- public RAbstractContainer setClassAttr(RStringVector classAttr, boolean convertToInt) {
- return vector.setClassAttr(classAttr, convertToInt);
+ private RFactor(RIntVector vector, boolean ordered) {
+ // only static helpers
}
/**
- * Helper method to get 'levels' of a factor. However, all the invocations
- * of this method should be replaced with FactorNodes.GetLevel in the future.
+ * Helper method to get 'levels' of a factor. However, all the invocations of this method should
+ * be replaced with FactorNodes.GetLevel in the future.
*/
public static RVector getLevels(RAbstractIntVector factor) {
return getLevelsImpl(factor.getAttr(RRuntime.LEVELS_ATTR_KEY));
}
/**
- * Helper method to get 'levels' of a factor with profile. However, all the
- * invocations of this method should be replaced with FactorNodes.GetLevel in the future.
+ * Helper method to get 'levels' of a factor with profile. However, all the invocations of this
+ * method should be replaced with FactorNodes.GetLevel in the future.
*/
public static RVector getLevels(RAttributeProfiles profile, RAbstractIntVector factor) {
return getLevelsImpl(factor.getAttr(profile, RRuntime.LEVELS_ATTR_KEY));
@@ -257,23 +51,4 @@ public final class RFactor implements RShareable, RAbstractContainer {
// convert scalar to RVector if necessary
return attr instanceof RVector ? (RVector) attr : (RVector) RRuntime.asAbstractVector(attr);
}
-
- public RVector getLevels(RAttributeProfiles attrProfiles) {
- return getLevels(attrProfiles, vector);
- }
-
- public int getNLevels(RAttributeProfiles attrProfiles) {
- RVector levels = getLevels(attrProfiles);
- return levels == null ? 0 : levels.getLength();
- }
-
- @Override
- public int getGPBits() {
- return vector.getGPBits();
- }
-
- @Override
- public void setGPBits(int value) {
- vector.setGPBits(value);
- }
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
index 790f1b2f23..2aa99d23f1 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
@@ -51,7 +51,7 @@ import com.oracle.truffle.r.runtime.nodes.RNode;
@TypeSystem({boolean.class, byte.class, int.class, double.class, RRaw.class, RComplex.class, String.class, RIntSequence.class, RDoubleSequence.class, RIntVector.class, RDoubleVector.class,
RRawVector.class, RComplexVector.class, RStringVector.class, RLogicalVector.class, RFunction.class, RNull.class, RMissing.class, REmpty.class, REnvironment.class, RExpression.class,
RConnection.class, MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class,
- RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RFactor.class, RSymbol.class, RPromise.class, RLanguage.class,
+ RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RSymbol.class, RPromise.class, RLanguage.class,
RPairList.class, RExternalPtr.class, RS4Object.class, RAbstractContainer.class, RAttributable.class, RTypedValue.class, RArgsValuesAndNames.class, RType.class, Object[].class})
public class RTypes {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java
index f4410cfc69..9292adf55f 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java
@@ -506,8 +506,10 @@ public abstract class RVector extends RSharingAttributeStorage implements RShare
for (int i = 0; i < classAttr.getLength(); i++) {
String attr = classAttr.getDataAt(i);
if (RRuntime.CLASS_FACTOR.equals(attr)) {
- // For Factors we only have to check if the data-type is Integer, because otherwise we must show error.
- // Note: this can only happen if the class is set by hand to some non-integral vector, i.e. attr(doubles, 'class') <- 'factor'
+ // For Factors we only have to check if the data-type is Integer, because
+ // otherwise we must show error.
+ // Note: this can only happen if the class is set by hand to some non-integral
+ // vector, i.e. attr(doubles, 'class') <- 'factor'
vector.putAttribute(RRuntime.CLASS_ATTR_KEY, classAttr);
if (vector.getElementClass() != RInteger.class) {
// TODO: check when this 'convertToInt' is necessary
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosures.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosures.java
index d9993cbd90..1907afe018 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosures.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosures.java
@@ -23,14 +23,7 @@
package com.oracle.truffle.r.runtime.data.closures;
import com.oracle.truffle.r.runtime.data.*;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.model.*;
public class RClosures {
@@ -112,10 +105,6 @@ public class RClosures {
// Factor to vector
- public static RAbstractVector createFactorToVector(RFactor factor, boolean withNames, RAttributeProfiles attrProfiles) {
- return createFactorToVector(factor.getVector(), withNames, RFactor.getLevels(attrProfiles, factor.getVector()));
- }
-
public static RAbstractVector createFactorToVector(RAbstractIntVector factor, boolean withNames, RAttributeProfiles attrProfiles) {
return createFactorToVector(factor, withNames, RFactor.getLevels(attrProfiles, factor));
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToComplexVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToComplexVectorClosure.java
index c601769ee8..680e2c5aeb 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToComplexVectorClosure.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToComplexVectorClosure.java
@@ -27,7 +27,6 @@ import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RIntVector;
import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToDoubleVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToDoubleVectorClosure.java
index eef06769f9..45b41c2cfe 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToDoubleVectorClosure.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RFactorToDoubleVectorClosure.java
@@ -26,7 +26,6 @@ import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.data.RAttributeProfiles;
-import com.oracle.truffle.r.runtime.data.RFactor;
import com.oracle.truffle.r.runtime.data.RIntVector;
import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/gnur/SEXPTYPE.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/gnur/SEXPTYPE.java
index be822bdc6b..7dc89eb98a 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/gnur/SEXPTYPE.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/gnur/SEXPTYPE.java
@@ -17,32 +17,8 @@ import java.util.Map;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.conn.RConnection;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDoubleSequence;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.REmpty;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RPromise;
+import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.data.RPromise.EagerPromise;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RS4Object;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RUnboundValue;
import com.oracle.truffle.r.runtime.env.REnvironment;
// Transcribed from GnuR src/include/Rinternals.h and src/main/serialize.c
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nodes/RNode.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nodes/RNode.java
index 06dc66ae1c..e4bcc042ea 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nodes/RNode.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nodes/RNode.java
@@ -33,39 +33,8 @@ import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.conn.RConnection;
-import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
-import com.oracle.truffle.r.runtime.data.RAttributable;
-import com.oracle.truffle.r.runtime.data.RAttributes;
-import com.oracle.truffle.r.runtime.data.RComplex;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RDoubleSequence;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.RExpression;
-import com.oracle.truffle.r.runtime.data.RFactor;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RIntSequence;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLanguage;
-import com.oracle.truffle.r.runtime.data.RList;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RMissing;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RPairList;
-import com.oracle.truffle.r.runtime.data.RPromise;
-import com.oracle.truffle.r.runtime.data.RRaw;
-import com.oracle.truffle.r.runtime.data.RRawVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypes;
-import com.oracle.truffle.r.runtime.data.RTypesGen;
-import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
-import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.data.*;
+import com.oracle.truffle.r.runtime.data.model.*;
import com.oracle.truffle.r.runtime.env.REnvironment;
@TypeSystemReference(RTypes.class)
@@ -193,10 +162,6 @@ public abstract class RNode extends RBaseNode implements RInstrumentableNode {
return RTypesGen.expectRExpression(execute(frame));
}
- public RFactor executeRFactor(VirtualFrame frame) throws UnexpectedResultException {
- return RTypesGen.expectRFactor(execute(frame));
- }
-
public RSymbol executeRSymbol(VirtualFrame frame) throws UnexpectedResultException {
return RTypesGen.expectRSymbol(execute(frame));
}
@@ -285,10 +250,6 @@ public abstract class RNode extends RBaseNode implements RInstrumentableNode {
return value instanceof RList;
}
- protected static boolean isRFactor(Object value) {
- return value instanceof RFactor;
- }
-
protected static boolean isRPromise(Object value) {
return value instanceof RPromise;
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index 122d0bf014..be36e61f8d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -23552,6 +23552,15 @@ Error: unexpected symbol in " ', NA), mag = c('Min. :5.000 ', '1st Qu.:5.300
#argv <- list(structure(list(Topic = c('myTst-package', 'foo-class', 'myTst', 'show,foo-method', 'show,foo-method', 'show-methods'), File = c('myTst-package', 'foo-class', 'myTst-package', 'foo-class', 'show-methods', 'show-methods')), .Names = c('Topic', 'File'), row.names = c(3L, 1L, 4L, 2L, 6L, 5L), class = 'data.frame'));is.matrix(argv[[1]]);
[1] FALSE
+##com.oracle.truffle.r.test.builtins.TestBuiltin_isna.testIsNA
+#is.na(data.frame(col1=1:5, col2=c(NA, 1, NA, 2, NA)))
+ col1 col2
+[1,] FALSE TRUE
+[2,] FALSE FALSE
+[3,] FALSE TRUE
+[4,] FALSE FALSE
+[5,] FALSE TRUE
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_isna.testIsNA
#is.na(is.na))
Error: unexpected ')' in "is.na(is.na))"
@@ -31534,6 +31543,25 @@ NULL
[1] "some"
[1] "test"
+##com.oracle.truffle.r.test.builtins.TestBuiltin_operators.testDispatchToOpsSpecializations
+#data.frame(factor(c(1,2,1))) == data.frame(factor(c(1,2,2)))
+ factor.c.1..2..1..
+[1,] TRUE
+[2,] TRUE
+[3,] FALSE
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_operators.testDispatchToOpsSpecializations
+#data.frame(factor(c(1,2,3))) == data.frame(factor(c(1,2,3)))
+ factor.c.1..2..3..
+[1,] TRUE
+[2,] TRUE
+[3,] TRUE
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_operators.testDispatchToOpsSpecializations
+#factor(c("a","b","c")) == factor(c(1,2,3))
+Error in Ops.factor(factor(c("a", "b", "c")), factor(c(1, 2, 3))) :
+ level sets of factors are different
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_operators.testIn
#{ "hello" %in% c("I", "say", "hello", "world") }
[1] TRUE
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
index 1d32d7b884..610e8a0c3c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
@@ -265,5 +265,8 @@ public class TestBuiltin_isna extends TestBase {
assertEval("{ is.na(list(1[10],1L[10],list(),integer())) }");
assertEval(Output.ContainsWarning, "is.na(quote(x()))");
assertEval("is.na(is.na))");
+
+ // Note: is.na.data.frame calls do.call("cbind", lapply(x, "is.na")) - there is the error
+ assertEval(Ignored.Unimplemented, "is.na(data.frame(col1=1:5, col2=c(NA, 1, NA, 2, NA)))");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
index 147b62182e..134587376b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
@@ -1921,6 +1921,13 @@ public class TestBuiltin_operators extends TestBase {
assertEval("argv <- list(181L, 3.14159265358979);`*`(argv[[1]],argv[[2]]);");
}
+ @Test
+ public void testDispatchToOpsSpecializations() {
+ assertEval(Output.ContainsError, "factor(c(\"a\",\"b\",\"c\")) == factor(c(1,2,3))");
+ assertEval("data.frame(factor(c(1,2,3))) == data.frame(factor(c(1,2,3)))");
+ assertEval("data.frame(factor(c(1,2,1))) == data.frame(factor(c(1,2,2)))");
+ }
+
@Test
public void testOperators() {
assertEval("{ `+`(1,2) }");
--
GitLab