diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
index c2b3d6e9517a0b66d9dcd7016c6648ad372f41c2..7a2924577a1ebe8a2f65a0c61e6ee89d054c99b9 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java
@@ -287,21 +287,8 @@ public abstract class JavaUpCallsRFFIImpl implements UpCallsRFFI {
}
@Override
- @TruffleBoundary
public Object Rf_getAttrib(Object obj, Object name) {
- Object result = RNull.instance;
- if (obj instanceof RAttributable) {
- RAttributable attrObj = (RAttributable) obj;
- DynamicObject attrs = attrObj.getAttributes();
- if (attrs != null) {
- String nameAsString = Utils.intern(((RSymbol) name).getName());
- Object attr = attrs.get(nameAsString);
- if (attr != null) {
- result = attr;
- }
- }
- }
- return result;
+ throw implementedAsNode();
}
@Override
@@ -891,20 +878,8 @@ public abstract class JavaUpCallsRFFIImpl implements UpCallsRFFI {
}
@Override
- @TruffleBoundary
public Object R_tryEval(Object expr, Object env, int silent) {
- Object handlerStack = RErrorHandling.getHandlerStack();
- Object restartStack = RErrorHandling.getRestartStack();
- try {
- // TODO handle silent
- RErrorHandling.resetStacks();
- Object result = Rf_eval(expr, env);
- return result;
- } catch (Throwable t) {
- return null;
- } finally {
- RErrorHandling.restoreStacks(handlerStack, restartStack);
- }
+ throw implementedAsNode();
}
/**
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java
index 7b6ef2821fb05a7cbff327b6d1bf052e005a460c..19f9d9ea72e09bdde8aa66cb4477dce61d30f2ca 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java
@@ -22,17 +22,24 @@
*/
package com.oracle.truffle.r.ffi.impl.nodes;
+import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.singleElement;
+import static com.oracle.truffle.r.nodes.builtin.casts.fluent.CastNodeBuilder.newCastBuilder;
+
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
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.profiles.ConditionProfile;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodesFactory.ATTRIBNodeGen;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodesFactory.CopyMostAttribNodeGen;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodesFactory.TAGNodeGen;
import com.oracle.truffle.r.nodes.attributes.CopyOfRegAttributesNode;
+import com.oracle.truffle.r.nodes.attributes.GetAttributeNode;
import com.oracle.truffle.r.nodes.attributes.GetAttributesNode;
import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode;
+import com.oracle.truffle.r.nodes.function.opt.UpdateShareableChildValueNode;
+import com.oracle.truffle.r.nodes.unary.CastNode;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RError.Message;
@@ -41,14 +48,43 @@ import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
import com.oracle.truffle.r.runtime.data.RAttributable;
import com.oracle.truffle.r.runtime.data.RAttributeStorage;
+import com.oracle.truffle.r.runtime.data.RDataFactory;
import com.oracle.truffle.r.runtime.data.RExternalPtr;
import com.oracle.truffle.r.runtime.data.RList;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RPairList;
import com.oracle.truffle.r.runtime.data.RStringVector;
+import com.oracle.truffle.r.runtime.data.RSymbol;
public final class AttributesAccessNodes {
+ public static final class GetAttrib extends FFIUpCallNode.Arg2 {
+ @Child private GetAttributeNode getAttributeNode = GetAttributeNode.create();
+ @Child private UpdateShareableChildValueNode sharedAttrUpdate = UpdateShareableChildValueNode.create();
+ @Child private CastNode castStringNode;
+ private final ConditionProfile nameIsSymbolProfile = ConditionProfile.createBinaryProfile();
+
+ @Override
+ public Object executeObject(Object source, Object nameObj) {
+ String name;
+ if (nameIsSymbolProfile.profile(nameObj instanceof RSymbol)) {
+ name = ((RSymbol) nameObj).getName();
+ } else {
+ name = castToString(nameObj);
+ }
+ Object result = getAttributeNode.execute(source, name);
+ return result == null ? RNull.instance : sharedAttrUpdate.updateState(source, result);
+ }
+
+ private String castToString(Object name) {
+ if (castStringNode == null) {
+ CompilerDirectives.transferToInterpreterAndInvalidate();
+ castStringNode = insert(newCastBuilder().asStringVector().mustBe(singleElement()).findFirst().buildCastNode());
+ }
+ return (String) castStringNode.doCast(name);
+ }
+ }
+
public abstract static class ATTRIB extends FFIUpCallNode.Arg1 {
@Child private GetAttributesNode getAttributesNode;
@@ -81,14 +117,16 @@ public final class AttributesAccessNodes {
@Specialization
public Object doPairlist(RPairList obj) {
- return obj.getTag();
+ Object result = obj.getTag();
+ assert result instanceof RSymbol || result == RNull.instance;
+ return result;
}
@Specialization
public Object doArgs(RArgsValuesAndNames obj) {
ArgumentsSignature signature = obj.getSignature();
if (signature.getLength() > 0 && signature.getName(0) != null) {
- return signature.getName(0);
+ return RDataFactory.createSymbol(signature.getName(0));
}
return RNull.instance;
}
@@ -103,7 +141,7 @@ public final class AttributesAccessNodes {
@Cached("create()") GetNamesAttributeNode getNamesAttributeNode) {
RStringVector names = getNamesAttributeNode.getNames(obj);
if (names != null && names.getLength() > 0) {
- return names.getDataAt(0);
+ return RDataFactory.createSymbol(names.getDataAt(0));
}
return RNull.instance;
}
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java
index 63bbc904a2881dcaaa95f002b9e8672ca9e91e51..b44ce88447f0065fb2352c09368244d560fd4c21 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/CoerceNodes.java
@@ -123,7 +123,6 @@ public final class CoerceNodes {
public abstract static class AsCharacterFactor extends FFIUpCallNode.Arg1 {
@Child private InheritsCheckNode inheritsFactorNode = InheritsCheckNode.createFactor();
- @Child private GetAttributeNode getAttributeNode = GetAttributeNode.create();
@Child private RFactorNodes.GetLevels getLevels = RFactorNodes.GetLevels.create();
@Specialization
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java
index da3d249e0dd4c25c4e487cfc76c9b701741ce7a8..ae738c977aec0e2f50ad9a5e728cbfe0f2a17a03 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RfEvalNode.java
@@ -65,13 +65,13 @@ public abstract class RfEvalNode extends FFIUpCallNode.Arg2 {
@Specialization
@TruffleBoundary
Object handleExpression(RExpression expr, REnvironment env) {
- return RContext.getEngine().eval(expr, env, RCaller.topLevel);
+ return RContext.getEngine().eval(expr, env, null);
}
@Specialization
@TruffleBoundary
Object handleLanguage(RLanguage expr, REnvironment env) {
- return RContext.getEngine().eval(expr, env, RCaller.topLevel);
+ return RContext.getEngine().eval(expr, env, null);
}
@Specialization
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/TryRfEvalNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/TryRfEvalNode.java
new file mode 100644
index 0000000000000000000000000000000000000000..64d544f386ddc03116d3f24d580109a1e6988993
--- /dev/null
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/TryRfEvalNode.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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.ffi.impl.nodes;
+
+import com.oracle.truffle.r.runtime.RErrorHandling;
+
+public class TryRfEvalNode extends FFIUpCallNode.Arg3 {
+ @Child RfEvalNode rfEvalNode = RfEvalNode.create();
+
+ @Override
+ public Object executeObject(Object expr, Object env, @SuppressWarnings("unused") Object silent) {
+ Object handlerStack = RErrorHandling.getHandlerStack();
+ Object restartStack = RErrorHandling.getRestartStack();
+ try {
+ // TODO handle silent
+ RErrorHandling.resetStacks();
+ return rfEvalNode.executeObject(expr, env);
+ } catch (Throwable t) {
+ return null;
+ } finally {
+ RErrorHandling.restoreStacks(handlerStack, restartStack);
+ }
+ }
+}
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
index cfc4c80acb4c40e4c78fa2b1e01174778b679ab3..1f85756b25d0f1bdc1752c47bdc0b3ce200eddeb 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java
@@ -28,6 +28,7 @@ import com.oracle.truffle.r.ffi.impl.nodes.AsLogicalNode;
import com.oracle.truffle.r.ffi.impl.nodes.AsRealNode;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.ATTRIB;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.CopyMostAttrib;
+import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.GetAttrib;
import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.TAG;
import com.oracle.truffle.r.ffi.impl.nodes.CoerceNodes.CoerceVectorNode;
import com.oracle.truffle.r.ffi.impl.nodes.CoerceNodes.VectorToPairListNode;
@@ -51,6 +52,7 @@ import com.oracle.truffle.r.ffi.impl.nodes.MiscNodes;
import com.oracle.truffle.r.ffi.impl.nodes.MiscNodes.LENGTHNode;
import com.oracle.truffle.r.ffi.impl.nodes.RandFunctionsNodes;
import com.oracle.truffle.r.ffi.impl.nodes.RfEvalNode;
+import com.oracle.truffle.r.ffi.impl.nodes.TryRfEvalNode;
import com.oracle.truffle.r.ffi.processor.RFFICstring;
import com.oracle.truffle.r.ffi.processor.RFFIRunGC;
import com.oracle.truffle.r.ffi.processor.RFFIUpCallNode;
@@ -122,6 +124,7 @@ public interface StdUpCallsRFFI {
@RFFIUpCallNode(ATTRIB.class)
Object ATTRIB(Object obj);
+ @RFFIUpCallNode(GetAttrib.class)
Object Rf_getAttrib(Object obj, Object name);
void Rf_setAttrib(Object obj, Object name, Object val);
@@ -271,6 +274,8 @@ public interface StdUpCallsRFFI {
void Rf_copyMatrix(Object s, Object t, int byrow);
+ @RFFIRunGC
+ @RFFIUpCallNode(TryRfEvalNode.class)
Object R_tryEval(Object expr, Object env, int silent);
Object R_ToplevelExec();
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R
index 2175ac8d653c38340f7b99f3a51baa4a5b5bf1b8..5827c72a338b2b632e8f63746c9389a23316fe74 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R
@@ -502,9 +502,10 @@ replaceDots <- function(x, replacement) {
}
return(x)
}
-
- for (i in seq_along(x)) {
- x[[i]] <- replaceDots(x[[i]], replacement);
+ if (is.language(x)) {
+ for (i in seq_along(x)) {
+ x[[i]] <- replaceDots(x[[i]], replacement);
+ }
}
x
}
@@ -682,7 +683,11 @@ termsform <- function (x.in, specials, data, keep.order, allowDotAsName) {
# Step 6: Fix up the formula by substituting for dot, which should be
# the framenames joined by +
if (haveDot) {
- x <- ExpandDots(x, framenames)
+ if (length(framenames) > 0) {
+ x <- ExpandDots(x, framenames)
+ } else if (!allowDotAsName) {
+ error("'.' in formula and no 'data' argument")
+ }
}
attr(x, "order") <- ord
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
index c305453c283d0c934e99e13942a7399d78aabf1d..7a7193a66caef511c33b627cc3f3640e9d032a75 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
@@ -1366,7 +1366,7 @@ SEXP Rf_asS4(SEXP x, Rboolean b, int i) {
static SEXP R_tryEvalInternal(SEXP x, SEXP y, int *ErrorOccurred, int silent) {
TRACE0();
- unimplemented("R_tryEvalInternal");
+ return ((call_R_tryEval) callbacks[R_tryEval_x])(x, y, silent);
}
SEXP R_tryEval(SEXP x, SEXP y, int *ErrorOccurred) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Attr.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Attr.java
index 3e2489c23cab0c3661c4ab8e883a8dc5628b0f47..7d24d0a54032ad4154071b3101f3898fdc1d55ff 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Attr.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Attr.java
@@ -110,23 +110,11 @@ public abstract class Attr extends RBuiltinNode.Arg3 {
return container;
}
- @Specialization(guards = "!isRowNamesAttr(name)")
+ @Specialization
protected Object attr(RAbstractContainer container, String name, boolean exact) {
return attrRA(container, intern.execute(name), exact);
}
- @Specialization(guards = "isRowNamesAttr(name)")
- protected Object attrRowNames(RAbstractContainer container, @SuppressWarnings("unused") String name, @SuppressWarnings("unused") boolean exact,
- @Cached("create()") GetRowNamesAttributeNode getRowNamesNode) {
- // TODO: if exact == false, check for partial match (there is an ignored tests for it)
- DynamicObject attributes = container.getAttributes();
- if (attributes == null) {
- return RNull.instance;
- } else {
- return GetAttributesNode.getFullRowNames(getRowNamesNode.getRowNames(container));
- }
- }
-
/**
* All other, non-performance centric, {@link RAttributable} types.
*/
@@ -141,8 +129,4 @@ public abstract class Attr extends RBuiltinNode.Arg3 {
throw RError.nyi(this, "object cannot be attributed");
}
}
-
- protected static boolean isRowNamesAttr(String name) {
- return name.equals(RRuntime.ROWNAMES_ATTR_KEY);
- }
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
index d0dce21f3010b3008a6738fa038edc388dbf8e30..69aa2aa2e36212393663c077aaeb17211aa006c4 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
@@ -22,6 +22,8 @@
*/
package com.oracle.truffle.r.nodes.builtin.base;
+import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.asStringVector;
+import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.instanceOf;
import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.logicalValue;
import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.notEmpty;
import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.size;
@@ -169,14 +171,15 @@ public class DynLoadFunctions {
static {
Casts casts = new Casts(GetSymbolInfo.class);
casts.arg("symbol").mustBe(stringValue()).asStringVector().mustBe(notEmpty()).findFirst();
+ casts.arg("package").defaultError(RError.Message.REQUIRES_NAME_DLLINFO).returnIf(instanceOf(RExternalPtr.class)).mustBe(stringValue()).asStringVector().findFirst();
casts.arg("withRegistrationInfo").mustBe(logicalValue()).asLogicalVector().findFirst().map(toBoolean());
}
@Specialization
@TruffleBoundary
- protected Object getSymbolInfo(String symbol, String packageName, boolean withReg) {
+ protected Object getSymbolInfo(String symbol, RAbstractStringVector packageName, boolean withReg) {
DLL.RegisteredNativeSymbol rns = DLL.RegisteredNativeSymbol.any();
- DLL.SymbolHandle f = findSymbolNode.execute(RRuntime.asString(symbol), packageName, rns);
+ DLL.SymbolHandle f = findSymbolNode.execute(RRuntime.asString(symbol), packageName.getDataAt(0), rns);
SymbolInfo symbolInfo = null;
if (f != DLL.SYMBOL_NOT_FOUND) {
symbolInfo = new SymbolInfo(rns.getDllInfo(), symbol, f);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Eval.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Eval.java
index 01d7eaa01723bbeef0689b6981dc96b6ef27f790..906f67906eb3c1dad6bc7903825c1530c41e04e9 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Eval.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Eval.java
@@ -48,6 +48,7 @@ import com.oracle.truffle.r.nodes.builtin.base.GetFunctionsFactory.GetNodeGen;
import com.oracle.truffle.r.nodes.function.PromiseHelperNode.PromiseCheckHelperNode;
import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
+import com.oracle.truffle.r.runtime.RArguments;
import com.oracle.truffle.r.runtime.RCaller;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RType;
@@ -170,8 +171,8 @@ public abstract class Eval extends RBuiltinNode.Arg3 {
@Specialization
protected Object doEval(VirtualFrame frame, RLanguage expr, Object envir, Object enclos) {
- RCaller rCaller = RCaller.create(frame, getOriginalCall());
REnvironment environment = envCast.execute(frame, envir, enclos);
+ RCaller rCaller = getCaller(frame, environment);
try {
return RContext.getEngine().eval(expr, environment, rCaller);
} catch (ReturnException ret) {
@@ -187,8 +188,8 @@ public abstract class Eval extends RBuiltinNode.Arg3 {
@Specialization
protected Object doEval(VirtualFrame frame, RExpression expr, Object envir, Object enclos) {
- RCaller rCaller = RCaller.create(frame, getOriginalCall());
REnvironment environment = envCast.execute(frame, envir, enclos);
+ RCaller rCaller = getCaller(frame, environment);
try {
return RContext.getEngine().eval(expr, environment, rCaller);
} catch (ReturnException ret) {
@@ -272,4 +273,12 @@ public abstract class Eval extends RBuiltinNode.Arg3 {
visibility.execute(frame, true);
return expr;
}
+
+ private RCaller getCaller(VirtualFrame frame, REnvironment environment) {
+ if (environment instanceof REnvironment.Function) {
+ return RArguments.getCall(environment.getFrame());
+ } else {
+ return RCaller.create(frame, getOriginalCall());
+ }
+ }
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java
index dd749a55ff746724379af75f39ad64ee540aa527..ec04358a1e47b59a81508bb197cd86d2fa082433 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java
@@ -32,8 +32,12 @@ import com.oracle.truffle.api.object.Shape;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.api.profiles.ValueProfile;
+import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode;
+import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetRowNamesAttributeNode;
+import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RAttributable;
import com.oracle.truffle.r.runtime.data.RAttributeStorage;
+import com.oracle.truffle.r.runtime.data.RNull;
/**
* This node is responsible for retrieving a value from an arbitrary attribute. It accepts both
@@ -54,8 +58,25 @@ public abstract class GetAttributeNode extends AttributeAccessNode {
public abstract Object execute(Object attrs, String name);
+ @Specialization
+ protected RNull attr(RNull container, @SuppressWarnings("unused") String name) {
+ return container;
+ }
+
+ @Specialization(guards = "isRowNamesAttr(name)")
+ protected Object getRowNames(DynamicObject attrs, @SuppressWarnings("unused") String name,
+ @Cached("create()") GetRowNamesAttributeNode getRowNamesNode) {
+ return GetAttributesNode.getFullRowNames(getRowNamesNode.execute(attrs));
+ }
+
+ @Specialization(guards = "isNamesAttr(name)")
+ protected Object getNames(DynamicObject attrs, @SuppressWarnings("unused") String name,
+ @Cached("create()") GetNamesAttributeNode getNamesAttributeNode) {
+ return getNamesAttributeNode.execute(attrs);
+ }
+
@Specialization(limit = "3", //
- guards = {"cachedName.equals(name)", "shapeCheck(shape, attrs)"}, //
+ guards = {"!isSpecialAttribute(name)", "cachedName.equals(name)", "shapeCheck(shape, attrs)"}, //
assumptions = {"shape.getValidAssumption()"})
protected Object getAttrCached(DynamicObject attrs, @SuppressWarnings("unused") String name,
@SuppressWarnings("unused") @Cached("name") String cachedName,
@@ -65,7 +86,7 @@ public abstract class GetAttributeNode extends AttributeAccessNode {
}
@TruffleBoundary
- @Specialization(replaces = {"getAttrCached"})
+ @Specialization(replaces = "getAttrCached", guards = "!isSpecialAttribute(name)")
protected Object getAttrFallback(DynamicObject attrs, String name) {
return attrs.get(name);
}
@@ -95,4 +116,16 @@ public abstract class GetAttributeNode extends AttributeAccessNode {
return recursive.execute(attributes, name);
}
+
+ protected static boolean isRowNamesAttr(String name) {
+ return name.equals(RRuntime.ROWNAMES_ATTR_KEY);
+ }
+
+ protected static boolean isNamesAttr(String name) {
+ return name.equals(RRuntime.NAMES_ATTR_KEY);
+ }
+
+ protected static boolean isSpecialAttribute(String name) {
+ return isRowNamesAttr(name) || isNamesAttr(name);
+ }
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/VirtualEvalFrame.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/VirtualEvalFrame.java
index 7eae87ef3866b9eb754f29a2c251b42923662118..336a2cf0b0154fd749988d7fce63335750014419 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/VirtualEvalFrame.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/VirtualEvalFrame.java
@@ -99,7 +99,12 @@ public abstract class VirtualEvalFrame extends SubstituteVirtualFrame implements
Object[] arguments = Arrays.copyOf(originalFrame.getArguments(), originalFrame.getArguments().length);
arguments[RArguments.INDEX_IS_IRREGULAR] = true;
arguments[RArguments.INDEX_FUNCTION] = function;
- arguments[RArguments.INDEX_CALL] = call;
+ if (call != null) {
+ // Otherwise leave here the call from originalFrame
+ arguments[RArguments.INDEX_CALL] = call;
+ } else if (arguments[RArguments.INDEX_CALL] == null) {
+ arguments[RArguments.INDEX_CALL] = RCaller.topLevel;
+ }
MaterializedFrame unwrappedFrame = originalFrame instanceof SubstituteVirtualFrame ? ((SubstituteVirtualFrame) originalFrame).getOriginalFrame() : originalFrame;
@SuppressWarnings("unchecked")
Class<MaterializedFrame> clazz = (Class<MaterializedFrame>) unwrappedFrame.getClass();
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/Engine.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/Engine.java
index b31e710df2030d6d11415e6dfa360c7c3839b3d3..fda95437ebad45eeaccbaf9d2d422317f3ed76c4 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/Engine.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/Engine.java
@@ -199,12 +199,14 @@ public interface Engine {
Object parseAndEval(Source sourceDesc, MaterializedFrame frame, boolean printResult) throws ParseException;
/**
- * Support for the {@code eval} {@code .Internal}.
+ * Support for the {@code eval} {@code .Internal}. If the {@code caller} argument is null, it is
+ * taken from the environment's frame.
*/
Object eval(RExpression expr, REnvironment envir, RCaller caller);
/**
* Variant of {@link #eval(RExpression, REnvironment, RCaller)} for a single language element.
+ * If the {@code caller} argument is null, it is taken from the environment's frame.
*/
Object eval(RLanguage expr, REnvironment envir, RCaller caller);
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R
index 214488fecfa13c364a9eddaf364dc30970e62758..00e256bf9356c49446f646c9ba72ec7fdd2e6328 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R
@@ -165,6 +165,10 @@ rffi.ATTRIB <- function(x) {
.Call('test_ATTRIB', x);
}
+rffi.getAttrib <- function(source, name) {
+ .Call('test_getAttrib', source, name);
+}
+
rffi.getStringNA <- function() {
.Call("test_stringNA")
}
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c
index 3e6edb7ee6e8f2879ee3a141e89a384faa3fab82..7ab9d8c4be721d9901d625f58f8923b70f84676b 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c
@@ -347,6 +347,10 @@ SEXP test_ATTRIB(SEXP x) {
return ATTRIB(x);
}
+SEXP test_getAttrib(SEXP source, SEXP name) {
+ return Rf_getAttrib(source, name);
+}
+
SEXP test_stringNA(void) {
SEXP x = allocVector(STRSXP, 1);
SET_STRING_ELT(x, 0, NA_STRING);
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.h b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.h
index 2fbab660b916bb16973f4340025af10b5b585646..a9431321997e51f1fac2c933a7af6e5d6d25d188 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.h
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.h
@@ -92,6 +92,8 @@ extern SEXP test_coerceVector(SEXP x, SEXP mode);
extern SEXP test_ATTRIB(SEXP);
+extern SEXP test_getAttrib(SEXP,SEXP);
+
extern SEXP test_stringNA(void);
extern SEXP test_captureDotsWithSingleElement(SEXP env);
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/tests/simpleTests.R b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/tests/simpleTests.R
index e1fea9c3ccf24afc755177189c3ff422497f0e28..cf85ab25b37bee4c3d962a1907f945a09187c62d 100644
--- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/tests/simpleTests.R
+++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/tests/simpleTests.R
@@ -30,6 +30,8 @@ x <- list(1)
attr(x, 'myattr') <- 'hello';
attrs <- rffi.ATTRIB(x)
stopifnot(attrs[[1]] == 'hello')
+attr <- rffi.getAttrib(x, 'myattr')
+stopifnot(attr == 'hello')
# loess invokes loess_raw native function passing in string value as argument and that is what we test here.
loess(dist ~ speed, cars);
@@ -43,6 +45,21 @@ promiseInfo <- foo(tmp)
stopifnot('some_unique_name' %in% ls(promiseInfo[[2]]))
eval(promiseInfo[[1]], promiseInfo[[2]])
+# parent.frame call in Rf_eval. Simulates pattern from rlang package
+getCurrEnv <- function(r = parent.frame()) r
+fn <- function(eval_fn) {
+ list(middle(eval_fn), getCurrEnv())
+}
+middle <- function(eval_fn) {
+ deep(eval_fn, getCurrEnv())
+}
+deep <- function(eval_fn, eval_env) {
+ # the result value of rffi.tryEval is list, first element is the actual result
+ eval_fn(quote(parent.frame()), eval_env)[[1]]
+}
+res <- fn(rffi.tryEval)
+stopifnot(identical(res[[1]], res[[2]]))
+
# fiddling the pointers to the native arrays: we get data pointer to the first SEXP argument (vec),
# then put value 42/TRUE directly into it at index 0,
# value of symbol 'myvar' through Rf_eval at index 1,
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 36982bf2ae2cf959a9573a433cccb1a35f50c50c..cc7e4e4fea9a0a6c3a0e75245573104b2bb8a1ae 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
@@ -25299,6 +25299,13 @@ x
#{ ne <- new.env(); evalq(x <- 1, ne); ls(ne) }
[1] "x"
+##com.oracle.truffle.r.test.builtins.TestBuiltin_eval.testEvalVisibility#
+#eval(parse(text='1+1'))
+[1] 2
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_eval.testEvalVisibility#
+#eval(parse(text='x<-1'))
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_eval.testReturnInEvalExpr#
#f1 <- function(x) { eval(quote(if(x>2){return()}else 1)); 10 };f1(5);f1(0)
[1] 10
@@ -161126,6 +161133,30 @@ attr(,"assign")
15 2 2 99.190
16 2 2 16.000
+##com.oracle.truffle.r.test.library.stats.TestFormulae.testDotWithData#
+#terms.formula(x ~ .^4, data=data.frame(1:5))
+x ~ X1.5^4
+attr(,"variables")
+list(x, X1.5)
+attr(,"factors")
+ X1.5
+x 0
+X1.5 1
+attr(,"term.labels")
+[1] "X1.5"
+attr(,"order")
+[1] 1
+attr(,"intercept")
+[1] 1
+attr(,"response")
+[1] 1
+attr(,".Environment")
+<environment: R_GlobalEnv>
+
+##com.oracle.truffle.r.test.library.stats.TestFormulae.testDotWithNoFramenames#Output.IgnoreErrorContext#
+#terms.formula(x ~ .^4)
+Error in terms.formula(x ~ .^4) : '.' in formula and no 'data' argument
+
##com.oracle.truffle.r.test.library.stats.TestFormulae.testExpandDostsAndSpecialsTermsform#
#f <- terms.formula(cyl~myfun(mpg)+., specials=c('myfun'), data=mtcars); attrs <- attributes(f); envIdx <- which(names(attrs)=='.Environment'); print(attrs[envIdx]); attrs[sort(names(attrs[-envIdx]))]
$.Environment
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_eval.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_eval.java
index 55adc7d42e2b2566e2abe645d2fab23070a85a6c..fc2a2d8923fec2e133c1af559ba429a42d54e5e9 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_eval.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_eval.java
@@ -68,4 +68,10 @@ public class TestBuiltin_eval extends TestBase {
public void testReturnInEvalExpr() {
assertEval("f1 <- function(x) { eval(quote(if(x>2){return()}else 1)); 10 };f1(5);f1(0)");
}
+
+ @Test
+ public void testEvalVisibility() {
+ assertEval("eval(parse(text='x<-1'))");
+ assertEval("eval(parse(text='1+1'))");
+ }
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java
index 76faa10ddb6f317796b42ff353e03a8aee98c84d..06692c4ac63f82f90e12a215374721b6742e7037 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java
@@ -105,4 +105,14 @@ public class TestFormulae extends TestBase {
public void testExpandDostsAndSpecialsTermsform() {
assertEval("f <- terms.formula(cyl~myfun(mpg)+., specials=c('myfun'), data=mtcars); attrs <- attributes(f); " + SHOW_ATTRS);
}
+
+ @Test
+ public void testDotWithData() {
+ assertEval("terms.formula(x ~ .^4, data=data.frame(1:5))");
+ }
+
+ @Test
+ public void testDotWithNoFramenames() {
+ assertEval(Output.IgnoreErrorContext, "terms.formula(x ~ .^4)");
+ }
}