stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8193295: Remove no longer used COMMALEFT

Browse Source 
Reviewed-by: hannesw, mhaupt
This commit is contained in:
Attila Szegedi 2018-02-11 12:41:56 +01:00
parent f9b19eb874
commit b1c09c22bb
5 changed files with 0 additions and 53 deletions
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal
codegen
CodeGenerator.javaWeighNodes.java
ir
BinaryNode.java
visitor
NodeOperatorVisitor.java
parser
TokenType.java

11
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java

@ -1076,12 +1076,6 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
return false;
}
@Override
public boolean enterCOMMALEFT(final BinaryNode binaryNode) {
loadCOMMALEFT(binaryNode, resultBounds);
return false;
}
@Override
public boolean enterCOMMARIGHT(final BinaryNode binaryNode) {
loadCOMMARIGHT(binaryNode, resultBounds);
@ -4247,11 +4241,6 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
loadMaybeDiscard(binaryNode, binaryNode.rhs(), resultBounds);
}
private void loadCOMMALEFT(final BinaryNode binaryNode, final TypeBounds resultBounds) {
loadMaybeDiscard(binaryNode, binaryNode.lhs(), resultBounds);
loadAndDiscard(binaryNode.rhs());
}
private void loadDIV(final BinaryNode binaryNode, final TypeBounds resultBounds) {
new BinaryArith() {
@Override

5
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java

@ -454,11 +454,6 @@ final class WeighNodes extends NodeOperatorVisitor<LexicalContext> {
return binaryNodeWeight(binaryNode);
}
@Override
public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
return binaryNodeWeight(binaryNode);
}
@Override
public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
return binaryNodeWeight(binaryNode);

10
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java

@ -250,9 +250,6 @@ public final class BinaryNode extends Expression implements Assignment<Expressio
case INSTANCEOF: {
return Type.BOOLEAN;
}
case COMMALEFT: {
return lhs.getType();
}
case COMMARIGHT: {
return rhs.getType();
}
@ -378,8 +375,6 @@ public final class BinaryNode extends Expression implements Assignment<Expressio
@Override
public boolean isAlwaysFalse() {
switch (tokenType()) {
case COMMALEFT:
return lhs.isAlwaysFalse();
case COMMARIGHT:
return rhs.isAlwaysFalse();
default:
@ -390,8 +385,6 @@ public final class BinaryNode extends Expression implements Assignment<Expressio
@Override
public boolean isAlwaysTrue() {
switch (tokenType()) {
case COMMALEFT:
return lhs.isAlwaysTrue();
case COMMARIGHT:
return rhs.isAlwaysTrue();
default:
@ -419,9 +412,6 @@ public final class BinaryNode extends Expression implements Assignment<Expressio
sb.append(' ');
switch (tokenType) {
case COMMALEFT:
sb.append(",<");
break;
case COMMARIGHT:
sb.append(",>");
break;

26
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java

@ -143,8 +143,6 @@ public abstract class NodeOperatorVisitor<T extends LexicalContext> extends Node
return enterBIT_XOR(binaryNode);
case COMMARIGHT:
return enterCOMMARIGHT(binaryNode);
case COMMALEFT:
return enterCOMMALEFT(binaryNode);
case DIV:
return enterDIV(binaryNode);
case EQ:
@ -227,8 +225,6 @@ public abstract class NodeOperatorVisitor<T extends LexicalContext> extends Node
return leaveBIT_XOR(binaryNode);
case COMMARIGHT:
return leaveCOMMARIGHT(binaryNode);
case COMMALEFT:
return leaveCOMMALEFT(binaryNode);
case DIV:
return leaveDIV(binaryNode);
case EQ:
@ -814,28 +810,6 @@ public abstract class NodeOperatorVisitor<T extends LexicalContext> extends Node
return leaveDefault(binaryNode);
}
/**
* Binary enter - callback for entering comma left operator
* (a, b) where the result is a
*
* @param binaryNode the node
* @return true if traversal should continue and node children be traversed, false otherwise
*/
public boolean enterCOMMALEFT(final BinaryNode binaryNode) {
return enterDefault(binaryNode);
}
/**
* Binary leave - callback for leaving a comma left operator
* (a, b) where the result is a
*
* @param binaryNode the node
* @return processed node, which will replace the original one, or the original node
*/
public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
return leaveDefault(binaryNode);
}
/**
* Binary enter - callback for entering comma right operator
* (a, b) where the result is b

1
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java

@ -191,7 +191,6 @@ public enum TokenType {
TEMPLATE_MIDDLE(LITERAL, null),
TEMPLATE_TAIL (LITERAL, null),
COMMALEFT (IR, null),
DECPOSTFIX (IR, null),
INCPOSTFIX (IR, null),
SPREAD_ARGUMENT(IR, null),