From 64512ae87ba59f9919c305fac81fd79ab850be27 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 6 Jul 2014 17:04:54 +0400 Subject: [PATCH] Move writable scope implementations to 'frontend' --- .../jet/lang/resolve/scopes/ClassObjectMixinScope.java | 0 .../jet/lang/resolve/scopes/RedeclarationHandler.java | 0 .../org/jetbrains/jet/lang/resolve/scopes/WritableScope.java | 4 ++-- .../jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java | 0 .../jet/lang/resolve/scopes/WritableScopeWithImports.java | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java (100%) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java (100%) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java (94%) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java (100%) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java (100%) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java similarity index 100% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java similarity index 100% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java index bddf4f15b0d..24f0f1eba61 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.scopes; import com.google.common.collect.Multimap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.name.Name; @@ -51,7 +50,8 @@ public interface WritableScope extends JetScope { void addVariableAlias(@NotNull Name name, @NotNull VariableDescriptor variableDescriptor); - @NotNull Multimap getDeclaredDescriptorsAccessibleBySimpleName(); + @NotNull + Multimap getDeclaredDescriptorsAccessibleBySimpleName(); void importScope(@NotNull JetScope imported); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java similarity index 100% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java similarity index 100% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java