From 8efeb3ac6aa9353eb3f73a2fd8cd4bfb66d6187f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 6 Jul 2014 06:04:34 +0400 Subject: [PATCH] Move script descriptor implementation to frontend --- .../jet/lang/descriptors/impl}/ScriptDescriptorImpl.java | 4 ++-- .../org/jetbrains/jet/lang/resolve/ImportsResolver.java | 1 + .../org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java | 7 +++++-- .../jetbrains/jet/lang/resolve/ScriptHeaderResolver.java | 2 +- .../lazy/descriptors/LazyScriptClassMemberScope.java | 1 + .../jet/lang/resolve/scopes/receivers/ScriptReceiver.java | 0 .../jetbrains/jet/lang/descriptors/ScriptDescriptor.java | 3 +-- 7 files changed, 11 insertions(+), 7 deletions(-) rename {core/descriptors/src/org/jetbrains/jet/lang/descriptors => compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl}/ScriptDescriptorImpl.java (99%) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java (100%) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java rename to compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java index 4a7c6c41ad2..beb6e980fa6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.jet.lang.descriptors.impl; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java index b77df66c3c0..9399c591bdf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java @@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java index a5c79ec869f..fd789d889e1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java @@ -19,10 +19,13 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptorImpl; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; +import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.jet.lang.psi.JetScript; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.data.DataPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index 90b04477248..1eb384e0c2d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptorImpl; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetScript; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java index 115d070e53d..456b297af8f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; +import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java similarity index 100% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java index 2e9f4baced8..7d074739a5b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java @@ -17,12 +17,11 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.impl.ScriptCodeDescriptor; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -public interface ScriptDescriptor extends Annotated, DeclarationDescriptor, DeclarationDescriptorNonRoot { +public interface ScriptDescriptor extends DeclarationDescriptorNonRoot { String LAST_EXPRESSION_VALUE_FIELD_NAME = "rv"; Name NAME = Name.special("