From 6b6b1e83852573ac69a0d4acaf48ac3220c80a10 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 20 Jan 2017 14:24:20 +0100
Subject: [PATCH] Simple implementation of recordGraphics internal
---
.../r/nodes/builtin/base/BasePackage.java | 1 +
.../r/nodes/builtin/base/RecordGraphics.java | 85 +++++++++++++++++++
.../truffle/r/nodes/builtin/InternalNode.java | 2 +-
.../r/nodes/builtin/RList2EnvNode.java | 2 +-
4 files changed, 88 insertions(+), 2 deletions(-)
create mode 100644 com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RecordGraphics.java
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
index 237533d83d..369665c952 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
@@ -334,6 +334,7 @@ public class BasePackage extends RBuiltinPackage {
add(EnvFunctions.SetParentEnv.class, EnvFunctionsFactory.SetParentEnvNodeGen::create);
add(EnvFunctions.UnlockBinding.class, EnvFunctionsFactory.UnlockBindingNodeGen::create);
add(Eval.class, EvalNodeGen::create);
+ add(RecordGraphics.class, RecordGraphics::create);
add(WithVisible.class, WithVisibleNodeGen::create);
add(Exists.class, ExistsNodeGen::create);
add(Expression.class, ExpressionNodeGen::create);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RecordGraphics.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RecordGraphics.java
new file mode 100644
index 0000000000..b0be4bf534
--- /dev/null
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RecordGraphics.java
@@ -0,0 +1,85 @@
+/*
+ * 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.nodes.builtin.base;
+
+import static com.oracle.truffle.r.runtime.builtins.RBehavior.COMPLEX;
+import static com.oracle.truffle.r.runtime.builtins.RBuiltinKind.INTERNAL;
+
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
+import com.oracle.truffle.r.nodes.builtin.RList2EnvNode;
+import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
+import com.oracle.truffle.r.runtime.RCaller;
+import com.oracle.truffle.r.runtime.builtins.RBuiltin;
+import com.oracle.truffle.r.runtime.context.RContext;
+import com.oracle.truffle.r.runtime.data.RDataFactory;
+import com.oracle.truffle.r.runtime.data.RExpression;
+import com.oracle.truffle.r.runtime.data.RLanguage;
+import com.oracle.truffle.r.runtime.data.RList;
+import com.oracle.truffle.r.runtime.env.REnvironment;
+
+/**
+ * The {@code expr} parameter is supposed to be R graphics code, e.g. {@code rect(4,2,...);}, which
+ * is supposed to be run and recorded (probably in order to be re-run as is if the device size is
+ * changed). The visible behavior is that a e.g. rectangle created via {@code recordGraphics}
+ * maintains its size regardless of resizes of the device (e.g. window).
+ *
+ * TODO: the current implementation is a stub that only runs the command, but does not fiddle with
+ * the recording like GnuR does.
+ */
+@RBuiltin(name = "recordGraphics", kind = INTERNAL, parameterNames = {"expr", "list", "env"}, behavior = COMPLEX)
+public abstract class RecordGraphics extends RBuiltinNode {
+ @Child private SetVisibilityNode visibility = SetVisibilityNode.create();
+ @Child private RList2EnvNode list2EnvNode = new RList2EnvNode();
+
+ public static RecordGraphics create() {
+ return RecordGraphicsNodeGen.create();
+ }
+
+ @Specialization
+ protected Object doEval(VirtualFrame frame, RLanguage expr, RList list, REnvironment env) {
+ RCaller rCaller = RCaller.create(frame, getOriginalCall());
+ try {
+ return RContext.getEngine().eval(expr, createEnv(list, env), rCaller);
+ } finally {
+ visibility.executeAfterCall(frame, rCaller);
+ }
+ }
+
+ @Specialization
+ protected Object doEval(VirtualFrame frame, RExpression expr, RList list, REnvironment env) {
+ RCaller rCaller = RCaller.create(frame, getOriginalCall());
+ try {
+ return RContext.getEngine().eval(expr, createEnv(list, env), rCaller);
+ } finally {
+ visibility.executeAfterCall(frame, rCaller);
+ }
+ }
+
+ private REnvironment createEnv(RList list, REnvironment parent) {
+ REnvironment newEnv = RDataFactory.createNewEnv("<recordGraphics env>", true, list.getLength());
+ newEnv.setParent(parent);
+ return list2EnvNode.execute(list, newEnv);
+ }
+}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
index 5ebc152654..16694345d4 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
@@ -353,7 +353,7 @@ public abstract class InternalNode extends OperatorNode {
"phyper", "qhyper", "dnbeta", "pnbeta", "qnbeta", "dnf", "pnf", "qnf", "dtukey", "ptukey", "qtukey", "rchisq", "rexp", "rgeom", "rpois", "rt", "rsignrank", "rbeta", "rbinom",
"rcauchy", "rf", "rgamma", "rlnorm", "rlogis", "rnbinom", "rnbinom_mu", "rnchisq", "rnorm", "runif", "rweibull", "rwilcox", "rhyper",
"format.info", "grepRaw", "regexec", "adist", "aregexec", "chartr", "packBits", "strtrim", "eapply", "machine", "save", "dump", "prmatrix", "gcinfo", "gctorture", "gctorture2",
- "memory.profile", "recordGraphics", "sys.on.exit", "builtins", "bodyCode", "rapply", "inspect",
+ "memory.profile", "sys.on.exit", "builtins", "bodyCode", "rapply", "inspect",
"mem.limits", "capabilitiesX11", "Cstack_info", "file.choose", "polyroot", "mkCode", "bcClose", "is.builtin.internal", "disassemble", "bcVersion", "load.from.file", "save.to.file",
"growconst", "putconst", "getconst", "setNumMathThreads", "setMaxNumMathThreads", "isatty", "isIncomplete", "pipe", "fifo", "unz", "truncate", "rawConnection",
"rawConnectionValue", "sockSelect", "gzcon", "memCompress", "memDecompress", "mkUnbound", "env.profile", "setSessionTimeLimit", "icuSetCollate", "findInterval", "rowsum_df",
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RList2EnvNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RList2EnvNode.java
index 7dab79c0e3..a50458a51a 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RList2EnvNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RList2EnvNode.java
@@ -30,7 +30,7 @@ import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
/**
- * Abstracted for use by {@code List2Env}, {@code AsEnvironment}, {@code SubsituteDirect}.
+ * Abstracted for use by other nodes that need to convert a list into an environment.
*/
public final class RList2EnvNode extends RBaseNode {
--
GitLab