From 66678cdda9c8a3b612007a4f9556fa4a6cf90508 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 16 Oct 2013 16:25:20 +0400 Subject: [PATCH] refactoring: inlined static factory methods --- .../lang/resolve/constants/DoubleValueTypeConstructor.java | 6 +----- .../lang/resolve/constants/IntegerValueTypeConstructor.java | 6 +----- .../types/expressions/BasicExpressionTypingVisitor.java | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) 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 index a59975ab6c6..cb6da1eafc8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValueTypeConstructor.java @@ -29,11 +29,7 @@ public class DoubleValueTypeConstructor extends NumberValueTypeConstructor { private final List supertypes; - public static DoubleValueTypeConstructor create(double value) { - return new DoubleValueTypeConstructor(value); - } - - private DoubleValueTypeConstructor(double value) { + public DoubleValueTypeConstructor(double value) { this.value = value; // order of types matters // 'getPrimitiveNumberType' returns first of supertypes that is a subtype of expected type diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java index 7142abf8de6..e987688c0a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java @@ -27,11 +27,7 @@ public class IntegerValueTypeConstructor extends NumberValueTypeConstructor { private final long value; private final Collection supertypes = Lists.newArrayList(); - public static IntegerValueTypeConstructor create(long value) { - return new IntegerValueTypeConstructor(value); - } - - private IntegerValueTypeConstructor(long value) { + public IntegerValueTypeConstructor(long value) { // order of types matters // 'getPrimitiveNumberType' returns first of supertypes that is a subtype of expected type // for expected type 'Any' result type 'Int' should be returned 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 8deece0c42b..39e7679de3d 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 @@ -139,13 +139,13 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (elementType == JetNodeTypes.INTEGER_CONSTANT) { Long longValue = CompileTimeConstantResolver.parseLongValue(text); if (longValue != null) { - return createNumberValueTypeInfo(IntegerValueTypeConstructor.create(longValue), longValue, context.dataFlowInfo); + 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(DoubleValueTypeConstructor.create(doubleValue), doubleValue, context.dataFlowInfo); + return createNumberValueTypeInfo(new DoubleValueTypeConstructor(doubleValue), doubleValue, context.dataFlowInfo); } } }