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

Migration to expect/actual: change some comments in compiler

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-15 13:50:21 +03:00
parent fcc84d00c3
commit d3082b0e62
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class BodyResolver {
@NotNull ClassConstructorDescriptor descriptor @NotNull ClassConstructorDescriptor descriptor
) { ) {
if (descriptor.isExpect() || isEffectivelyExternal(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(); return DataFlowInfo.Companion.getEMPTY();
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java
+2 -2
View File
@@ -185,8 +185,8 @@ public class ValueArgumentsToParametersMapper {
if (nameReference != null) { if (nameReference != null) {
if (candidate instanceof MemberDescriptor && ((MemberDescriptor) candidate).isExpect() && if (candidate instanceof MemberDescriptor && ((MemberDescriptor) candidate).isExpect() &&
candidate.getContainingDeclaration() instanceof ClassDescriptor) { candidate.getContainingDeclaration() instanceof ClassDescriptor) {
// We do not allow named arguments for members of header classes until we're able to use both // We do not allow named arguments for members of expected classes until we're able to use both
// headers and platform definitions when compiling platform code // expected and actual definitions when compiling platform code
report(NAMED_ARGUMENTS_NOT_ALLOWED.on(nameReference, EXPECTED_CLASS_MEMBER)); report(NAMED_ARGUMENTS_NOT_ALLOWED.on(nameReference, EXPECTED_CLASS_MEMBER));
} }
else if (!candidate.hasStableParameterNames()) { else if (!candidate.hasStableParameterNames()) {
compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+1 -1
View File
@@ -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() && if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isExpect() &&
module.getCapability(MultiTargetPlatform.CAPABILITY) != MultiTargetPlatform.Common.INSTANCE) return false; module.getCapability(MultiTargetPlatform.CAPABILITY) != MultiTargetPlatform.Common.INSTANCE) return false;