azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: prettify converted code a little bit

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-17 19:20:57 +03:00
parent aae8ccfd57
commit b2b8f1aabb
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+5 -8
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.constants.evaluate package org.jetbrains.kotlin.resolve.constants.evaluate
import com.google.common.collect.Lists
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.JetNodeTypes
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -33,7 +32,6 @@ import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.checkers.AdditionalTypeChecker import org.jetbrains.kotlin.resolve.calls.checkers.AdditionalTypeChecker
import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
import org.jetbrains.kotlin.resolve.calls.checkers.CompositeChecker import org.jetbrains.kotlin.resolve.calls.checkers.CompositeChecker
import org.jetbrains.kotlin.resolve.calls.context.ContextDependency import org.jetbrains.kotlin.resolve.calls.context.ContextDependency
import org.jetbrains.kotlin.resolve.calls.context.SimpleResolutionContext import org.jetbrains.kotlin.resolve.calls.context.SimpleResolutionContext
@@ -49,6 +47,7 @@ import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.types.checker.JetTypeChecker
import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.types.expressions.OperatorConventions
import java.math.BigInteger import java.math.BigInteger
import java.util.ArrayList
import java.util.HashMap import java.util.HashMap
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
@@ -141,9 +140,7 @@ public class ConstantExpressionEvaluator(
return null return null
} }
assert(resolvedCall.getValueArguments().size() == 1, "Array function should have only one vararg parameter") val argumentEntry = resolvedCall.getValueArguments().entrySet().single()
val argumentEntry = resolvedCall.getValueArguments().entrySet().iterator().next()
val elementType = argumentEntry.getKey().getVarargElementType() ?: return null val elementType = argumentEntry.getKey().getVarargElementType() ?: return null
@@ -167,7 +164,7 @@ public class ConstantExpressionEvaluator(
resolvedValueArgument: ResolvedValueArgument, resolvedValueArgument: ResolvedValueArgument,
expectedType: JetType, expectedType: JetType,
trace: BindingTrace): List<CompileTimeConstant<*>> { trace: BindingTrace): List<CompileTimeConstant<*>> {
val constants = Lists.newArrayList<CompileTimeConstant<*>>() val constants = ArrayList<CompileTimeConstant<*>>()
for (argument in resolvedValueArgument.getArguments()) { for (argument in resolvedValueArgument.getArguments()) {
val argumentExpression = argument.getArgumentExpression() ?: continue val argumentExpression = argument.getArgumentExpression() ?: continue
val constant = ConstantExpressionEvaluator.evaluate(argumentExpression, trace, expectedType) val constant = ConstantExpressionEvaluator.evaluate(argumentExpression, trace, expectedType)
@@ -175,9 +172,9 @@ public class ConstantExpressionEvaluator(
val defaultType = constant.getType(expectedType) val defaultType = constant.getType(expectedType)
val context = SimpleResolutionContext(trace, JetScope.Empty, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, val context = SimpleResolutionContext(trace, JetScope.Empty, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY,
ContextDependency.INDEPENDENT, ContextDependency.INDEPENDENT,
CompositeChecker(Lists.newArrayList<CallChecker>()), CompositeChecker(emptyList()),
SymbolUsageValidator.Empty, SymbolUsageValidator.Empty,
AdditionalTypeChecker.Composite(Lists.newArrayList<AdditionalTypeChecker>()), AdditionalTypeChecker.Composite(emptyList()),
StatementFilter.NONE) StatementFilter.NONE)
ArgumentTypeResolver.updateNumberType(defaultType, argumentExpression, context) ArgumentTypeResolver.updateNumberType(defaultType, argumentExpression, context)
} }