From a613b91dc4203e397938f072a090f08336e1bde7 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 20 Aug 2014 11:15:16 +0200
Subject: [PATCH] remove unnecessary Object usages
---
.../oracle/truffle/r/nodes/builtin/base/EvalFunctions.java | 4 ++--
.../truffle/r/nodes/builtin/base/ForeignFunctions.java | 2 +-
.../truffle/r/nodes/builtin/base/IsListFunctions.java | 2 +-
.../com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java | 2 +-
.../src/com/oracle/truffle/r/nodes/builtin/base/Prod.java | 4 ++--
.../oracle/truffle/r/nodes/access/WriteVariableNode.java | 6 +++---
.../com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java
index 03efc9ffa4..17360a86e8 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java
@@ -58,7 +58,7 @@ public class EvalFunctions {
@CompilationFinal private RFunction function;
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
@@ -165,7 +165,7 @@ public class EvalFunctions {
@SuppressWarnings("hiding") protected static final String[] PARAMETER_NAMES = new String[]{"expr", "envir"};
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java
index bbbe49061d..a1846172a4 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java
@@ -47,7 +47,7 @@ public class ForeignFunctions {
protected static final String[] PARAMETER_NAMES = new String[]{".NAME", "...", "NAOK", "DUP", "PACKAGE", "ENCODING"};
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsListFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsListFunctions.java
index c616e9e1b1..e0b9e96189 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsListFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsListFunctions.java
@@ -43,7 +43,7 @@ public class IsListFunctions {
private static final String[] PARAMETER_NAMES = new String[]{"x"};
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java
index 5369eda224..a37e195d86 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java
@@ -35,7 +35,7 @@ public abstract class IsTypeNode extends RBuiltinNode {
private static final String[] PARAMETER_NAMES = new String[]{"x"};
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Prod.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Prod.java
index 682d58c8fd..367325b2c5 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Prod.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Prod.java
@@ -23,10 +23,10 @@ import com.oracle.truffle.r.runtime.ops.*;
@RBuiltin(name = "prod", kind = RBuiltinKind.PRIMITIVE, parameterNames = {"...", "na.rm"})
public abstract class Prod extends RBuiltinNode {
- private static final Object[] PARAMETER_NAMES = new Object[]{"..."};
+ private static final String[] PARAMETER_NAMES = new String[]{"..."};
@Override
- public Object[] getParameterNames() {
+ public String[] getParameterNames() {
return PARAMETER_NAMES;
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteVariableNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteVariableNode.java
index 0cef42dacd..f66abe95a8 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteVariableNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteVariableNode.java
@@ -150,10 +150,10 @@ public abstract class WriteVariableNode extends RNode implements VisibilityContr
public abstract void execute(VirtualFrame frame, Object value);
- @NodeFields({@NodeField(name = "symbol", type = Object.class), @NodeField(name = "mode", type = Mode.class)})
+ @NodeFields({@NodeField(name = "name", type = String.class), @NodeField(name = "mode", type = Mode.class)})
public abstract static class UnresolvedWriteLocalVariableNode extends WriteVariableNode {
- public abstract Object getSymbol();
+ public abstract String getName();
public abstract Mode getMode();
@@ -183,7 +183,7 @@ public abstract class WriteVariableNode extends RNode implements VisibilityContr
private void resolveAndSet(VirtualFrame frame, Object value, FrameSlotKind initialKind) {
CompilerAsserts.neverPartOfCompilation();
- FrameSlot frameSlot = frame.getFrameDescriptor().findOrAddFrameSlot(getSymbol(), initialKind);
+ FrameSlot frameSlot = frame.getFrameDescriptor().findOrAddFrameSlot(getName(), initialKind);
replace(ResolvedWriteLocalVariableNode.create(getRhs(), this.isArgWrite(), frameSlot, getMode())).execute(frame, value);
}
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
index 48a2933110..36bd47ad08 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
@@ -71,7 +71,7 @@ public abstract class RBuiltinNode extends RCallNode implements VisibilityContro
*
* TODO This should go away once all builtins are converted to annotation based specification.
*/
- protected Object[] getParameterNames() {
+ protected String[] getParameterNames() {
RBuiltin builtin = getRBuiltin();
return builtin == null ? null : builtin.parameterNames();
}
--
GitLab