From 3e76fc29024c65881e56a2f7bd851768e29e5098 Mon Sep 17 00:00:00 2001 From: Wojciech Lopata Date: Tue, 2 Apr 2013 23:34:04 +0200 Subject: [PATCH] Rename method --- .../org/jetbrains/jet/codegen/ExpressionCodegen.java | 2 +- .../jet/lang/cfg/JetControlFlowProcessor.java | 3 +-- .../jet/lang/psi/JetBinaryExpressionWithTypeRHS.java | 8 +++++--- .../src/org/jetbrains/jet/lang/psi/JetPsiUtil.java | 3 +-- .../expressions/BasicExpressionTypingVisitor.java | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 986525b38d7..6b44447d97f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -3355,7 +3355,7 @@ The "returned" value of try expression with no finally is either the last expres @Override public StackValue visitBinaryWithTypeRHSExpression(JetBinaryExpressionWithTypeRHS expression, StackValue receiver) { - JetSimpleNameExpression operationSign = expression.getOperationSign(); + JetSimpleNameExpression operationSign = expression.getOperationReference(); IElementType opToken = operationSign.getReferencedNameElementType(); if (opToken == JetTokens.COLON) { return gen(expression.getLeft()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 630ff2c390a..05dddae0607 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowInstructionsGenerator import org.jetbrains.jet.lang.cfg.pseudocode.LocalDeclarationInstruction; import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode; import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; @@ -745,7 +744,7 @@ public class JetControlFlowProcessor { @Override public void visitBinaryWithTypeRHSExpression(JetBinaryExpressionWithTypeRHS expression) { - IElementType operationType = expression.getOperationSign().getReferencedNameElementType(); + IElementType operationType = expression.getOperationReference().getReferencedNameElementType(); if (operationType == JetTokens.COLON || operationType == JetTokens.AS_KEYWORD || operationType == JetTokens.AS_SAFE) { generateInstructions(expression.getLeft(), false); builder.read(expression); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java index 594f9067bfd..0eb82ad72ae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl { +public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl implements JetOperationExpression { public JetBinaryExpressionWithTypeRHS(@NotNull ASTNode node) { super(node); } @@ -46,7 +46,7 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl { @Nullable @IfNotParsed public JetTypeReference getRight() { - ASTNode node = getOperationSign().getNode(); + ASTNode node = getOperationReference().getNode(); while (node != null) { PsiElement psi = node.getPsi(); if (psi instanceof JetTypeReference) { @@ -57,8 +57,10 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl { return null; } + + @Override @NotNull - public JetSimpleNameExpression getOperationSign() { + public JetSimpleNameExpression getOperationReference() { return (JetSimpleNameExpression) findChildByType(JetNodeTypes.OPERATION_REFERENCE); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 088a1c8f70d..99b98cfd949 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -36,7 +36,6 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetToken; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.util.QualifiedNamesUtil; import java.util.Collection; import java.util.HashSet; @@ -74,7 +73,7 @@ public class JetPsiUtil { ) { if (expression instanceof JetBinaryExpressionWithTypeRHS) { JetBinaryExpressionWithTypeRHS binaryExpression = (JetBinaryExpressionWithTypeRHS) expression; - JetSimpleNameExpression operationSign = binaryExpression.getOperationSign(); + JetSimpleNameExpression operationSign = binaryExpression.getOperationReference(); if (JetTokens.COLON.equals(operationSign.getReferencedNameElementType())) { expression = binaryExpression.getLeft(); JetTypeReference typeReference = binaryExpression.getRight(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index da950623f29..d4e669f080c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -138,7 +138,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { DataFlowInfo dataFlowInfo = context.dataFlowInfo; if (right != null) { JetType targetType = context.expressionTypingServices.getTypeResolver().resolveType(context.scope, right, context.trace, true); - IElementType operationType = expression.getOperationSign().getReferencedNameElementType(); + IElementType operationType = expression.getOperationReference().getReferencedNameElementType(); boolean tryWithNoExpectedType = true; if (isTypeFlexible(left) || operationType == JetTokens.COLON) { @@ -180,7 +180,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @NotNull JetType targetType, JetType actualType ) { - JetSimpleNameExpression operationSign = expression.getOperationSign(); + JetSimpleNameExpression operationSign = expression.getOperationReference(); IElementType operationType = operationSign.getReferencedNameElementType(); if (operationType == JetTokens.COLON) { if (targetType != NO_EXPECTED_TYPE && !JetTypeChecker.INSTANCE.isSubtypeOf(actualType, targetType)) { @@ -210,16 +210,16 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { JetTypeChecker typeChecker = JetTypeChecker.INSTANCE; if (!typeChecker.isSubtypeOf(targetType, actualType)) { if (typeChecker.isSubtypeOf(actualType, targetType)) { - context.trace.report(USELESS_CAST_STATIC_ASSERT_IS_FINE.on(expression.getOperationSign())); + context.trace.report(USELESS_CAST_STATIC_ASSERT_IS_FINE.on(expression.getOperationReference())); } else { // See JET-58 Make 'as never succeeds' a warning, or even never check for Java (external) types - context.trace.report(CAST_NEVER_SUCCEEDS.on(expression.getOperationSign())); + context.trace.report(CAST_NEVER_SUCCEEDS.on(expression.getOperationReference())); } } else { if (typeChecker.isSubtypeOf(actualType, targetType)) { - context.trace.report(USELESS_CAST.on(expression.getOperationSign())); + context.trace.report(USELESS_CAST.on(expression.getOperationReference())); } else { if (isCastErased(actualType, targetType, typeChecker)) {