Get rid of static function ConstantExpressionEvaluator.evaluateToConstant

This commit is contained in:
Pavel V. Talanov
2015-07-23 17:13:50 +03:00
parent 6698b3b070
commit 99e8ba1947
5 changed files with 21 additions and 19 deletions
@@ -66,8 +66,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip
private fun evaluateInitializer(context: BindingContext, property: VariableDescriptor): CompileTimeConstant<*>? {
val propertyDeclaration = DescriptorToSourceUtils.descriptorToDeclaration(property) as JetProperty
val builtIns = KotlinBuiltIns.getInstance()
val compileTimeConstant = ConstantExpressionEvaluator(ConstantValueFactory(builtIns), builtIns).evaluateExpression(
val compileTimeConstant = ConstantExpressionEvaluator(KotlinBuiltIns.getInstance()).evaluateExpression(
propertyDeclaration.getInitializer()!!,
DelegatingBindingTrace(context, "trace for evaluating compile time constant"),
property.getType()