Rename namespace class to {package.name}Package

Conflicts:

	compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java

compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$1$1.kt

@@ -7,5 +7,5 @@ fun foo() {
 }
 
 // METHOD : invoke(I)V
-// VARIABLE : NAME=this TYPE=Lnamespace$foo$1$1; INDEX=0
+// VARIABLE : NAME=this TYPE=L_DefaultPackage$foo$1$1; INDEX=0
 // VARIABLE : NAME=it TYPE=I INDEX=1

compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$1.kt

@@ -0,0 +1,7 @@
+fun foo() {
+    fun bar()  {
+    }
+}
+
+// METHOD : invoke()V
+// VARIABLE : NAME=this TYPE=L_DefaultPackage$foo$1; INDEX=0

compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$a$1.kt

@@ -0,0 +1,8 @@
+fun foo() {
+    var a = {
+
+    }
+}
+
+// METHOD : invoke()V
+// VARIABLE : NAME=this TYPE=L_DefaultPackage$foo$a$1; INDEX=0

compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo1$1.kt

@@ -0,0 +1,9 @@
+fun foo1() {
+    (1..5).forEach {
+        println(it)
+    }
+}
+
+// METHOD : invoke(I)V
+// VARIABLE : NAME=this TYPE=L_DefaultPackage$foo1$1; INDEX=0
+// VARIABLE : NAME=it TYPE=I INDEX=1

compiler/testData/checkLocalVariablesTable/namespace$foo$1.kt

@@ -1,7 +0,0 @@
-fun foo() {
-    fun bar()  {
-    }
-}
-
-// METHOD : invoke()V
-// VARIABLE : NAME=this TYPE=Lnamespace$foo$1; INDEX=0

compiler/testData/checkLocalVariablesTable/namespace$foo$a$1.kt

@@ -1,8 +0,0 @@
-fun foo() {
-    var a = {
-
-    }
-}
-
-// METHOD : invoke()V
-// VARIABLE : NAME=this TYPE=Lnamespace$foo$a$1; INDEX=0

compiler/testData/checkLocalVariablesTable/namespace$foo1$1.kt

@@ -1,9 +0,0 @@
-fun foo1() {
-    (1..5).forEach {
-        println(it)
-    }
-}
-
-// METHOD : invoke(I)V
-// VARIABLE : NAME=this TYPE=Lnamespace$foo1$1; INDEX=0
-// VARIABLE : NAME=it TYPE=I INDEX=1

compiler/testData/codegen/regressions/kt864.jet

@@ -9,7 +9,7 @@ World""");
 
   fun box() : String {
     // TODO compiler error
-    // both these expressions causes java.lang.NoClassDefFoundError: collections/namespace
+    // both these expressions causes java.lang.NoClassDefFoundError: collections/CollectionPackage
     val list1 = sample().useLines{it.toArrayList()}
     val list2 = sample().useLines<ArrayList<String>>{it.toArrayList()}
 

compiler/testData/compileJavaAgainstKotlin/method/Any.java

@@ -1,6 +1,6 @@
 
 class Any {
     {
-        Object r = namespace.anyany(new Object(), null);
+        Object r = _DefaultPackage.anyany(new Object(), null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java

@@ -2,6 +2,6 @@
 class ArrayOfIntArray {
     {
         int[][] a = new int[0][];
-        int[][] r = namespace.ohMy(a);
+        int[][] r = _DefaultPackage.ohMy(a);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java

@@ -2,6 +2,6 @@
 class ArrayOfIntArray {
     {
         Integer[][] a = new Integer[0][];
-        Integer[][] r = namespace.ohMy(a, null);
+        Integer[][] r = _DefaultPackage.ohMy(a, null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java

@@ -1,5 +1,5 @@
 class GenericArray {
     public static void ggff() {
-        String[] s = namespace.ffgg(new String[0]);
+        String[] s = _DefaultPackage.ffgg(new String[0]);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Hello.java

@@ -1,6 +1,6 @@
 
 class Hello {
     public static void xx() {
-        String s = namespace.f();
+        String s = _DefaultPackage.f();
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Int.java

@@ -1,6 +1,6 @@
 
 class Int {
     {
-        int r = namespace.lll(1);
+        int r = _DefaultPackage.lll(1);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntArray.java

@@ -1,6 +1,6 @@
 
 class IntArray {
     {
-        int[] r = namespace.doNothing(new int[0], null);
+        int[] r = _DefaultPackage.doNothing(new int[0], null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java

@@ -1,6 +1,6 @@
 
 class IntWithDefault {
     {
-        int r = namespace.www(1);
+        int r = _DefaultPackage.www(1);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java

@@ -1,6 +1,6 @@
 
 class IntArray {
     {
-        Integer[] r = namespace.doNothing(new Integer[0], null);
+        Integer[] r = _DefaultPackage.doNothing(new Integer[0], null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java

@@ -5,7 +5,7 @@ class ListOfInt {
 
     public static void hhh() {
         List<Integer> list = new ArrayList<Integer>();
-        List<Integer> r = namespace.ggg(list);
+        List<Integer> r = _DefaultPackage.ggg(list);
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java

@@ -4,6 +4,6 @@ import java.util.ArrayList;
 class ListString {
     public static void gg() {
         List<String> list = new ArrayList<String>();
-        namespace.ff(list);
+        _DefaultPackage.ff(list);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java

@@ -5,7 +5,7 @@ class ListOfT {
 
     public static void check() {
         List<String> list = new ArrayList<String>();
-        List<String> r = namespace.listOfT(list);
+        List<String> r = _DefaultPackage.listOfT(list);
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java

@@ -6,6 +6,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<BigDecimal, String> map = new HashMap<BigDecimal, String>();
         
-        Map<BigDecimal, String> r = namespace.fff(map);
+        Map<BigDecimal, String> r = _DefaultPackage.fff(map);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java

@@ -6,6 +6,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<String, Integer> map = new HashMap<String, Integer>();
         
-        Map<String, Integer> r = namespace.fff(map);
+        Map<String, Integer> r = _DefaultPackage.fff(map);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java

@@ -2,6 +2,6 @@ class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        java.util.List<? extends String> s = id2(namespace.id(null));
+        java.util.List<? extends String> s = id2(_DefaultPackage.id(null));
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java

@@ -2,6 +2,6 @@ class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        String s = id2(namespace.id(null));
+        String s = id2(_DefaultPackage.id(null));
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Vararg.java

@@ -4,6 +4,6 @@ import java.util.ArrayList;
 class Vararg {
     {
         List<String> list = new ArrayList<String>();
-        List<String> r = namespace.gg(list, 3, 4, 5, 6);
+        List<String> r = _DefaultPackage.gg(list, 3, 4, 5, 6);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Void.java

@@ -1,5 +1,5 @@
 class Void {
     {
-        namespace.f();
+        _DefaultPackage.f();
     }
 }

compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt

@@ -3,5 +3,5 @@ class MyClass() { }
 deprecated("") fun MyClass.test() {}
 
 // TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: namespace, test
+// TESTED_OBJECTS: _DefaultPackage, test
 // FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL, ACC_STATIC

compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt

@@ -1,5 +1,5 @@
 deprecated("") fun test() {}
 
 // TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: namespace, test
+// TESTED_OBJECTS: _DefaultPackage, test
 // FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL, ACC_STATIC

compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt

@@ -1,5 +1,5 @@
 deprecated("") val test: Int = 0
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: namespace, test
+// TESTED_OBJECTS: _DefaultPackage, test
 // FLAGS: ACC_DEPRECATED, ACC_FINAL, ACC_STATIC

compiler/testData/writeSignature/ArrayOfCharSequence.kt

@@ -1,6 +1,6 @@
 fun never(): Array<java.lang.CharSequence> = throw Exception()
 
-// method: namespace::never
+// method: _DefaultPackage::never
 // jvm signature:     ()[Ljava/lang/CharSequence;
 // generic signature: null
 // kotlin signature:  ()[Mjava/lang/CharSequence; // TODO: need to skip kotlin signature

compiler/testData/writeSignature/ArrayOfInt.kt

@@ -1,6 +1,6 @@
 fun never(): Array<Int> = throw Exception()
 
-// method: namespace::never
+// method: _DefaultPackage::never
 // jvm signature:     ()[Ljava/lang/Integer;
 // generic signature: null
 // kotlin signature:  ()[Ljava/lang/Integer; // TODO: need to skip kotlin signature

compiler/testData/writeSignature/Comparable.kt

@@ -1,6 +1,6 @@
 fun cc(): Comparable<java.lang.CharSequence>? = null
 
-// method: namespace::cc
+// method: _DefaultPackage::cc
 // jvm signature:     ()Ljava/lang/Comparable;
 // generic signature: ()Ljava/lang/Comparable<Ljava/lang/CharSequence;>;
 // kotlin signature:  ()?Ljava/lang/Comparable<Mjava/lang/CharSequence;>;

compiler/testData/writeSignature/Int.kt

@@ -1,6 +1,6 @@
 fun key(): Int = throw Exception()
 
-// method: namespace::key
+// method: _DefaultPackage::key
 // jvm signature:     ()I
 // generic signature: null
 // kotlin signature:  ()I // TODO: make null

compiler/testData/writeSignature/IntArray.kt

@@ -1,6 +1,6 @@
 fun never(): IntArray = throw Exception()
 
-// method: namespace::never
+// method: _DefaultPackage::never
 // jvm signature:     ()[I
 // generic signature: null
 // kotlin signature:  ()[I // TODO: need to skip kotlin signature

compiler/testData/writeSignature/IntQ.kt

@@ -1,6 +1,6 @@
 fun sometimes(): Int? = null
 
-// method: namespace::sometimes
+// method: _DefaultPackage::sometimes
 // jvm signature:     ()Ljava/lang/Integer;
 // generic signature: null
 // kotlin signature:  ()?Ljava/lang/Integer; // TODO: need to skip kotlin signature

compiler/testData/writeSignature/ListOfCharSequence.kt

@@ -1,7 +1,7 @@
 
 fun foo(p: List<CharSequence>) = 1
 
-// method: namespace::foo
+// method: _DefaultPackage::foo
 // jvm signature:     (Ljava/util/List;)I
 // generic signature: (Ljava/util/List<+Ljava/lang/CharSequence;>;)I
 // kotlin signature:  (Ljet/List<Ljava/lang/CharSequence;>;)I // TODO: skip Kotlin signature

compiler/testData/writeSignature/ListOfStar.kt

@@ -1,7 +1,7 @@
 fun listOfStar(): List<*> = throw Exception()
 
 
-// method: namespace::listOfStar
+// method: _DefaultPackage::listOfStar
 // jvm signature:     ()Ljava/util/List;
 // generic signature: ()Ljava/util/List<Ljava/lang/Object;>;
 // kotlin signature:  ()Ljet/List<?Ljava/lang/Object;>;

compiler/testData/writeSignature/MapEntry.kt

@@ -1,6 +1,6 @@
 fun getEntry(): jet.Map.Entry<Int, String>? = null
 
-// method: namespace::getEntry
+// method: _DefaultPackage::getEntry
 // jvm signature:     ()Ljava/util/Map$Entry;
 // generic signature: ()Ljava/util/Map$Entry<Ljava/lang/Integer;Ljava/lang/String;>;
 // kotlin signature:  ()?Ljet/Map.Entry<Ljava/lang/Integer;Ljava/lang/String;>;

compiler/testData/writeSignature/MutableMapEntry.kt

@@ -1,6 +1,6 @@
 fun getEntry(): jet.MutableMap.MutableEntry<Int, String>? = null
 
-// method: namespace::getEntry
+// method: _DefaultPackage::getEntry
 // jvm signature:     ()Ljava/util/Map$Entry;
 // generic signature: ()Ljava/util/Map$Entry<Ljava/lang/Integer;Ljava/lang/String;>;
 // kotlin signature:  ()?Ljet/MutableMap.MutableEntry<Ljava/lang/Integer;Ljava/lang/String;>;

compiler/testData/writeSignature/NonGeneric.kt

@@ -1,6 +1,6 @@
 fun foo() = 1
 
-// method: namespace::foo
+// method: _DefaultPackage::foo
 // jvm signature:     ()I
 // generic signature: null
 // kotlin signature:  ()I // TODO: need to skip kotlin signature

compiler/testData/writeSignature/Nothing.kt

@@ -1,6 +1,6 @@
 fun nothing(): Nothing = throw Exception()
 
-// method: namespace::nothing
+// method: _DefaultPackage::nothing
 // jvm signature:     ()V
 // generic signature: null
 // kotlin signature:  ()Ljet/Nothing;

compiler/testData/writeSignature/NothingQ.kt

@@ -1,6 +1,6 @@
 fun nothingq(): Nothing? = null
 
-// method: namespace::nothingq
+// method: _DefaultPackage::nothingq
 // jvm signature:     ()Ljava/lang/Object;
 // generic signature: null
 // kotlin signature:  ()?Ljet/Nothing;

compiler/testData/writeSignature/VarargCharSequence.kt

@@ -1,6 +1,6 @@
 fun foo(vararg tail: java.lang.CharSequence) = 1
 
-// method: namespace::foo
+// method: _DefaultPackage::foo
 // jvm signature:     ([Ljava/lang/CharSequence;)I
 // generic signature: null
 // kotlin signature:  ([Mjava/lang/CharSequence;)I // TODO: need to skip kotlin signature

compiler/testData/writeSignature/VarargGeneric.kt

@@ -1,6 +1,6 @@
 fun <P> foo(vararg tail: P) = 1
 
-// method: namespace::foo
+// method: _DefaultPackage::foo
 // jvm signature:     ([Ljava/lang/Object;)I
 // generic signature: <P:Ljava/lang/Object;>([TP;)I
 // kotlin signature:  <erased P:?Ljava/lang/Object;>([TP;)I

compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt

@@ -4,7 +4,7 @@ class X
 
 fun f(m: M<X, X>): M<X, X> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LM;)LM;
 // generic signature: (LM<-LX;+LX;>;)LM<LX;LX;>;
 // kotlin signature:  (LM<LX;LX;>;)LM<LX;LX;>;

compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt

@@ -2,7 +2,7 @@ class In<in T>
 
 fun f(p: In<String>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LIn;)V
 // generic signature: (LIn<-Ljava/lang/String;>;)V
 // kotlin signature:  (LIn<Ljava/lang/String;>;)V

compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt

@@ -2,7 +2,7 @@ class In<in T>
 
 fun f(): In<String> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()LIn;
 // generic signature: ()LIn<Ljava/lang/String;>;
 // kotlin signature:  ()LIn<Ljava/lang/String;>;

compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt

@@ -3,7 +3,7 @@ class X
 
 fun f(p: In<In<X>>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LIn;)V
 // generic signature: (LIn<-LIn<-LX;>;>;)V
 // kotlin signature:  (LIn<LIn<LX;>;>;)V

compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt

@@ -3,7 +3,7 @@ class X
 
 fun f(): In<In<X>> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()LIn;
 // generic signature: ()LIn<LIn<-LX;>;>;
 // kotlin signature:  ()LIn<LIn<LX;>;>;

compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt

@@ -4,7 +4,7 @@ class X
 
 fun f(p: In<Out<X>>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LIn;)V
 // generic signature: (LIn<-LOut<+LX;>;>;)V
 // kotlin signature:  (LIn<LOut<LX;>;>;)V

compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt

@@ -4,7 +4,7 @@ class X
 
 fun f(): In<Out<X>> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()LIn;
 // generic signature: ()LIn<LOut<+LX;>;>;
 // kotlin signature:  ()LIn<LOut<LX;>;>;

compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt

@@ -1,6 +1,6 @@
 fun f(p: List<String>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (Ljava/util/List;)V
 // generic signature: (Ljava/util/List<+Ljava/lang/String;>;)V
 // kotlin signature:  (Ljet/List<Ljava/lang/String;>;)V

compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt

@@ -1,6 +1,6 @@
 fun f(): List<String> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()Ljava/util/List;
 // generic signature: ()Ljava/util/List<Ljava/lang/String;>;
 // kotlin signature:  ()Ljet/List<Ljava/lang/String;>;

compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt

@@ -4,7 +4,7 @@ class X
 
 fun f(p: Out<In<X>>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LOut;)V
 // generic signature: (LOut<+LIn<-LX;>;>;)V
 // kotlin signature:  (LOut<LIn<LX;>;>;)V

compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt

@@ -4,7 +4,7 @@ class X
 
 fun f(): Out<In<X>> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()LOut;
 // generic signature: ()LOut<LIn<-LX;>;>;
 // kotlin signature:  ()LOut<LIn<LX;>;>;

compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt

@@ -3,7 +3,7 @@ class X
 
 fun f(p: Out<Out<X>>) {}
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     (LOut;)V
 // generic signature: (LOut<+LOut<+LX;>;>;)V
 // kotlin signature:  (LOut<LOut<LX;>;>;)V

compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt

@@ -13,7 +13,7 @@ class X
 //     thus removing the wildcard would be restricting the use of the return value of the method, and we don't want do this.
 fun f(): Out<Out<X>> = throw Exception()
 
-// method: namespace::f
+// method: _DefaultPackage::f
 // jvm signature:     ()LOut;
 // generic signature: ()LOut<LOut<+LX;>;>;
 // kotlin signature:  ()LOut<LOut<LX;>;>;

compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt

@@ -3,7 +3,7 @@ class X
 
 val p: M<X> = throw Exception()
 
-// method: namespace::getP
+// method: _DefaultPackage::getP
 // jvm signature:     ()LM;
 // generic signature: ()LM<LX;>;
 // kotlin signature:  null

compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt

@@ -3,7 +3,7 @@ class X
 
 val p: M<X> = throw Exception()
 
-// method: namespace::getP
+// method: _DefaultPackage::getP
 // jvm signature:     ()LM;
 // generic signature: ()LM<LX;>;
 // kotlin signature:  null

compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt

@@ -3,7 +3,7 @@ class X
 
 val p: M<X, X> = throw Exception()
 
-// method: namespace::getP
+// method: _DefaultPackage::getP
 // jvm signature:     ()LM;
 // generic signature: ()LM<LX;LX;>;
 // kotlin signature:  null

compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt

@@ -3,7 +3,7 @@ class X
 
 var p: M<X> = throw Exception()
 
-// method: namespace::setP
+// method: _DefaultPackage::setP
 // jvm signature:     (LM;)V
 // generic signature: (LM<-LX;>;)V
 // kotlin signature:  null

compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt

@@ -3,7 +3,7 @@ class X
 
 var p: M<X> = throw Exception()
 
-// method: namespace::setP
+// method: _DefaultPackage::setP
 // jvm signature:     (LM;)V
 // generic signature: (LM<+LX;>;)V
 // kotlin signature:  null

compiler/testData/writeSignature/jlString.kt

@@ -1,6 +1,6 @@
 fun string(): java.lang.String = throw Exception()
 
-// method: namespace::string
+// method: _DefaultPackage::string
 // jvm signature:     ()Ljava/lang/String;
 // generic signature: null
 // kotlin signature:  ()Mjava/lang/String;