From 2b0616b1c4633aaecc3a1d749f747574f484bd58 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 4 Jun 2013 19:28:57 +0400 Subject: [PATCH] rename ERROR_IDENTIFIER_INFO -> NO_IDENTIFIER_INFO --- .../calls/autocasts/DataFlowValueFactory.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java index 4b26bddd5bb..d0069211aef 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java @@ -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 private static IdentifierInfo createInfo(Object id, boolean isStable) { @@ -134,9 +134,9 @@ public class DataFlowValueFactory { @NotNull private static IdentifierInfo combineInfo(@Nullable IdentifierInfo receiverInfo, @NotNull IdentifierInfo selectorInfo) { 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 createInfo(Pair.create(receiverInfo.id, selectorInfo.id), receiverInfo.isStable && selectorInfo.isStable); @@ -174,7 +174,7 @@ public class DataFlowValueFactory { else if (expression instanceof JetRootNamespaceExpression) { return createNamespaceInfo(JetModuleUtil.getRootNamespaceType(expression)); } - return ERROR_IDENTIFIER_INFO; + return NO_IDENTIFIER_INFO; } @NotNull @@ -201,7 +201,7 @@ public class DataFlowValueFactory { ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; return createInfo(classDescriptor, classDescriptor.isClassObjectAValue()); } - return ERROR_IDENTIFIER_INFO; + return NO_IDENTIFIER_INFO; } @Nullable @@ -257,7 +257,7 @@ public class DataFlowValueFactory { if (descriptorOfThisReceiver instanceof ClassDescriptor) { return createInfo(((ClassDescriptor) descriptorOfThisReceiver).getThisAsReceiverParameter().getValue(), true); } - return ERROR_IDENTIFIER_INFO; + return NO_IDENTIFIER_INFO; } public static boolean isStableVariable(@NotNull VariableDescriptor variableDescriptor) {