diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index 126a1b1653c..1bee18ba7db 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -56,7 +56,7 @@ public class ExpressionVisitor extends StatementVisitor { 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 (tokenType == JavaTokenType.GTGTGTEQ) secondOp = "ushr"; if (!secondOp.isEmpty()) // if not Kotlin operators myResult = new AssignmentExpression( @@ -88,7 +88,7 @@ public class ExpressionVisitor extends StatementVisitor { if (tokenType == JavaTokenType.XOR) return "xor"; if (tokenType == JavaTokenType.AND) return "and"; if (tokenType == JavaTokenType.OR) return "or"; - if (tokenType == JavaTokenType.GTGTGT) return "cyclicShiftRight"; + if (tokenType == JavaTokenType.GTGTGT) return "ushr"; if (tokenType == JavaTokenType.GT) return ">"; if (tokenType == JavaTokenType.LT) return "<"; if (tokenType == JavaTokenType.GE) return ">="; @@ -112,7 +112,7 @@ public class ExpressionVisitor extends StatementVisitor { if (expression.getOperationSign().getTokenType() == JavaTokenType.GTGTGT) myResult = new DummyMethodCallExpression( expressionToExpression(expression.getLOperand()), - "cyclicShiftRight", + "ushr", expressionToExpression(expression.getROperand())); else myResult = diff --git a/testData/ast/assignmentExpression/expression/unsignedRightShift.kt b/testData/ast/assignmentExpression/expression/unsignedRightShift.kt index bf15c8f56c5..484c3a6a13d 100644 --- a/testData/ast/assignmentExpression/expression/unsignedRightShift.kt +++ b/testData/ast/assignmentExpression/expression/unsignedRightShift.kt @@ -1 +1 @@ -x = (x cyclicShiftRight 2) \ No newline at end of file +x = (x ushr 2) \ No newline at end of file diff --git a/testData/ast/binaryExpression/expression/unsignedRightShift.kt b/testData/ast/binaryExpression/expression/unsignedRightShift.kt index cda6648c88e..8b8c1f89e58 100644 --- a/testData/ast/binaryExpression/expression/unsignedRightShift.kt +++ b/testData/ast/binaryExpression/expression/unsignedRightShift.kt @@ -1 +1 @@ -x.cyclicShiftRight(2) \ No newline at end of file +x.ushr(2) \ No newline at end of file diff --git a/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt b/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt index 789248920ea..cc8c414081e 100644 --- a/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt +++ b/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt @@ -1 +1 @@ -(1 cyclicShiftRight 2 cyclicShiftRight 3) \ No newline at end of file +(1 ushr 2 ushr 3) \ No newline at end of file