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

removed 'allowNamespaces' flag

Browse Source 
from creating IdentifierInfo
This commit is contained in:
Svetlana Isakova
2013-05-31 16:04:32 +04:00
parent 42b34586bd
commit 61f50fc832
1 changed files with 11 additions and 13 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
+11 -13
View File
@@ -45,7 +45,7 @@ public class DataFlowValueFactory {
if (constantExpression.getNode().getElementType() == JetNodeTypes.NULL) return DataFlowValue.NULL; if (constantExpression.getNode().getElementType() == JetNodeTypes.NULL) return DataFlowValue.NULL;
} }
if (TypeUtils.equalTypes(type, KotlinBuiltIns.getInstance().getNullableNothingType())) return DataFlowValue.NULL; // 'null' is the only inhabitant of 'Nothing?' if (TypeUtils.equalTypes(type, KotlinBuiltIns.getInstance().getNullableNothingType())) return DataFlowValue.NULL; // 'null' is the only inhabitant of 'Nothing?'
IdentifierInfo result = getIdForStableIdentifier(expression, bindingContext, false); IdentifierInfo result = getIdForStableIdentifier(expression, bindingContext);
return new DataFlowValue(result.id == null ? expression : result.id, type, result.isStable, getImmanentNullability(type)); return new DataFlowValue(result.id == null ? expression : result.id, type, result.isStable, getImmanentNullability(type));
} }
@@ -127,8 +127,8 @@ public class DataFlowValueFactory {
} }
@NotNull @NotNull
private static IdentifierInfo createNamespaceInfo(Object id, boolean isStable) { private static IdentifierInfo createNamespaceInfo(Object id) {
return new IdentifierInfo(id, isStable, true); return new IdentifierInfo(id, true, true);
} }
@NotNull @NotNull
@@ -142,26 +142,25 @@ public class DataFlowValueFactory {
@NotNull @NotNull
private static IdentifierInfo getIdForStableIdentifier( private static IdentifierInfo getIdForStableIdentifier(
@Nullable JetExpression expression, @Nullable JetExpression expression,
@NotNull BindingContext bindingContext, @NotNull BindingContext bindingContext
boolean allowNamespaces
) { ) {
if (expression instanceof JetParenthesizedExpression) { if (expression instanceof JetParenthesizedExpression) {
JetParenthesizedExpression parenthesizedExpression = (JetParenthesizedExpression) expression; JetParenthesizedExpression parenthesizedExpression = (JetParenthesizedExpression) expression;
JetExpression innerExpression = parenthesizedExpression.getExpression(); JetExpression innerExpression = parenthesizedExpression.getExpression();
return getIdForStableIdentifier(innerExpression, bindingContext, allowNamespaces); return getIdForStableIdentifier(innerExpression, bindingContext);
} }
else if (expression instanceof JetQualifiedExpression) { else if (expression instanceof JetQualifiedExpression) {
JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) expression; JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) expression;
JetExpression receiverExpression = qualifiedExpression.getReceiverExpression(); JetExpression receiverExpression = qualifiedExpression.getReceiverExpression();
JetExpression selectorExpression = qualifiedExpression.getSelectorExpression(); JetExpression selectorExpression = qualifiedExpression.getSelectorExpression();
IdentifierInfo receiverId = getIdForStableIdentifier(receiverExpression, bindingContext, true); IdentifierInfo receiverId = getIdForStableIdentifier(receiverExpression, bindingContext);
IdentifierInfo selectorId = getIdForStableIdentifier(selectorExpression, bindingContext, allowNamespaces); IdentifierInfo selectorId = getIdForStableIdentifier(selectorExpression, bindingContext);
return combineInfo(receiverId, selectorId); return combineInfo(receiverId, selectorId);
} }
if (expression instanceof JetSimpleNameExpression) { if (expression instanceof JetSimpleNameExpression) {
return getIdForSimpleNameExpression((JetSimpleNameExpression) expression, bindingContext, allowNamespaces); return getIdForSimpleNameExpression((JetSimpleNameExpression) expression, bindingContext);
} }
else if (expression instanceof JetThisExpression) { else if (expression instanceof JetThisExpression) {
JetThisExpression thisExpression = (JetThisExpression) expression; JetThisExpression thisExpression = (JetThisExpression) expression;
@@ -170,7 +169,7 @@ public class DataFlowValueFactory {
return getIdForThisReceiver(declarationDescriptor); return getIdForThisReceiver(declarationDescriptor);
} }
else if (expression instanceof JetRootNamespaceExpression) { else if (expression instanceof JetRootNamespaceExpression) {
return createNamespaceInfo(JetModuleUtil.getRootNamespaceType(expression), allowNamespaces); return createNamespaceInfo(JetModuleUtil.getRootNamespaceType(expression));
} }
return ERROR_IDENTIFIER_INFO; return ERROR_IDENTIFIER_INFO;
} }
@@ -178,8 +177,7 @@ public class DataFlowValueFactory {
@NotNull @NotNull
private static IdentifierInfo getIdForSimpleNameExpression( private static IdentifierInfo getIdForSimpleNameExpression(
@NotNull JetSimpleNameExpression simpleNameExpression, @NotNull JetSimpleNameExpression simpleNameExpression,
@NotNull BindingContext bindingContext, @NotNull BindingContext bindingContext
boolean allowNamespaces
) { ) {
DeclarationDescriptor declarationDescriptor = bindingContext.get(REFERENCE_TARGET, simpleNameExpression); DeclarationDescriptor declarationDescriptor = bindingContext.get(REFERENCE_TARGET, simpleNameExpression);
if (declarationDescriptor instanceof VariableDescriptor) { if (declarationDescriptor instanceof VariableDescriptor) {
@@ -194,7 +192,7 @@ public class DataFlowValueFactory {
return combineInfo(receiverInfo, createInfo(variableDescriptor, isStableVariable(variableDescriptor))); return combineInfo(receiverInfo, createInfo(variableDescriptor, isStableVariable(variableDescriptor)));
} }
if (declarationDescriptor instanceof NamespaceDescriptor) { if (declarationDescriptor instanceof NamespaceDescriptor) {
return createNamespaceInfo(declarationDescriptor, allowNamespaces); return createNamespaceInfo(declarationDescriptor);
} }
if (declarationDescriptor instanceof ClassDescriptor) { if (declarationDescriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor;