From 53d17bc4cedefad5bbf9a03cffb9516da09508c6 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 4 Dec 2013 12:26:39 +0400 Subject: [PATCH] Rename CompileTimeConstantResolver to CompileTimeConstantChecker --- .../jet/lang/cfg/JetControlFlowProcessor.java | 1 - .../jet/lang/evaluate/ConstantExpressionEvaluator.kt | 4 ++-- .../jet/lang/resolve/calls/ArgumentTypeResolver.java | 4 ---- ...Resolver.java => CompileTimeConstantChecker.java} | 4 ++-- .../expressions/BasicExpressionTypingVisitor.java | 11 +++++------ .../jet/lang/types/expressions/DataFlowUtils.java | 4 ++-- .../types/expressions/ExpressionTypingContext.java | 12 ++++++------ 7 files changed, 17 insertions(+), 23 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/{CompileTimeConstantResolver.java => CompileTimeConstantChecker.java} (98%) 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 c9302e09b9f..21d0bb0f0fd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -43,7 +43,6 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.calls.util.ExpressionAsFunctionDescriptor; import org.jetbrains.jet.lang.resolve.constants.BooleanValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt index 979524f516e..e384019d5b1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt @@ -87,7 +87,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet JetNodeTypes.INTEGER_CONSTANT -> parseLong(text) JetNodeTypes.FLOAT_CONSTANT -> parseFloatingLiteral(text) JetNodeTypes.BOOLEAN_CONSTANT -> parseBoolean(text) - JetNodeTypes.CHARACTER_CONSTANT -> CompileTimeConstantResolver.parseChar(expression) + JetNodeTypes.CHARACTER_CONSTANT -> CompileTimeConstantChecker.parseChar(expression) JetNodeTypes.NULL -> null else -> throw IllegalArgumentException("Unsupported constant: " + expression) } @@ -572,7 +572,7 @@ private fun getIntegerValue(value: Long, expectedType: JetType): CompileTimeCons else -> LongValue(value) } - if (CompileTimeConstantResolver.noExpectedTypeOrError(expectedType)) { + if (CompileTimeConstantChecker.noExpectedTypeOrError(expectedType)) { return IntegerValueTypeConstant(value) } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index 1b978989539..542f8cc150c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -29,10 +29,6 @@ import org.jetbrains.jet.lang.resolve.calls.context.CallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver; import org.jetbrains.jet.lang.resolve.constants.NumberValueTypeConstructor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java index d4e79823205..cd8735e930e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java @@ -37,7 +37,7 @@ import java.util.Set; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -public class CompileTimeConstantResolver { +public class CompileTimeConstantChecker { private static final Set errorsThatDependOnExpectedType = Sets.newHashSet(CONSTANT_EXPECTED_TYPE_MISMATCH, NULL_FOR_NONNULL_TYPE); @@ -45,7 +45,7 @@ public class CompileTimeConstantResolver { private final BindingTrace trace; private final boolean checkOnlyErrorsThatDependOnExpectedType; - public CompileTimeConstantResolver(@NotNull BindingTrace trace, boolean checkOnlyErrorsThatDependOnExpectedType) { + public CompileTimeConstantChecker(@NotNull BindingTrace trace, boolean checkOnlyErrorsThatDependOnExpectedType) { this.checkOnlyErrorsThatDependOnExpectedType = checkOnlyErrorsThatDependOnExpectedType; this.builtIns = KotlinBuiltIns.getInstance(); this.trace = trace; 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 ccae160d1d8..087d5a85794 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 @@ -48,9 +48,8 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver; +import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.NumberValueTypeConstant; -import org.jetbrains.jet.lang.resolve.constants.NumberValueTypeConstructor; import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -73,7 +72,7 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getStaticNestedClassesScope; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver.ErrorCharValueWithDiagnostic; +import static org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker.ErrorCharValueWithDiagnostic; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.jet.lang.types.TypeUtils.*; import static org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; @@ -124,8 +123,8 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { CompileTimeConstant value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType); if (!(value instanceof NumberValueTypeConstant)) { - CompileTimeConstantResolver compileTimeConstantResolver = context.getCompileTimeConstantResolver(); - boolean hasError = compileTimeConstantResolver.checkConstantExpressionType(value, expression, context.expectedType); + CompileTimeConstantChecker compileTimeConstantChecker = context.getCompileTimeConstantChecker(); + boolean hasError = compileTimeConstantChecker.checkConstantExpressionType(value, expression, context.expectedType); if (hasError) { IElementType elementType = expression.getNode().getElementType(); return JetTypeInfo.create(getDefaultType(elementType), context.dataFlowInfo); @@ -1189,7 +1188,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @Override public void visitEscapeStringTemplateEntry(@NotNull JetEscapeStringTemplateEntry entry) { - CompileTimeConstant compileTimeConstant = CompileTimeConstantResolver.escapedStringToCharValue(entry.getText(), entry); + CompileTimeConstant compileTimeConstant = CompileTimeConstantChecker.escapedStringToCharValue(entry.getText(), entry); if (compileTimeConstant instanceof ErrorCharValueWithDiagnostic) { context.trace.report(((ErrorCharValueWithDiagnostic) compileTimeConstant).getDiagnostic()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java index a4304ba4c4e..6821fa19332 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValue; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValueFactory; import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver; +import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.NumberValueTypeConstant; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetTypeInfo; @@ -173,7 +173,7 @@ public class DataFlowUtils { if (value instanceof NumberValueTypeConstant) { value = EvaluatePackage.getCompileTimeConstantForNumberType(((NumberValueTypeConstant) value).getValue(), expectedType); } - new CompileTimeConstantResolver(trace, true).checkConstantExpressionType(value, (JetConstantExpression) expression, expectedType); + new CompileTimeConstantChecker(trace, true).checkConstantExpressionType(value, (JetConstantExpression) expression, expectedType); return expressionType; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java index 5cc5339c16e..baff7561900 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.calls.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.context.*; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantResolver; +import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; @@ -75,7 +75,7 @@ public class ExpressionTypingContext extends ResolutionContext