From cd3892e2518e82d5e329c07372d02c7a1cefda89 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 14 Nov 2012 22:48:10 +0400 Subject: [PATCH] rename deparenthesize -> deparenthesizeWithNoTypeResolution --- .../src/org/jetbrains/jet/codegen/RangeCodegenUtil.java | 2 +- .../org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java | 6 +++--- .../frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java | 6 +++--- .../types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../expressions/ExpressionTypingVisitorForStatements.java | 4 ++-- .../jetbrains/jet/lang/types/expressions/LabelResolver.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java index 9dda9460539..a6fc20935c4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java @@ -56,7 +56,7 @@ public class RangeCodegenUtil { // Other binary operations will succeed too, but will be filtered out later (by examining a resolvedCall) JetExpression rangeExpression = forExpression.getLoopRange(); assert rangeExpression != null; - JetExpression loopRange = JetPsiUtil.deparenthesize(rangeExpression); + JetExpression loopRange = JetPsiUtil.deparenthesizeWithNoTypeResolution(rangeExpression); if (loopRange instanceof JetQualifiedExpression) { // a.rangeTo(b) JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) loopRange; 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 01ec6aab8cc..9e4310230f4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -185,7 +185,7 @@ public class JetControlFlowProcessor { } private void visitLabeledExpression(@NotNull String labelName, @NotNull JetExpression labeledExpression) { - JetExpression deparenthesized = JetPsiUtil.deparenthesize(labeledExpression); + JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(labeledExpression); if (deparenthesized != null) { value(labeledExpression, inCondition); } @@ -220,7 +220,7 @@ public class JetControlFlowProcessor { } } else if (operationType == JetTokens.EQ) { - JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft()); + JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft()); if (right != null) { value(right, false); } @@ -243,7 +243,7 @@ public class JetControlFlowProcessor { } } else if (OperatorConventions.ASSIGNMENT_OPERATIONS.containsKey(operationType)) { - JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft()); + JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft()); if (left != null) { value(left, false); } 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 b4b18406235..a5f8c30cbb1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -51,7 +51,7 @@ public class JetPsiUtil { } @Nullable - public static JetExpression deparenthesize(@NotNull JetExpression expression) { + public static JetExpression deparenthesizeWithNoTypeResolution(@NotNull JetExpression expression) { if (expression instanceof JetBinaryExpressionWithTypeRHS) { JetSimpleNameExpression operationSign = ((JetBinaryExpressionWithTypeRHS) expression).getOperationSign(); if (JetTokens.COLON.equals(operationSign.getReferencedNameElementType())) { @@ -68,7 +68,7 @@ public class JetPsiUtil { } if (expression instanceof JetParenthesizedExpression) { JetExpression innerExpression = ((JetParenthesizedExpression) expression).getExpression(); - return innerExpression != null ? deparenthesize(innerExpression) : null; + return innerExpression != null ? deparenthesizeWithNoTypeResolution(innerExpression) : null; } return expression; } @@ -416,7 +416,7 @@ public class JetPsiUtil { } public static boolean isNullConstant(@NotNull JetExpression expression) { - JetExpression deparenthesized = deparenthesize(expression); + JetExpression deparenthesized = deparenthesizeWithNoTypeResolution(expression); return deparenthesized instanceof JetConstantExpression && deparenthesized.getNode().getElementType() == JetNodeTypes.NULL; } 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 5e71aeb1df7..e4eeef77e91 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 @@ -1039,7 +1039,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } private void checkLValue(BindingTrace trace, JetExpression expressionWithParenthesis, boolean canBeThis) { - JetExpression expression = JetPsiUtil.deparenthesize(expressionWithParenthesis); + JetExpression expression = JetPsiUtil.deparenthesizeWithNoTypeResolution(expressionWithParenthesis); if (expression instanceof JetArrayAccessExpression) { checkLValue(trace, ((JetArrayAccessExpression) expression).getArrayExpression(), true); return; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java index e196f4e55e5..e08e6b0de1b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java @@ -202,7 +202,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito JetType leftType = facade.getTypeInfo(expression.getLeft(), context).getType(); JetExpression right = expression.getRight(); - JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft()); + JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft()); if (right == null || left == null) { temporaryBindingTrace.commit(); return null; @@ -262,7 +262,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito protected JetType visitAssignment(JetBinaryExpression expression, ExpressionTypingContext contextWithExpectedType) { ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE); - JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft()); + JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft()); JetExpression right = expression.getRight(); if (left instanceof JetArrayAccessExpression) { JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) left; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java index c59eb597541..d5936a34ac7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java @@ -41,7 +41,7 @@ public class LabelResolver { public LabelResolver() {} public void enterLabeledElement(@NotNull LabelName labelName, @NotNull JetExpression labeledExpression) { - JetExpression deparenthesized = JetPsiUtil.deparenthesize(labeledExpression); + JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(labeledExpression); if (deparenthesized != null) { Stack stack = labeledElements.get(labelName); if (stack == null) { @@ -53,7 +53,7 @@ public class LabelResolver { } public void exitLabeledElement(@NotNull JetExpression expression) { - JetExpression deparenthesized = JetPsiUtil.deparenthesize(expression); + JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression); // TODO : really suboptimal for (Iterator>> mapIter = labeledElements.entrySet().iterator(); mapIter.hasNext(); ) { Map.Entry> entry = mapIter.next();