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

Minor. Rename resolveValueArguments -> resolveAnnotationValueArguments

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-19 13:30:30 +03:00
parent bafb6cc2f7
commit 4a3ac474ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+2 -2
View File
@@ -86,7 +86,7 @@ public class ConstantExpressionEvaluator(
val varargElementType = parameterDescriptor.getVarargElementType() val varargElementType = parameterDescriptor.getVarargElementType()
val argumentsAsVararg = varargElementType != null && !hasSpread(resolvedArgument) val argumentsAsVararg = varargElementType != null && !hasSpread(resolvedArgument)
val constantType = if (argumentsAsVararg) varargElementType else parameterDescriptor.getType() 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) } val constants = compileTimeConstants.map { it.toConstantValue(constantType) }
if (argumentsAsVararg) { if (argumentsAsVararg) {
@@ -168,7 +168,7 @@ public class ConstantExpressionEvaluator(
return arguments.size() == 1 && arguments.get(0).getSpreadElement() != null return arguments.size() == 1 && arguments.get(0).getSpreadElement() != null
} }
private fun resolveValueArguments( private fun resolveAnnotationValueArguments(
resolvedValueArgument: ResolvedValueArgument, resolvedValueArgument: ResolvedValueArgument,
expectedType: JetType, expectedType: JetType,
trace: BindingTrace): List<CompileTimeConstant<*>> { trace: BindingTrace): List<CompileTimeConstant<*>> {