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

Refactoring: introduce variables for property scope

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-05-14 13:24:15 +04:00
parent 389563dd18
commit de446a83f9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+6 -5
View File
@@ -382,17 +382,18 @@ public class BodyResolver {
computeDeferredType(propertyDescriptor.getReturnType()); computeDeferredType(propertyDescriptor.getReturnType());
JetExpression initializer = property.getInitializer(); JetExpression initializer = property.getInitializer();
JetScope propertyScope = getScopeForProperty(property);
if (initializer != null) { if (initializer != null) {
ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor(); ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
if (primaryConstructor != null) { if (primaryConstructor != null) {
resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property)); resolvePropertyInitializer(property, propertyDescriptor, initializer, propertyScope);
} }
} }
JetExpression delegateExpression = property.getDelegateExpression(); JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) { if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText(); assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution(), getScopeForProperty(property)); resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution(), propertyScope);
} }
resolvePropertyAccessors(property, propertyDescriptor); resolvePropertyAccessors(property, propertyDescriptor);
@@ -411,15 +412,15 @@ public class BodyResolver {
computeDeferredType(propertyDescriptor.getReturnType()); computeDeferredType(propertyDescriptor.getReturnType());
JetExpression initializer = property.getInitializer(); JetExpression initializer = property.getInitializer();
JetScope propertyScope = getScopeForProperty(property);
if (initializer != null) { if (initializer != null) {
resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property)); resolvePropertyInitializer(property, propertyDescriptor, initializer, propertyScope);
} }
JetExpression delegateExpression = property.getDelegateExpression(); JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) { if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText(); assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
JetScope scope = context.getDeclaringScopes().apply(property); resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, propertyScope, propertyScope);
resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, scope, getScopeForProperty(property));
} }
resolvePropertyAccessors(property, propertyDescriptor); resolvePropertyAccessors(property, propertyDescriptor);