From 4a3ac474cabe9ddc8ebaffdae2c5e01f068d8db4 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Sat, 19 Sep 2015 13:30:30 +0300 Subject: [PATCH] Minor. Rename resolveValueArguments -> resolveAnnotationValueArguments --- .../resolve/constants/evaluate/ConstantExpressionEvaluator.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index 24c1ff57124..0961f190faf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -86,7 +86,7 @@ public class ConstantExpressionEvaluator( val varargElementType = parameterDescriptor.getVarargElementType() val argumentsAsVararg = varargElementType != null && !hasSpread(resolvedArgument) val constantType = if (argumentsAsVararg) varargElementType else parameterDescriptor.getType() - val compileTimeConstants = resolveValueArguments(resolvedArgument, constantType!!, trace) + val compileTimeConstants = resolveAnnotationValueArguments(resolvedArgument, constantType!!, trace) val constants = compileTimeConstants.map { it.toConstantValue(constantType) } if (argumentsAsVararg) { @@ -168,7 +168,7 @@ public class ConstantExpressionEvaluator( return arguments.size() == 1 && arguments.get(0).getSpreadElement() != null } - private fun resolveValueArguments( + private fun resolveAnnotationValueArguments( resolvedValueArgument: ResolvedValueArgument, expectedType: JetType, trace: BindingTrace): List> {