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

Minor, fix some warnings in DeclarationsChecker

Browse Source
This commit is contained in:
Alexander Udalov
2014-10-16 21:12:28 +04:00
parent c071ac854e
commit 91105b8183
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
-1
View File
@@ -310,7 +310,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
controlFlowAnalyzer.setTrace(bindingTrace); controlFlowAnalyzer.setTrace(bindingTrace);
declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider);
declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setDescriptorResolver(descriptorResolver);
declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setModifiersChecker(modifiersChecker);
declarationsChecker.setTrace(bindingTrace); declarationsChecker.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
-1
View File
@@ -186,7 +186,6 @@ public class InjectorForBodyResolve {
controlFlowAnalyzer.setTrace(bindingTrace); controlFlowAnalyzer.setTrace(bindingTrace);
declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider);
declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setDescriptorResolver(descriptorResolver);
declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setModifiersChecker(modifiersChecker);
declarationsChecker.setTrace(bindingTrace); declarationsChecker.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
-1
View File
@@ -235,7 +235,6 @@ public class InjectorForTopDownAnalyzerBasic {
controlFlowAnalyzer.setTrace(bindingTrace); controlFlowAnalyzer.setTrace(bindingTrace);
declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider);
declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setDescriptorResolver(descriptorResolver);
declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setModifiersChecker(modifiersChecker);
declarationsChecker.setTrace(bindingTrace); declarationsChecker.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+4 -17
View File
@@ -24,7 +24,10 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.SubstitutionUtils;
import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lexer.JetModifierKeywordToken; import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
@@ -39,16 +42,10 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstrac
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveOpenMembers; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveOpenMembers;
public class DeclarationsChecker { public class DeclarationsChecker {
@NotNull
private BindingTrace trace; private BindingTrace trace;
@NotNull
private ModifiersChecker modifiersChecker; private ModifiersChecker modifiersChecker;
@NotNull
private DescriptorResolver descriptorResolver; private DescriptorResolver descriptorResolver;
@NotNull
private AdditionalCheckerProvider additionalCheckerProvider;
@Inject @Inject
public void setTrace(@NotNull BindingTrace trace) { public void setTrace(@NotNull BindingTrace trace) {
this.trace = trace; this.trace = trace;
@@ -59,11 +56,6 @@ public class DeclarationsChecker {
this.descriptorResolver = descriptorResolver; this.descriptorResolver = descriptorResolver;
} }
@Inject
public void setAdditionalCheckerProvider(@NotNull AdditionalCheckerProvider additionalCheckerProvider) {
this.additionalCheckerProvider = additionalCheckerProvider;
}
@Inject @Inject
public void setModifiersChecker(@NotNull ModifiersChecker modifiersChecker) { public void setModifiersChecker(@NotNull ModifiersChecker modifiersChecker) {
this.modifiersChecker = modifiersChecker; this.modifiersChecker = modifiersChecker;
@@ -401,11 +393,6 @@ public class DeclarationsChecker {
} }
if (propertyDescriptor.getModality() == Modality.ABSTRACT) { if (propertyDescriptor.getModality() == Modality.ABSTRACT) {
JetType returnType = propertyDescriptor.getReturnType();
if (returnType instanceof DeferredType) {
returnType = ((DeferredType) returnType).getDelegate();
}
JetExpression initializer = property.getInitializer(); JetExpression initializer = property.getInitializer();
if (initializer != null) { if (initializer != null) {
trace.report(ABSTRACT_PROPERTY_WITH_INITIALIZER.on(initializer)); trace.report(ABSTRACT_PROPERTY_WITH_INITIALIZER.on(initializer));
js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
-1
View File
@@ -234,7 +234,6 @@ public class InjectorForTopDownAnalyzerForJs {
controlFlowAnalyzer.setTrace(bindingTrace); controlFlowAnalyzer.setTrace(bindingTrace);
declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider);
declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setDescriptorResolver(descriptorResolver);
declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setModifiersChecker(modifiersChecker);
declarationsChecker.setTrace(bindingTrace); declarationsChecker.setTrace(bindingTrace);