From 549917aaf040a0bdd9eac1e2be139f2c7d25b115 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Tue, 6 Jun 2017 15:26:18 +0200
Subject: [PATCH] Cleanup, fix copyright.
---
.../r/nodes/builtin/base/UpdateNames.java | 2 +-
.../r/nodes/builtin/tools/R/tools_overrides.R | 32 +++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateNames.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateNames.java
index 03f7c66c27..a2f76704d1 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateNames.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateNames.java
@@ -50,7 +50,7 @@ public abstract class UpdateNames extends RBuiltinNode.Arg2 {
static {
Casts casts = new Casts(UpdateNames.class);
- casts.arg("x").mustNotBeNull(RError.Message.SET_ATTRIBUTES_ON_NULL, "NULL");
+ casts.arg("x").mustNotBeNull(RError.Message.SET_ATTRIBUTES_ON_NULL);
}
private Object castString(Object o) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/tools/R/tools_overrides.R b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/tools/R/tools_overrides.R
index 6b5d65789c..0899b8303b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/tools/R/tools_overrides.R
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/tools/R/tools_overrides.R
@@ -1,23 +1,23 @@
-# 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 material is distributed under the GNU General Public License
+# Version 2. You may review the terms of this license at
+# http://www.gnu.org/licenses/gpl-2.0.html
#
-# 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).
+# Copyright (c) 1995-2015, The R Core Team
+# Copyright (c) 2003, The R Foundation
+# Copyright (c) 2017, Oracle and/or its affiliates
#
-# 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.
+# All rights reserved.
#
-# 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.
+
+
+
+# The modified function ".install_package_code_files" copies the source
+# file of the package to be installed into the installation directory
+# (see comments starting with "FastR extension:").
+# The code is then parsed from these files such that the parsed
+# elements are associated with the source files in the installation
+# directory.
eval(expression({
.install_package_code_files <-
--
GitLab