From 33d973f0162cfd4c30626862df79515f19feb2d6 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Mon, 25 Nov 2013 19:31:40 +0400 Subject: [PATCH] Delete DoubleValueTypeConstructor --- .../constants/DoubleValueTypeConstructor.java | 57 ------------------- .../BasicExpressionTypingVisitor.java | 6 -- 2 files changed, 63 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java deleted file mode 100644 index 7ef388311c3..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.resolve.constants; - -import com.google.common.collect.Lists; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; - -import java.util.Collection; -import java.util.List; - -public class DoubleValueTypeConstructor extends NumberValueTypeConstructor { - private final double value; - private final List supertypes; - - - public DoubleValueTypeConstructor(double value) { - this.value = value; - // order of types matters - // 'getPrimitiveNumberType' returns first of supertypes that is a subtype of expected type - // for expected type 'Any' result type 'Double' should be returned - supertypes = Lists.newArrayList(KotlinBuiltIns.getInstance().getDoubleType()); - } - - @NotNull - @Override - public Collection getSupertypes() { - return supertypes; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - DoubleValueTypeConstructor that = (DoubleValueTypeConstructor) o; - - if (Double.compare(that.value, value) != 0) return false; - - return true; - } -} 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 e5a300704ea..a77dbd03177 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 @@ -142,12 +142,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { return createNumberValueTypeInfo(new IntegerValueTypeConstructor((long) longValue), longValue, context.dataFlowInfo); } } - else if (elementType == JetNodeTypes.FLOAT_CONSTANT) { - Double doubleValue = CompileTimeConstantResolver.parseDoubleValue(text); - if (doubleValue != null) { - return createNumberValueTypeInfo(new DoubleValueTypeConstructor(doubleValue), doubleValue, context.dataFlowInfo); - } - } } CompileTimeConstantResolver compileTimeConstantResolver = context.getCompileTimeConstantResolver(); boolean hasError = compileTimeConstantResolver.checkConstantExpressionType(expression, context.expectedType);