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

Minor, replace some usages of hasDefaultValue -> declaresDefaultValue

Browse Source
This commit is contained in:
Alexander Udalov
2015-08-06 02:58:28 +03:00
parent c13396d92f
commit 8dddce5ac5
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+1 -2
View File
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils.*
import org.jetbrains.kotlin.resolve.DescriptorResolver.* import org.jetbrains.kotlin.resolve.DescriptorResolver.*
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.WritableScope import org.jetbrains.kotlin.resolve.scopes.WritableScope
import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl
import org.jetbrains.kotlin.resolve.source.toSourceElement import org.jetbrains.kotlin.resolve.source.toSourceElement
@@ -192,7 +191,7 @@ class FunctionDescriptorResolver(
// it parameter for lambda // it parameter for lambda
val valueParameterDescriptor = expectedValueParameters.first() val valueParameterDescriptor = expectedValueParameters.first()
val it = ValueParameterDescriptorImpl(functionDescriptor, null, 0, Annotations.EMPTY, Name.identifier("it"), val it = ValueParameterDescriptorImpl(functionDescriptor, null, 0, Annotations.EMPTY, Name.identifier("it"),
valueParameterDescriptor.getType(), valueParameterDescriptor.hasDefaultValue(), valueParameterDescriptor.getType(), valueParameterDescriptor.declaresDefaultValue(),
valueParameterDescriptor.getVarargElementType(), SourceElement.NO_SOURCE) valueParameterDescriptor.getVarargElementType(), SourceElement.NO_SOURCE)
trace.record(BindingContext.AUTO_CREATED_IT, it) trace.record(BindingContext.AUTO_CREATED_IT, it)
return listOf(it) return listOf(it)
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt
+1 -3
View File
@@ -60,9 +60,7 @@ public class ValueParameterResolver(
jetParameter: JetParameter, jetParameter: JetParameter,
context: ExpressionTypingContext context: ExpressionTypingContext
) { ) {
if (!valueParameterDescriptor.hasDefaultValue()) { if (!valueParameterDescriptor.declaresDefaultValue()) return
return
}
val defaultValue = jetParameter.getDefaultValue() ?: return val defaultValue = jetParameter.getDefaultValue() ?: return
expressionTypingServices.getTypeInfo(defaultValue, context.replaceExpectedType(valueParameterDescriptor.getType())) expressionTypingServices.getTypeInfo(defaultValue, context.replaceExpectedType(valueParameterDescriptor.getType()))
if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(context.scope))) { if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(context.scope))) {