From 1fb0dc2d92d2ae04279abb461829f71d667cb6ea Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 29 Sep 2014 15:29:47 +0400 Subject: [PATCH] LTDA: Refactoring - extract processClassOrObject method from TDA --- .../jet/lang/resolve/TopDownAnalyzer.java | 72 +------------ .../ClosureExpressionsTypingVisitor.java | 11 +- .../ExpressionTypingVisitorForStatements.java | 4 +- .../expressions/LocalClassifierAnalyzer.java | 102 ++++++++++++++++++ 4 files changed, 113 insertions(+), 76 deletions(-) create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 4ce60e19110..c8970e6a9a5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.lang.resolve; -import com.google.common.base.Predicates; import com.google.common.collect.Sets; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; @@ -24,16 +23,14 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.di.InjectorForTopDownAnalyzerBasic; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.impl.*; -import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; import javax.inject.Inject; import java.util.*; @@ -173,69 +170,6 @@ public class TopDownAnalyzer { } } - public static void processClassOrObject( - @NotNull GlobalContext globalContext, - @Nullable final WritableScope scope, - @NotNull ExpressionTypingContext context, - @NotNull final DeclarationDescriptor containingDeclaration, - @NotNull JetClassOrObject object, - @NotNull AdditionalCheckerProvider additionalCheckerProvider - ) { - TopDownAnalysisParameters topDownAnalysisParameters = - TopDownAnalysisParameters.createForLocalDeclarations( - globalContext.getStorageManager(), - globalContext.getExceptionTracker(), - Predicates.equalTo(object.getContainingFile()) - ); - - InjectorForTopDownAnalyzerBasic injector = new InjectorForTopDownAnalyzerBasic( - object.getProject(), - topDownAnalysisParameters, - context.trace, - DescriptorUtils.getContainingModule(containingDeclaration), - additionalCheckerProvider - ); - - TopDownAnalysisContext c = new TopDownAnalysisContext(topDownAnalysisParameters); - c.setOuterDataFlowInfo(context.dataFlowInfo); - - injector.getTopDownAnalyzer().doProcess( - c, - context.scope, - new PackageLikeBuilder() { - - @NotNull - @Override - public DeclarationDescriptor getOwnerForChildren() { - return containingDeclaration; - } - - @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { - if (scope != null) { - scope.addClassifierDescriptor(classDescriptor); - } - } - - @Override - public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { - throw new UnsupportedOperationException(); - } - - @Override - public void addPropertyDescriptor(@NotNull PropertyDescriptor propertyDescriptor) { - - } - - @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { - return ClassObjectStatus.NOT_ALLOWED; - } - }, - Collections.singletonList(object) - ); - } - @NotNull public TopDownAnalysisContext analyzeFiles( @NotNull TopDownAnalysisParameters topDownAnalysisParameters, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index a18095ff5a9..7a8f1f64961 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -85,11 +85,12 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { }; ObservableBindingTrace traceAdapter = new ObservableBindingTrace(temporaryTrace); traceAdapter.addHandler(CLASS, handler); - TopDownAnalyzer.processClassOrObject(components.globalContext, - null, // don't need to add classifier of object literal to any scope - context.replaceBindingTrace(traceAdapter).replaceContextDependency(INDEPENDENT), - context.scope.getContainingDeclaration(), - expression.getObjectDeclaration(), components.additionalCheckerProvider); + LocalClassifierAnalyzer.processClassOrObject(components.globalContext, + null, // don't need to add classifier of object literal to any scope + context.replaceBindingTrace(traceAdapter).replaceContextDependency(INDEPENDENT), + context.scope.getContainingDeclaration(), + expression.getObjectDeclaration(), + components.additionalCheckerProvider); DelegatingBindingTrace cloneDelta = new DelegatingBindingTrace( new BindingTraceContext().getBindingContext(), "cached delta trace for object literal expression resolve", expression); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java index 06ccaf4ba8b..9d40483cb1a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java @@ -84,7 +84,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito @Override public JetTypeInfo visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, ExpressionTypingContext context) { - TopDownAnalyzer.processClassOrObject( + LocalClassifierAnalyzer.processClassOrObject( components.globalContext, scope, context.replaceScope(scope).replaceContextDependency(INDEPENDENT), scope.getContainingDeclaration(), declaration, components.additionalCheckerProvider); @@ -181,7 +181,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito @Override public JetTypeInfo visitClass(@NotNull JetClass klass, ExpressionTypingContext context) { - TopDownAnalyzer.processClassOrObject( + LocalClassifierAnalyzer.processClassOrObject( components.globalContext, scope, context.replaceScope(scope).replaceContextDependency(INDEPENDENT), scope.getContainingDeclaration(), klass, components.additionalCheckerProvider); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java new file mode 100644 index 00000000000..0dccbfa443d --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java @@ -0,0 +1,102 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.lang.types.expressions; + +import com.google.common.base.Predicates; +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.jet.di.InjectorForTopDownAnalyzerBasic; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; +import org.jetbrains.jet.lang.psi.JetClassOrObject; +import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext; +import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.jet.lang.resolve.scopes.WritableScope; + +import java.util.Collections; + +/* package */ class LocalClassifierAnalyzer { + public static void processClassOrObject( + @NotNull GlobalContext globalContext, + @Nullable final WritableScope scope, + @NotNull ExpressionTypingContext context, + @NotNull final DeclarationDescriptor containingDeclaration, + @NotNull JetClassOrObject object, + @NotNull AdditionalCheckerProvider additionalCheckerProvider + ) { + TopDownAnalysisParameters topDownAnalysisParameters = + TopDownAnalysisParameters.createForLocalDeclarations( + globalContext.getStorageManager(), + globalContext.getExceptionTracker(), + Predicates.equalTo(object.getContainingFile()) + ); + + InjectorForTopDownAnalyzerBasic injector = new InjectorForTopDownAnalyzerBasic( + object.getProject(), + topDownAnalysisParameters, + context.trace, + DescriptorUtils.getContainingModule(containingDeclaration), + additionalCheckerProvider + ); + + TopDownAnalysisContext c = new TopDownAnalysisContext(topDownAnalysisParameters); + c.setOuterDataFlowInfo(context.dataFlowInfo); + + injector.getTopDownAnalyzer().doProcess( + c, + context.scope, + new PackageLikeBuilder() { + + @NotNull + @Override + public DeclarationDescriptor getOwnerForChildren() { + return containingDeclaration; + } + + @Override + public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + if (scope != null) { + scope.addClassifierDescriptor(classDescriptor); + } + } + + @Override + public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { + throw new UnsupportedOperationException(); + } + + @Override + public void addPropertyDescriptor(@NotNull PropertyDescriptor propertyDescriptor) { + + } + + @Override + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + return null; + } + }, + Collections.singletonList(object) + ); + } +}