azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

>>> supported in polyadic and binary expressions

Browse Source
This commit is contained in:
Sergey Ignatov
2011-11-07 14:16:21 +04:00
parent 43013a6dc8
commit b4d5ff5ff8
4 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+24 -40
View File
@@ -47,42 +47,30 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
final IElementType tokenType = expression.getOperationSign().getTokenType();
if (tokenType == JavaTokenType.GTGTGTEQ) { // because it's transform to the method call
String secondOp = "";
if (tokenType == JavaTokenType.GTGTEQ) secondOp = "shr";
if (tokenType == JavaTokenType.LTLTEQ) secondOp = "shl";
if (tokenType == JavaTokenType.XOREQ) secondOp = "xor";
if (tokenType == JavaTokenType.ANDEQ) secondOp = "and";
if (tokenType == JavaTokenType.OREQ) secondOp = "or";
if (tokenType == JavaTokenType.GTGTGTEQ) secondOp = "cyclicShiftRight";
if (!secondOp.equals("")) // if not Kotlin operators
myResult = new AssignmentExpression(
expressionToExpression(expression.getLExpression()),
new DummyMethodCallExpression(
new BinaryExpression(
expressionToExpression(expression.getLExpression()),
"cyclicShiftRight",
expressionToExpression(expression.getRExpression())
expressionToExpression(expression.getRExpression()),
secondOp
),
"="
);
} else {
String secondOp = "";
if (tokenType == JavaTokenType.GTGTEQ) secondOp = "shr";
if (tokenType == JavaTokenType.LTLTEQ) secondOp = "shl";
if (tokenType == JavaTokenType.XOREQ) secondOp = "xor";
if (tokenType == JavaTokenType.ANDEQ) secondOp = "and";
if (tokenType == JavaTokenType.OREQ) secondOp = "or";
if (!secondOp.equals("")) // if not Kotlin operators
myResult = new AssignmentExpression(
expressionToExpression(expression.getLExpression()),
new BinaryExpression(
expressionToExpression(expression.getLExpression()),
expressionToExpression(expression.getRExpression()),
secondOp
),
"="
);
else
myResult = new AssignmentExpression(
expressionToExpression(expression.getLExpression()),
expressionToExpression(expression.getRExpression()),
expression.getOperationSign().getText() // TODO
);
}
else
myResult = new AssignmentExpression(
expressionToExpression(expression.getLExpression()),
expressionToExpression(expression.getRExpression()),
expression.getOperationSign().getText() // TODO
);
}
@NotNull
@@ -97,7 +85,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
if (tokenType == JavaTokenType.XOR) return "xor";
if (tokenType == JavaTokenType.AND) return "and";
if (tokenType == JavaTokenType.OR) return "or";
if (tokenType == JavaTokenType.OR) return "or";
if (tokenType == JavaTokenType.GTGTGT) return "cyclicShiftRight";
if (tokenType == JavaTokenType.GT) return ">";
if (tokenType == JavaTokenType.LT) return "<";
if (tokenType == JavaTokenType.GE) return ">=";
@@ -266,13 +254,9 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
@Override
public void visitPolyadicExpression(PsiPolyadicExpression expression) {
super.visitPolyadicExpression(expression);
if (expression.getOperationTokenType() != JavaTokenType.GTGTGT)
myResult = new PolyadicExpression(
expressionsToExpressionList(expression.getOperands()),
getOperatorString(expression.getOperationTokenType())
);
else {
// TODO: support GTGTGT
}
}
myResult = new PolyadicExpression(
expressionsToExpressionList(expression.getOperands()),
getOperatorString(expression.getOperationTokenType())
);
}
}
testData/ast/assignmentExpression/expression/unsignedRightShift.kt
+1 -1
View File
@@ -1 +1 @@
x = x.cyclicShiftRight(2)
x = (x cyclicShiftRight 2)
testData/ast/polyadicExpression/expression/unassignedShiftRight.jav
+1
View File
@@ -0,0 +1 @@
1 >>> 2 >>> 3
testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
+1
View File
@@ -0,0 +1 @@
(1 cyclicShiftRight 2 cyclicShiftRight 3)