From 3e9fed10dd6aedaa649362ae4b7f4080b8fd9a43 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Tue, 19 Aug 2014 19:12:39 +0200
Subject: [PATCH] unify access modifiers for guards
---
.../truffle/r/nodes/builtin/base/Combine.java | 4 ++--
.../nodes/builtin/base/PrettyPrinterNode.java | 6 ++---
.../r/nodes/builtin/base/UpdateDiag.java | 8 +++----
.../r/nodes/access/ArrayPositionCast.java | 2 +-
.../r/nodes/access/VectorPositionCast.java | 4 ++--
.../r/nodes/binary/BinaryArithmeticNode.java | 2 +-
.../r/nodes/binary/BinaryBooleanNode.java | 24 +++++++++----------
.../BinaryBooleanNonVectorizedNode.java | 12 +++++-----
8 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
index de82635b87..cb7f576996 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
@@ -582,11 +582,11 @@ public abstract class Combine extends RBuiltinNode {
return current;
}
- public boolean hasArgNames() {
+ protected boolean hasArgNames() {
return getSuppliedArgsNames() != null;
}
- public boolean noArgNames() {
+ protected boolean noArgNames() {
return !hasArgNames();
}
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
index 4a52829723..8576637c1b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PrettyPrinterNode.java
@@ -1540,15 +1540,15 @@ public abstract class PrettyPrinterNode extends RNode {
return builderToString(b);
}
- public boolean isEmpty(RAbstractVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
+ protected boolean isEmpty(RAbstractVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
return vector.getLength() == 0;
}
- public boolean isEmpty(RAbstractDoubleVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
+ protected boolean isEmpty(RAbstractDoubleVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
return vector.getLength() == 0;
}
- public boolean isEmpty(RAbstractComplexVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
+ protected boolean isEmpty(RAbstractComplexVector vector, RIntVector dimensions, int offset, byte isListOrStringVector, byte isComplexOrRawVector) {
return vector.getLength() == 0;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java
index a3833acc9a..30fcd1f4e9 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java
@@ -43,21 +43,21 @@ public abstract class UpdateDiag extends RInvisibleBuiltinNode {
@Child protected CastDoubleNode castDouble;
- public static boolean isMatrix(RAbstractVector vector) {
+ protected static boolean isMatrix(RAbstractVector vector) {
return vector.hasDimensions() && vector.getDimensions().length == 2;
}
// FIXME The following two are workarounds for a Truffle-DSL bug.
- public static boolean isMatrix(RAbstractIntVector vector) {
+ protected static boolean isMatrix(RAbstractIntVector vector) {
return isMatrix((RAbstractVector) vector);
}
- public static boolean isMatrix(RAbstractDoubleVector vector) {
+ protected static boolean isMatrix(RAbstractDoubleVector vector) {
return isMatrix((RAbstractVector) vector);
}
- public static boolean correctReplacementLength(RAbstractVector matrix, RAbstractVector replacement) {
+ protected static boolean correctReplacementLength(RAbstractVector matrix, RAbstractVector replacement) {
return replacement.getLength() == 1 || Math.min(matrix.getDimensions()[0], matrix.getDimensions()[1]) == replacement.getLength();
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ArrayPositionCast.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ArrayPositionCast.java
index 3789639e66..23e1f69525 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ArrayPositionCast.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ArrayPositionCast.java
@@ -169,7 +169,7 @@ public abstract class ArrayPositionCast extends RNode {
return 0;
}
- public static boolean sizeOneOp(Object op, RAbstractContainer container, RAbstractIntVector operand) {
+ protected static boolean sizeOneOp(Object op, RAbstractContainer container, RAbstractIntVector operand) {
return operand.getLength() == 1;
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/VectorPositionCast.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/VectorPositionCast.java
index dd5b34d8ef..899f455932 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/VectorPositionCast.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/VectorPositionCast.java
@@ -79,11 +79,11 @@ public abstract class VectorPositionCast extends RNode {
return ((int) stride == stride) && start >= 1.0;
}
- public static boolean greaterEqualOneSequence(RIntSequence operand) {
+ protected static boolean greaterEqualOneSequence(RIntSequence operand) {
return operand.getStart() >= 1 && (operand.getStride() > 0 || operand.getEnd() > 0);
}
- public static boolean startingZeroSequence(RIntSequence operand) {
+ protected static boolean startingZeroSequence(RIntSequence operand) {
return operand.getStart() == 0 && operand.getStride() > 0;
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
index b5b92db212..3f2c20c73a 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
@@ -157,7 +157,7 @@ public abstract class BinaryArithmeticNode extends BinaryNode {
throw RError.error(frame, this.getSourceSection(), RError.Message.NON_NUMERIC_BINARY);
}
- public boolean supportsIntResult() {
+ protected boolean supportsIntResult() {
return arithmetic.isSupportsIntResult();
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
index 6dd3496272..fceb1f7ef7 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
@@ -1141,51 +1141,51 @@ public abstract class BinaryBooleanNode extends BinaryNode {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumericVector(RRaw left, RAbstractVector right) {
+ protected boolean convertRawToNumericVector(RRaw left, RAbstractVector right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumericVector(RAbstractVector left, RRaw right) {
+ protected boolean convertRawToNumericVector(RAbstractVector left, RRaw right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumericVector(RRawVector left, RAbstractVector right) {
+ protected boolean convertRawToNumericVector(RRawVector left, RAbstractVector right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumericVector(RAbstractVector left, RRawVector right) {
+ protected boolean convertRawToNumericVector(RAbstractVector left, RRawVector right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumeric(RRaw left, RRaw right) {
+ protected boolean convertRawToNumeric(RRaw left, RRaw right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumeric(RRawVector left, RRawVector right) {
+ protected boolean convertRawToNumeric(RRawVector left, RRawVector right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumeric(RRaw left, RRawVector right) {
+ protected boolean convertRawToNumeric(RRaw left, RRawVector right) {
return isVectorizedLogicalOp();
}
- public boolean convertRawToNumeric(RRawVector left, RRaw right) {
+ protected boolean convertRawToNumeric(RRawVector left, RRaw right) {
return isVectorizedLogicalOp();
}
- public boolean expectLogical(RRaw left, RRaw right) {
+ protected boolean expectLogical(RRaw left, RRaw right) {
return isVectorizedLogicalOp();
}
- public boolean expectLogical(RRawVector left, RRawVector right) {
+ protected boolean expectLogical(RRawVector left, RRawVector right) {
return isVectorizedLogicalOp();
}
- public boolean expectLogical(RRawVector left, RRaw right) {
+ protected boolean expectLogical(RRawVector left, RRaw right) {
return isVectorizedLogicalOp();
}
- public boolean expectLogical(RRaw left, RRawVector right) {
+ protected boolean expectLogical(RRaw left, RRawVector right) {
return isVectorizedLogicalOp();
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNonVectorizedNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNonVectorizedNode.java
index 1a8e6dd1e7..928d14b60b 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNonVectorizedNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNonVectorizedNode.java
@@ -66,7 +66,7 @@ public abstract class BinaryBooleanNonVectorizedNode extends BinaryNode {
}
@ShortCircuit("arguments[1]")
- public boolean needsRightOperand(Object leftValue) {
+ protected boolean needsRightOperand(Object leftValue) {
return logic.requiresRightOperand(RTypesGen.RTYPES.asByte(leftValue));
}
@@ -230,11 +230,11 @@ public abstract class BinaryBooleanNonVectorizedNode extends BinaryNode {
return left;
}
- boolean isZeroLength(byte left, boolean needsRightOperand, RAbstractVector operand) {
+ protected boolean isZeroLength(byte left, boolean needsRightOperand, RAbstractVector operand) {
return operand.getLength() == 0;
}
- boolean isZeroLength(Object left, boolean needsRightOperand, RAbstractVector operand) {
+ protected boolean isZeroLength(Object left, boolean needsRightOperand, RAbstractVector operand) {
return operand.getLength() == 0;
}
@@ -320,15 +320,15 @@ public abstract class BinaryBooleanNonVectorizedNode extends BinaryNode {
return RRuntime.int2logical(operand.getDataAt(0));
}
- boolean isZeroLength(RAbstractVector operand) {
+ protected boolean isZeroLength(RAbstractVector operand) {
return operand.getLength() == 0;
}
- boolean isStringVector(RAbstractVector vector) {
+ protected boolean isStringVector(RAbstractVector vector) {
return vector.getElementClass() == RString.class;
}
- boolean isRawVector(RAbstractVector vector) {
+ protected boolean isRawVector(RAbstractVector vector) {
return vector.getElementClass() == RRaw.class;
}
}
--
GitLab