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

rename

Browse Source 
ERROR_IDENTIFIER_INFO -> NO_IDENTIFIER_INFO
This commit is contained in:
Svetlana Isakova
2013-06-04 19:28:57 +04:00
parent 2337f4b948
commit 2b0616b1c4
1 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/resolve/calls/autocasts/DataFlowValueFactory.java
+6 -6
View File
@@ -119,7 +119,7 @@ public class DataFlowValueFactory {
} }
} }
private static final IdentifierInfo ERROR_IDENTIFIER_INFO = new IdentifierInfo(null, false, false); private static final IdentifierInfo NO_IDENTIFIER_INFO = new IdentifierInfo(null, false, false);
@NotNull @NotNull
private static IdentifierInfo createInfo(Object id, boolean isStable) { private static IdentifierInfo createInfo(Object id, boolean isStable) {
@@ -134,9 +134,9 @@ public class DataFlowValueFactory {
@NotNull @NotNull
private static IdentifierInfo combineInfo(@Nullable IdentifierInfo receiverInfo, @NotNull IdentifierInfo selectorInfo) { private static IdentifierInfo combineInfo(@Nullable IdentifierInfo receiverInfo, @NotNull IdentifierInfo selectorInfo) {
if (selectorInfo.id == null) { if (selectorInfo.id == null) {
return ERROR_IDENTIFIER_INFO; return NO_IDENTIFIER_INFO;
} }
if (receiverInfo == null || receiverInfo == ERROR_IDENTIFIER_INFO || receiverInfo.isNamespace) { if (receiverInfo == null || receiverInfo == NO_IDENTIFIER_INFO || receiverInfo.isNamespace) {
return selectorInfo; return selectorInfo;
} }
return createInfo(Pair.create(receiverInfo.id, selectorInfo.id), receiverInfo.isStable && selectorInfo.isStable); return createInfo(Pair.create(receiverInfo.id, selectorInfo.id), receiverInfo.isStable && selectorInfo.isStable);
@@ -174,7 +174,7 @@ public class DataFlowValueFactory {
else if (expression instanceof JetRootNamespaceExpression) { else if (expression instanceof JetRootNamespaceExpression) {
return createNamespaceInfo(JetModuleUtil.getRootNamespaceType(expression)); return createNamespaceInfo(JetModuleUtil.getRootNamespaceType(expression));
} }
return ERROR_IDENTIFIER_INFO; return NO_IDENTIFIER_INFO;
} }
@NotNull @NotNull
@@ -201,7 +201,7 @@ public class DataFlowValueFactory {
ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor;
return createInfo(classDescriptor, classDescriptor.isClassObjectAValue()); return createInfo(classDescriptor, classDescriptor.isClassObjectAValue());
} }
return ERROR_IDENTIFIER_INFO; return NO_IDENTIFIER_INFO;
} }
@Nullable @Nullable
@@ -257,7 +257,7 @@ public class DataFlowValueFactory {
if (descriptorOfThisReceiver instanceof ClassDescriptor) { if (descriptorOfThisReceiver instanceof ClassDescriptor) {
return createInfo(((ClassDescriptor) descriptorOfThisReceiver).getThisAsReceiverParameter().getValue(), true); return createInfo(((ClassDescriptor) descriptorOfThisReceiver).getThisAsReceiverParameter().getValue(), true);
} }
return ERROR_IDENTIFIER_INFO; return NO_IDENTIFIER_INFO;
} }
public static boolean isStableVariable(@NotNull VariableDescriptor variableDescriptor) { public static boolean isStableVariable(@NotNull VariableDescriptor variableDescriptor) {