Move built-ins from package "jet" to "kotlin"

#KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-20 16:27:58 +04:00
parent 6b0fce8cd5
commit d9029917eb
28 changed files with 37 additions and 36 deletions
+4 -4
View File
@@ -21,13 +21,13 @@
<element id="module-output" name="preloader" />
<element id="module-output" name="serialization" />
<element id="module-output" name="serialization.java" />
<element id="directory" name="jet">
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/jet" />
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/jet" />
</element>
<element id="module-output" name="backend-common" />
<element id="library" level="project" name="builtins" />
<element id="module-output" name="js.dart-ast" />
<element id="directory" name="kotlin">
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
</element>
</element>
<element id="library" level="project" name="javax.inject" />
<element id="directory" name="jps">
@@ -52,8 +52,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
new ImportPath("java.lang.*"),
new ImportPath("kotlin.*"),
new ImportPath("kotlin.io.*"),
new ImportPath("jet.*"));
new ImportPath("kotlin.io.*"));
private AnalyzerFacadeForJVM() {
}
@@ -1,4 +1,4 @@
package jet
package kotlin
public open class Any {
public open fun equals(other: Any?): Boolean
@@ -1,8 +1,8 @@
package jet
package kotlin
public fun arrayOfNulls<T>(size : Int) : Array<T?>
public class Array<reified T>(public val size : Int, init : (Int) -> T) {
public class Array<reified T>(public val size : Int, init : Function1<Int, T>) {
public fun get(index : Int) : T
public fun set(index : Int, value : T) : Unit
@@ -1,4 +1,4 @@
package jet
package kotlin
public class Char private () : Comparable<Char> {
public fun compareTo(other : Double) : Int
@@ -1,4 +1,4 @@
package jet
package kotlin
public trait Iterable<out T> {
public fun iterator() : Iterator<T>
@@ -146,4 +146,4 @@ public trait MutableMap<K, V> : Map<K, V> {
public trait MutableEntry<K,V> : Map.Entry<K, V> {
public fun setValue(value : V) : V
}
}
}
@@ -1,4 +1,4 @@
package jet
package kotlin
public abstract class Enum<E: Enum<E>>(name: String, ordinal: Int) {
public final fun name() : String
@@ -1,4 +1,4 @@
package jet
package kotlin
public trait Iterator<out T> {
public fun next(): T
@@ -1,4 +1,4 @@
package jet
package kotlin
public trait Annotation
@@ -1,4 +1,4 @@
package jet
package kotlin
/**
* Nothing has no instances
@@ -1,4 +1,4 @@
package jet
package kotlin
public abstract class Number {
public abstract fun toDouble() : Double
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package jet
package kotlin
public annotation class data
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public trait ExtensionFunction0<in T, out R> {
public fun T.invoke(): R
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public trait Function0<out R> {
public fun invoke(): R
@@ -14,10 +14,12 @@
* limitations under the License.
*/
package jet
package kotlin
public annotation class noinline
public annotation class inline(public val strategy: InlineStrategy = InlineStrategy.AS_FUNCTION)
public enum class InlineStrategy {
AS_FUNCTION
IN_PLACE
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public abstract class ByteIterator : Iterator<Byte> {
override final fun next() = nextByte()
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public trait KExtensionFunction0<in T, out R> : ExtensionFunction0<T, R>
public trait KExtensionFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public trait KFunction0<out R> : Function0<R>
public trait KFunction1<in P1, out R> : Function1<P1, R>
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public trait KMemberFunction0<in T, out R> : ExtensionFunction0<T, R>
public trait KMemberFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package jet
package kotlin
public trait Progression<out N : Any> : Iterable<N> {
public val start: N
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
import kotlin.internal.getProgressionFinalElement
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public class ByteProgression(
public override val start: Byte,
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package jet
package kotlin
public trait PropertyMetadata {
public val name: String
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package jet
package kotlin
public trait Range<T : Comparable<T>> {
public val start: T
@@ -16,7 +16,7 @@
// Auto-generated file. DO NOT EDIT!
package jet
package kotlin
public class ByteRange(public override val start: Byte, public override val end: Byte) : Range<Byte>, Progression<Byte> {
override val increment: Int
@@ -14,10 +14,10 @@
* limitations under the License.
*/
package jet
package kotlin
public class Unit private() {
override fun toString() = "Unit.VALUE"
override fun toString(): String = "Unit.VALUE"
class object {
public val VALUE: Unit = Unit()
@@ -40,7 +40,7 @@ import static org.jetbrains.jet.lang.types.lang.PrimitiveType.*;
public class KotlinBuiltIns {
public static final JetScope STUB = JetScope.EMPTY;
public static final String BUILT_INS_PACKAGE_NAME_STRING = "jet";
public static final String BUILT_INS_PACKAGE_NAME_STRING = "kotlin";
public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier(BUILT_INS_PACKAGE_NAME_STRING);
public static final FqName BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME);
@@ -16,8 +16,8 @@
package kotlin.jvm.internal;
import jet.Function0;
import jet.IntRange;
import kotlin.Function0;
import kotlin.IntRange;
import kotlin.KotlinNullPointerException;
import java.util.ArrayList;