From 00c64b57dd62d5d6e788089ec04992b068b37f07 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 9 Nov 2016 14:49:49 +0100
Subject: [PATCH] operators are RSyntaxLookup instead of RSyntaxElement (in
OperatorNode)
---
.../oracle/truffle/r/nodes/control/AbstractLoopNode.java | 2 +-
.../src/com/oracle/truffle/r/nodes/control/BlockNode.java | 4 ++--
.../src/com/oracle/truffle/r/nodes/control/IfNode.java | 3 ++-
.../src/com/oracle/truffle/r/nodes/control/NextNode.java | 3 ++-
.../com/oracle/truffle/r/nodes/control/OperatorNode.java | 8 ++++----
.../com/oracle/truffle/r/nodes/control/RepeatNode.java | 3 ++-
.../oracle/truffle/r/nodes/control/ReplacementNode.java | 2 +-
.../src/com/oracle/truffle/r/nodes/control/WhileNode.java | 3 ++-
.../truffle/r/nodes/function/signature/MissingNode.java | 2 +-
9 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/AbstractLoopNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/AbstractLoopNode.java
index 7ba425b914..4303107246 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/AbstractLoopNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/AbstractLoopNode.java
@@ -32,7 +32,7 @@ import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
/** Marker class for loops. */
public abstract class AbstractLoopNode extends OperatorNode {
- protected AbstractLoopNode(SourceSection sourceSection, RSyntaxElement operator) {
+ protected AbstractLoopNode(SourceSection sourceSection, RSyntaxLookup operator) {
super(sourceSection, operator);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/BlockNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/BlockNode.java
index fd1930b2e9..f9bf11cd91 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/BlockNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/BlockNode.java
@@ -30,7 +30,7 @@ import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.nodes.RNode;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
/**
@@ -43,7 +43,7 @@ public final class BlockNode extends OperatorNode {
@Children protected final RNode[] sequence;
@Child private SetVisibilityNode visibility = SetVisibilityNode.create();
- public BlockNode(SourceSection src, RSyntaxElement operator, RNode[] sequence) {
+ public BlockNode(SourceSection src, RSyntaxLookup operator, RNode[] sequence) {
super(src, operator);
this.sequence = sequence;
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/IfNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/IfNode.java
index f8f477a128..fd5b395b0c 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/IfNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/IfNode.java
@@ -34,6 +34,7 @@ import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.nodes.RNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class IfNode extends OperatorNode {
@@ -45,7 +46,7 @@ public final class IfNode extends OperatorNode {
private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
- public IfNode(SourceSection src, RSyntaxElement operator, RSyntaxNode condition, RSyntaxNode thenPart, RSyntaxNode elsePart) {
+ public IfNode(SourceSection src, RSyntaxLookup operator, RSyntaxNode condition, RSyntaxNode thenPart, RSyntaxNode elsePart) {
super(src, operator);
this.condition = ConvertBooleanNode.create(condition);
this.thenPart = thenPart.asRNode();
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/NextNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/NextNode.java
index 3fdced4c23..23872a96c2 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/NextNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/NextNode.java
@@ -27,12 +27,13 @@ import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
public final class NextNode extends OperatorNode {
@Child private SetVisibilityNode visibility = SetVisibilityNode.create();
- public NextNode(SourceSection src, RSyntaxElement operator) {
+ public NextNode(SourceSection src, RSyntaxLookup operator) {
super(src, operator);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/OperatorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/OperatorNode.java
index 43349b9401..9a85a3d6f4 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/OperatorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/OperatorNode.java
@@ -25,20 +25,20 @@ package com.oracle.truffle.r.nodes.control;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.r.runtime.nodes.RSourceSectionNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxCall;
-import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public abstract class OperatorNode extends RSourceSectionNode implements RSyntaxNode, RSyntaxCall {
- protected final RSyntaxElement operator;
+ protected final RSyntaxLookup operator;
- public OperatorNode(SourceSection src, RSyntaxElement operator) {
+ public OperatorNode(SourceSection src, RSyntaxLookup operator) {
super(src);
this.operator = operator;
}
@Override
- public final RSyntaxElement getSyntaxLHS() {
+ public final RSyntaxLookup getSyntaxLHS() {
return operator;
}
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
index 4630e52bc3..92ce06b4c2 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
@@ -35,6 +35,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.nodes.RNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxCall;
import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class RepeatNode extends AbstractLoopNode implements RSyntaxNode, RSyntaxCall {
@@ -42,7 +43,7 @@ public final class RepeatNode extends AbstractLoopNode implements RSyntaxNode, R
@Child private LoopNode loop;
@Child private SetVisibilityNode visibility = SetVisibilityNode.create();
- public RepeatNode(SourceSection src, RSyntaxElement operator, RSyntaxNode body) {
+ public RepeatNode(SourceSection src, RSyntaxLookup operator, RSyntaxNode body) {
super(src, operator);
this.loop = Truffle.getRuntime().createLoopNode(new WhileRepeatingNode(this, body.asRNode()));
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ReplacementNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ReplacementNode.java
index bcd522c698..9f24797fc4 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ReplacementNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ReplacementNode.java
@@ -76,7 +76,7 @@ final class ReplacementNode extends OperatorNode {
private final String rhsVarName;
private final RSyntaxElement lhs;
- ReplacementNode(SourceSection source, RSyntaxElement operator, RNode target, RSyntaxElement lhs, RNode rhs, List<RSyntaxCall> calls, String rhsVarName, String targetVarName, boolean isSuper,
+ ReplacementNode(SourceSection source, RSyntaxLookup operator, RNode target, RSyntaxElement lhs, RNode rhs, List<RSyntaxCall> calls, String rhsVarName, String targetVarName, boolean isSuper,
int tempNamesStartIndex) {
super(source, operator);
this.lhs = lhs;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
index 6a3af2ad90..81d1ab9c10 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
@@ -38,6 +38,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.nodes.RNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxCall;
import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
+import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class WhileNode extends AbstractLoopNode implements RSyntaxNode, RSyntaxCall {
@@ -45,7 +46,7 @@ public final class WhileNode extends AbstractLoopNode implements RSyntaxNode, RS
@Child private LoopNode loop;
@Child private SetVisibilityNode visibility = SetVisibilityNode.create();
- public WhileNode(SourceSection src, RSyntaxElement operator, RSyntaxNode condition, RSyntaxNode body) {
+ public WhileNode(SourceSection src, RSyntaxLookup operator, RSyntaxNode condition, RSyntaxNode body) {
super(src, operator);
this.loop = Truffle.getRuntime().createLoopNode(new WhileRepeatingNode(this, ConvertBooleanNode.create(condition), body.asRNode()));
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/signature/MissingNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/signature/MissingNode.java
index ef0f05f0d3..750c38d7dd 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/signature/MissingNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/signature/MissingNode.java
@@ -178,7 +178,7 @@ public final class MissingNode extends OperatorNode {
private final ArgumentsSignature signature;
private final RSyntaxElement[] args;
- public MissingNode(SourceSection source, RSyntaxElement operator, ArgumentsSignature signature, RSyntaxElement[] args) {
+ public MissingNode(SourceSection source, RSyntaxLookup operator, ArgumentsSignature signature, RSyntaxElement[] args) {
super(source, operator);
this.signature = signature;
this.args = args;
--
GitLab