NamespaceLikeBuilder → PackageLikeBuilder.

compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java

@@ -45,7 +45,7 @@ import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
-import org.jetbrains.jet.lang.descriptors.impl.NamespaceLikeBuilderDummy;
+import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilderDummy;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.psi.JetScript;
@@ -300,7 +300,7 @@ public class ReplInterpreter {
 
         // dummy builder is used because "root" is module descriptor,
         // namespaces added to module explicitly in
-        injector.getTopDownAnalyzer().doProcess(scope, new NamespaceLikeBuilderDummy(), Collections.singletonList(psiFile));
+        injector.getTopDownAnalyzer().doProcess(scope, new PackageLikeBuilderDummy(), Collections.singletonList(psiFile));
 
         boolean hasErrors = AnalyzerWithCompilerReport.reportDiagnostics(trace.getBindingContext(), messageCollector);
         if (hasErrors) {

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java

@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptorLite;
 import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor;
-import org.jetbrains.jet.lang.descriptors.impl.NamespaceLikeBuilder;
+import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -164,9 +164,9 @@ public class DeclarationResolver {
         for (Map.Entry<JetFile, WritableScope> entry : context.getNamespaceScopes().entrySet()) {
             JetFile namespace = entry.getKey();
             WritableScope namespaceScope = entry.getValue();
-            NamespaceLikeBuilder namespaceDescriptor = context.getPackageFragments().get(namespace).getBuilder();
+            PackageLikeBuilder packageBuilder = context.getPackageFragments().get(namespace).getBuilder();
 
-            resolveFunctionAndPropertyHeaders(namespace.getDeclarations(), namespaceScope, namespaceScope, namespaceScope, namespaceDescriptor);
+            resolveFunctionAndPropertyHeaders(namespace.getDeclarations(), namespaceScope, namespaceScope, namespaceScope, packageBuilder);
         }
         for (Map.Entry<JetClassOrObject, MutableClassDescriptor> entry : context.getClasses().entrySet()) {
             JetClassOrObject classOrObject = entry.getKey();
@@ -193,20 +193,20 @@ public class DeclarationResolver {
             @NotNull final JetScope scopeForFunctions,
             @NotNull final JetScope scopeForPropertyInitializers,
             @NotNull final JetScope scopeForPropertyAccessors,
-            @NotNull final NamespaceLikeBuilder namespaceLike)
+            @NotNull final PackageLikeBuilder packageLike)
     {
         for (JetDeclaration declaration : declarations) {
             declaration.accept(new JetVisitorVoid() {
                 @Override
                 public void visitNamedFunction(@NotNull JetNamedFunction function) {
                     SimpleFunctionDescriptor functionDescriptor = descriptorResolver.resolveFunctionDescriptor(
-                            namespaceLike.getOwnerForChildren(),
+                            packageLike.getOwnerForChildren(),
                             scopeForFunctions,
                             function,
                             trace,
                             context.getOuterDataFlowInfo()
                     );
-                    namespaceLike.addFunctionDescriptor(functionDescriptor);
+                    packageLike.addFunctionDescriptor(functionDescriptor);
                     context.getFunctions().put(function, functionDescriptor);
                     context.registerDeclaringScope(function, scopeForFunctions);
                 }
@@ -214,12 +214,12 @@ public class DeclarationResolver {
                 @Override
                 public void visitProperty(@NotNull JetProperty property) {
                     PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor(
-                            namespaceLike.getOwnerForChildren(),
+                            packageLike.getOwnerForChildren(),
                             scopeForPropertyInitializers,
                             property,
                             trace,
                             context.getOuterDataFlowInfo());
-                    namespaceLike.addPropertyDescriptor(propertyDescriptor);
+                    packageLike.addPropertyDescriptor(propertyDescriptor);
                     context.getProperties().put(property, propertyDescriptor);
                     context.registerDeclaringScope(property, scopeForPropertyInitializers);
                     JetPropertyAccessor getter = property.getGetter();

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java

@@ -117,7 +117,7 @@ public class TopDownAnalyzer {
 
     public void doProcess(
             JetScope outerScope,
-            NamespaceLikeBuilder owner,
+            PackageLikeBuilder owner,
             Collection<? extends PsiElement> declarations) {
 //        context.enableDebugOutput();
         context.debug("Enter");
@@ -175,7 +175,7 @@ public class TopDownAnalyzer {
 
         injector.getTopDownAnalysisContext().setOuterDataFlowInfo(context.dataFlowInfo);
 
-        injector.getTopDownAnalyzer().doProcess(context.scope, new NamespaceLikeBuilder() {
+        injector.getTopDownAnalyzer().doProcess(context.scope, new PackageLikeBuilder() {
 
             @NotNull
             @Override
@@ -220,7 +220,7 @@ public class TopDownAnalyzer {
 
         // dummy builder is used because "root" is module descriptor,
         // namespaces added to module explicitly in
-        doProcess(rootPackage.getMemberScope(), new NamespaceLikeBuilderDummy(), files);
+        doProcess(rootPackage.getMemberScope(), new PackageLikeBuilderDummy(), files);
     }
 
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java

@@ -90,7 +90,7 @@ public class TypeHierarchyResolver {
     }
 
     public void process(
-            @NotNull JetScope outerScope, @NotNull NamespaceLikeBuilder owner,
+            @NotNull JetScope outerScope, @NotNull PackageLikeBuilder owner,
             @NotNull Collection<? extends PsiElement> declarations
     ) {
 
@@ -148,7 +148,7 @@ public class TypeHierarchyResolver {
     @NotNull
     private Collection<JetDeclarationContainer> collectNamespacesAndClassifiers(
             @NotNull JetScope outerScope,
-            @NotNull NamespaceLikeBuilder owner,
+            @NotNull PackageLikeBuilder owner,
             @NotNull Iterable<? extends PsiElement> declarations
     ) {
         Collection<JetDeclarationContainer> forDeferredResolve = new ArrayList<JetDeclarationContainer>();
@@ -442,11 +442,11 @@ public class TypeHierarchyResolver {
 
     private class ClassifierCollector extends JetVisitorVoid {
         private final JetScope outerScope;
-        private final NamespaceLikeBuilder owner;
+        private final PackageLikeBuilder owner;
         private final Collection<JetDeclarationContainer> forDeferredResolve;
 
         public ClassifierCollector(@NotNull JetScope outerScope,
-                @NotNull NamespaceLikeBuilder owner,
+                @NotNull PackageLikeBuilder owner,
                 @NotNull Collection<JetDeclarationContainer> forDeferredResolve
         ) {
             this.outerScope = outerScope;
@@ -520,9 +520,9 @@ public class TypeHierarchyResolver {
             MutableClassDescriptor classObjectDescriptor =
                     createClassDescriptorForSingleton(objectDeclaration, getClassObjectName(container.getName()), ClassKind.CLASS_OBJECT);
 
-            NamespaceLikeBuilder.ClassObjectStatus status =
+            PackageLikeBuilder.ClassObjectStatus status =
                     isEnumEntry(container) || isObject(container) ?
-                    NamespaceLikeBuilder.ClassObjectStatus.NOT_ALLOWED :
+                    PackageLikeBuilder.ClassObjectStatus.NOT_ALLOWED :
                     owner.setClassObjectDescriptor(classObjectDescriptor);
 
             switch (status) {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java

@@ -173,13 +173,13 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite {
         getWritableScopeForInitializers().changeLockLevel(WritableScope.LockLevel.READING);
     }
 
-    private NamespaceLikeBuilder builder = null;
+    private PackageLikeBuilder builder = null;
 
     @Override
-    public NamespaceLikeBuilder getBuilder() {
+    public PackageLikeBuilder getBuilder() {
         if (builder == null) {
-            final NamespaceLikeBuilder superBuilder = super.getBuilder();
+            final PackageLikeBuilder superBuilder = super.getBuilder();
-            builder = new NamespaceLikeBuilderDummy() {
+            builder = new PackageLikeBuilderDummy() {
                 @NotNull
                 @Override
                 public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java

@@ -189,10 +189,10 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
         this.annotations = annotations;
     }
 
-    private NamespaceLikeBuilder builder = null;
+    private PackageLikeBuilder builder = null;
-    public NamespaceLikeBuilder getBuilder() {
+    public PackageLikeBuilder getBuilder() {
         if (builder == null) {
-            builder = new NamespaceLikeBuilderDummy() {
+            builder = new PackageLikeBuilderDummy() {
                 @NotNull
                 @Override
                 public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java

@@ -35,7 +35,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
     private final ModuleDescriptor module;
     private final FqName fqName;
     private final WritableScope scope;
-    private final NamespaceLikeBuilder builder;
+    private final PackageLikeBuilder builder;
 
     public MutablePackageFragmentDescriptor(
             @NotNull PackageFragmentProvider provider,
@@ -49,7 +49,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
 
         scope = new WritableScopeImpl(JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Members of " + fqName + " in " + module);
         scope.changeLockLevel(WritableScope.LockLevel.BOTH);
-        builder = new ScopeBasedNamespaceLikeBuilder(this, scope);
+        builder = new ScopeBasedPackageLikeBuilder(this, scope);
     }
 
     @NotNull
@@ -88,7 +88,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
     }
 
     @NotNull
-    public NamespaceLikeBuilder getBuilder() {
+    public PackageLikeBuilder getBuilder() {
         return builder;
     }
 }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilder.java

@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 
-public interface NamespaceLikeBuilder {
+public interface PackageLikeBuilder {
 
     @NotNull
     DeclarationDescriptor getOwnerForChildren();

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilderDummy.java

@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 
-public class NamespaceLikeBuilderDummy implements NamespaceLikeBuilder {
+public class PackageLikeBuilderDummy implements PackageLikeBuilder {
     @NotNull
     @Override
     public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScopeBasedPackageLikeBuilder.java

@@ -22,11 +22,11 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 
-public class ScopeBasedNamespaceLikeBuilder implements NamespaceLikeBuilder {
+public class ScopeBasedPackageLikeBuilder implements PackageLikeBuilder {
     private final DeclarationDescriptor containingDeclaration;
     private final WritableScope scope;
 
-    ScopeBasedNamespaceLikeBuilder(
+    ScopeBasedPackageLikeBuilder(
             @NotNull DeclarationDescriptor containingDeclaration,
             @NotNull WritableScope scope
     ) {