Rename namespace class to {package.name}Package

Conflicts:

	compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
This commit is contained in:
Natalia.Ukhorskaya
2013-01-11 12:00:27 +04:00
parent 0f2fa6bade
commit 47abdcf565
113 changed files with 436 additions and 193 deletions
@@ -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
@@ -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
@@ -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;>;
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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
@@ -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;>;
+1 -1
View File
@@ -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;>;
@@ -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;>;
@@ -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
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;
@@ -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
@@ -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
@@ -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;>;
@@ -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
@@ -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;>;
@@ -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
@@ -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;>;>;
@@ -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
@@ -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;>;>;
@@ -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
@@ -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;>;
@@ -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
@@ -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;>;>;
@@ -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
@@ -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;>;>;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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;