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

Minor: small code rearrangement

Browse Source
This commit is contained in:
Nikolay Krasko
2014-08-26 14:16:39 +04:00
parent 10886a8ce3
commit 932bd57cf9
4 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+6 -12
View File
@@ -166,18 +166,12 @@ public interface BindingContext {
if (propertyDescriptor.getModality() == Modality.ABSTRACT) return false;
PropertyGetterDescriptor getter = propertyDescriptor.getGetter();
PropertySetterDescriptor setter = propertyDescriptor.getSetter();
if (getter == null) {
return true;
}
else if (propertyDescriptor.isVar() && setter == null) {
return true;
}
else if (setter != null && !setter.hasBody() && setter.getModality() != Modality.ABSTRACT) {
return true;
}
else if (!getter.hasBody() && getter.getModality() != Modality.ABSTRACT) {
return true;
}
if (getter == null) return true;
if (propertyDescriptor.isVar() && setter == null) return true;
if (setter != null && !setter.hasBody() && setter.getModality() != Modality.ABSTRACT) return true;
if (!getter.hasBody() && getter.getModality() != Modality.ABSTRACT) return true;
return backingFieldRequired;
}
};
compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java
+17 -7
View File
@@ -39,19 +39,29 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.MANY_CLASS_OBJECTS;
import static org.jetbrains.jet.lang.diagnostics.Errors.UNSUPPORTED;
public class LazyTopDownAnalyzer {
@SuppressWarnings("ConstantConditions")
@NotNull
private BindingTrace trace = null;
@SuppressWarnings("ConstantConditions")
@NotNull
private BindingTrace trace;
private DeclarationResolver declarationResolver = null;
@SuppressWarnings("ConstantConditions")
@NotNull
private DeclarationResolver declarationResolver;
private OverrideResolver overrideResolver = null;
@SuppressWarnings("ConstantConditions")
@NotNull
private OverrideResolver overrideResolver;
private OverloadResolver overloadResolver = null;
@SuppressWarnings("ConstantConditions")
@NotNull
private OverloadResolver overloadResolver;
private ModuleDescriptor moduleDescriptor = null;
@SuppressWarnings("ConstantConditions")
@NotNull
private ModuleDescriptor moduleDescriptor;
@NotNull
private BodyResolver bodyResolver;
private BodyResolver bodyResolver = null;
@Inject
public void setTrace(@NotNull BindingTrace trace) {