From d3082b0e620c9c1310ab7ca74d90adb68abe8d07 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 15 Sep 2017 13:50:21 +0300 Subject: [PATCH] Migration to expect/actual: change some comments in compiler --- .../src/org/jetbrains/kotlin/resolve/BodyResolver.java | 2 +- .../resolve/calls/ValueArgumentsToParametersMapper.java | 4 ++-- .../kotlin/test/util/RecursiveDescriptorComparator.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 5bd9ec9fdd9..302c2e8c239 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -167,7 +167,7 @@ public class BodyResolver { @NotNull ClassConstructorDescriptor descriptor ) { if (descriptor.isExpect() || isEffectivelyExternal(descriptor)) { - // For header and external classes, we do not resolve constructor delegation calls because they are prohibited + // For expected and external classes, we do not resolve constructor delegation calls because they are prohibited return DataFlowInfo.Companion.getEMPTY(); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java index 2338eef9dd6..1e479d4de95 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java @@ -185,8 +185,8 @@ public class ValueArgumentsToParametersMapper { if (nameReference != null) { if (candidate instanceof MemberDescriptor && ((MemberDescriptor) candidate).isExpect() && candidate.getContainingDeclaration() instanceof ClassDescriptor) { - // We do not allow named arguments for members of header classes until we're able to use both - // headers and platform definitions when compiling platform code + // We do not allow named arguments for members of expected classes until we're able to use both + // expected and actual definitions when compiling platform code report(NAMED_ARGUMENTS_NOT_ALLOWED.on(nameReference, EXPECTED_CLASS_MEMBER)); } else if (!candidate.hasStableParameterNames()) { diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index 04f3cba3ab2..11bac2ba230 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -194,7 +194,7 @@ public class RecursiveDescriptorComparator { } } - // 'header' declarations do not belong to the platform-specific module, even though they participate in the analysis + // 'expected' declarations do not belong to the platform-specific module, even though they participate in the analysis if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isExpect() && module.getCapability(MultiTargetPlatform.CAPABILITY) != MultiTargetPlatform.Common.INSTANCE) return false;