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

Minor. Rename field and clarify how it differs from similar one

Browse Source
This commit is contained in:
Denis Zharkov
2016-05-13 21:06:35 +03:00
parent ef940ab0df
commit 308ee93392
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+8 -5
View File
@@ -43,7 +43,10 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private boolean isExternal = false; private boolean isExternal = false;
private boolean isInline = false; private boolean isInline = false;
private boolean isTailrec = false; private boolean isTailrec = false;
private boolean isHidden = false; // Difference between these hidden kinds:
// 1. isHiddenToOvercomeSignatureClash prohibit calling such functions even in super-call context
// 2. isHiddenForResolutionEverywhereBesideSupercalls propagates to it's overrides descriptors while isHiddenToOvercomeSignatureClash does not
private boolean isHiddenToOvercomeSignatureClash = false;
private boolean isHiddenForResolutionEverywhereBesideSupercalls = false; private boolean isHiddenForResolutionEverywhereBesideSupercalls = false;
private boolean hasStableParameterNames = true; private boolean hasStableParameterNames = true;
private boolean hasSynthesizedParameterNames = false; private boolean hasSynthesizedParameterNames = false;
@@ -128,8 +131,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
this.isTailrec = isTailrec; this.isTailrec = isTailrec;
} }
public void setHidden(boolean hidden) { public void setHiddenToOvercomeSignatureClash(boolean hiddenToOvercomeSignatureClash) {
isHidden = hidden; isHiddenToOvercomeSignatureClash = hiddenToOvercomeSignatureClash;
} }
private void setHiddenForResolutionEverywhereBesideSupercalls(boolean hiddenForResolutionEverywhereBesideSupercalls) { private void setHiddenForResolutionEverywhereBesideSupercalls(boolean hiddenForResolutionEverywhereBesideSupercalls) {
@@ -234,7 +237,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
@Override @Override
public boolean isHiddenToOvercomeSignatureClash() { public boolean isHiddenToOvercomeSignatureClash() {
return isHidden; return isHiddenToOvercomeSignatureClash;
} }
@Override @Override
@@ -598,7 +601,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
substitutedDescriptor.setTailrec(isTailrec); substitutedDescriptor.setTailrec(isTailrec);
substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames); substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames);
substitutedDescriptor.setHasSynthesizedParameterNames(hasSynthesizedParameterNames); substitutedDescriptor.setHasSynthesizedParameterNames(hasSynthesizedParameterNames);
substitutedDescriptor.setHidden(configuration.isHiddenToOvercomeSignatureClash); substitutedDescriptor.setHiddenToOvercomeSignatureClash(configuration.isHiddenToOvercomeSignatureClash);
substitutedDescriptor.setHiddenForResolutionEverywhereBesideSupercalls(configuration.isHiddenForResolutionEverywhereBesideSupercalls); substitutedDescriptor.setHiddenForResolutionEverywhereBesideSupercalls(configuration.isHiddenForResolutionEverywhereBesideSupercalls);
if (configuration.signatureChange || getInitialSignatureDescriptor() != null) { if (configuration.signatureChange || getInitialSignatureDescriptor() != null) {