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

INTERNAL_VISIBILITIES constant renamed to INVISIBLE_FROM_OTHER_MODULES in order not be confused with INTERNAL visibility.

Browse Source 
The only usage in DataFlowValueFactory renamed accordingly.
This commit is contained in:
Pavel V. Talanov
2012-08-28 20:10:34 +04:00
parent ae348a0547
commit 76e407e168
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class Visibilities {
} }
}; };
public static final Set<Visibility> INTERNAL_VISIBILITIES = Sets.newHashSet(PRIVATE, INTERNAL, LOCAL); public static final Set<Visibility> INVISIBLE_FROM_OTHER_MODULES = Sets.newHashSet(PRIVATE, INTERNAL, LOCAL);
private Visibilities() { private Visibilities() {
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
+5 -5
View File
@@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.JetModuleUtil; import org.jetbrains.jet.lang.resolve.JetModuleUtil;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiverDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiverDescriptor;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
@@ -120,7 +120,7 @@ public class DataFlowValueFactory {
if (variableDescriptor.isVar()) return false; if (variableDescriptor.isVar()) return false;
if (variableDescriptor instanceof PropertyDescriptor) { if (variableDescriptor instanceof PropertyDescriptor) {
PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor; PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor;
if (!isInternal(propertyDescriptor)) return false; if (!invisibleFromOtherModules(propertyDescriptor)) return false;
if (!isFinal(propertyDescriptor)) return false; if (!isFinal(propertyDescriptor)) return false;
if (!hasDefaultGetter(propertyDescriptor)) return false; if (!hasDefaultGetter(propertyDescriptor)) return false;
} }
@@ -141,15 +141,15 @@ public class DataFlowValueFactory {
return true; return true;
} }
private static boolean isInternal(@NotNull DeclarationDescriptorWithVisibility descriptor) { private static boolean invisibleFromOtherModules(@NotNull DeclarationDescriptorWithVisibility descriptor) {
if (Visibilities.INTERNAL_VISIBILITIES.contains(descriptor.getVisibility())) return true; if (Visibilities.INVISIBLE_FROM_OTHER_MODULES.contains(descriptor.getVisibility())) return true;
DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
if (!(containingDeclaration instanceof DeclarationDescriptorWithVisibility)) { if (!(containingDeclaration instanceof DeclarationDescriptorWithVisibility)) {
return false; return false;
} }
return isInternal((DeclarationDescriptorWithVisibility) containingDeclaration); return invisibleFromOtherModules((DeclarationDescriptorWithVisibility) containingDeclaration);
} }
private static boolean hasDefaultGetter(PropertyDescriptor propertyDescriptor) { private static boolean hasDefaultGetter(PropertyDescriptor propertyDescriptor) {