azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unsorted replacements "jet" -> "kotlin"

Browse Source 
#KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-19 21:34:06 +04:00
parent ac71911720
commit 6b0fce8cd5
22 changed files with 185 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
-1
View File
@@ -317,7 +317,6 @@
</zipfileset> </zipfileset>
<fileset dir="${output}/classes/compiler"/> <fileset dir="${output}/classes/compiler"/>
<fileset dir="${output}/builtins"> <fileset dir="${output}/builtins">
<include name="jet/**"/>
<include name="kotlin/**"/> <include name="kotlin/**"/>
<exclude name="kotlin/internal/**"/> <exclude name="kotlin/internal/**"/>
</fileset> </fileset>
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/JavaToKotlinMethodMapGenerated.java
+140 -140
View File
@@ -29,224 +29,224 @@ class JavaToKotlinMethodMapGenerated {
ImmutableMultimap.Builder<String, JavaToKotlinMethodMap.ClassData> b = ImmutableMultimap.builder(); ImmutableMultimap.Builder<String, JavaToKotlinMethodMap.ClassData> b = ImmutableMultimap.builder();
put(b, "java.lang.Object", "Any", put(b, "java.lang.Object", "Any",
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.String", "String", put(b, "java.lang.String", "String",
pair("compareTo(java.lang.String)", "fun compareTo(that: jet.String): jet.Int"), pair("compareTo(java.lang.String)", "fun compareTo(that: kotlin.String): kotlin.Int"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.CharSequence", "CharSequence", put(b, "java.lang.CharSequence", "CharSequence",
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.Throwable", "Throwable", put(b, "java.lang.Throwable", "Throwable",
pair("getCause()", "fun getCause(): jet.Throwable?"), pair("getCause()", "fun getCause(): kotlin.Throwable?"),
pair("getMessage()", "fun getMessage(): jet.String?"), pair("getMessage()", "fun getMessage(): kotlin.String?"),
pair("printStackTrace()", "fun printStackTrace(): jet.Unit"), pair("printStackTrace()", "fun printStackTrace(): kotlin.Unit"),
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.Comparable", "Comparable", put(b, "java.lang.Comparable", "Comparable",
pair("compareTo(T)", "fun compareTo(other: T): jet.Int") pair("compareTo(T)", "fun compareTo(other: T): kotlin.Int")
); );
put(b, "java.lang.Enum", "Enum", put(b, "java.lang.Enum", "Enum",
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("name()", "fun name(): jet.String"), pair("name()", "fun name(): kotlin.String"),
pair("ordinal()", "fun ordinal(): jet.Int"), pair("ordinal()", "fun ordinal(): kotlin.Int"),
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.annotation.Annotation", "Annotation", put(b, "java.lang.annotation.Annotation", "Annotation",
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("toString()", "fun toString(): jet.String") pair("toString()", "fun toString(): kotlin.String")
); );
put(b, "java.lang.Iterable", "Iterable", put(b, "java.lang.Iterable", "Iterable",
pair("iterator()", "fun iterator(): jet.Iterator<T>") pair("iterator()", "fun iterator(): kotlin.Iterator<T>")
); );
put(b, "java.lang.Iterable", "MutableIterable", put(b, "java.lang.Iterable", "MutableIterable",
pair("iterator()", "fun iterator(): jet.MutableIterator<T>") pair("iterator()", "fun iterator(): kotlin.MutableIterator<T>")
); );
put(b, "java.util.Iterator", "Iterator", put(b, "java.util.Iterator", "Iterator",
pair("hasNext()", "fun hasNext(): jet.Boolean"), pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("next()", "fun next(): T") pair("next()", "fun next(): T")
); );
put(b, "java.util.Iterator", "MutableIterator", put(b, "java.util.Iterator", "MutableIterator",
pair("hasNext()", "fun hasNext(): jet.Boolean"), pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("next()", "fun next(): T"), pair("next()", "fun next(): T"),
pair("remove()", "fun remove(): jet.Unit") pair("remove()", "fun remove(): kotlin.Unit")
); );
put(b, "java.util.Collection", "Collection", put(b, "java.util.Collection", "Collection",
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.Iterator<E>"), pair("iterator()", "fun iterator(): kotlin.Iterator<E>"),
pair("size()", "fun size(): jet.Int") pair("size()", "fun size(): kotlin.Int")
); );
put(b, "java.util.Collection", "MutableCollection", put(b, "java.util.Collection", "MutableCollection",
pair("add(E)", "fun add(e: E): jet.Boolean"), pair("add(E)", "fun add(e: E): kotlin.Boolean"),
pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: jet.Collection<E>): jet.Boolean"), pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: kotlin.Collection<E>): kotlin.Boolean"),
pair("clear()", "fun clear(): jet.Unit"), pair("clear()", "fun clear(): kotlin.Unit"),
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.MutableIterator<E>"), pair("iterator()", "fun iterator(): kotlin.MutableIterator<E>"),
pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"), pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("size()", "fun size(): jet.Int") pair("size()", "fun size(): kotlin.Int")
); );
put(b, "java.util.List", "List", put(b, "java.util.List", "List",
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("get(int)", "fun get(index: jet.Int): E"), pair("get(int)", "fun get(index: kotlin.Int): E"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("indexOf(java.lang.Object)", "fun indexOf(o: jet.Any?): jet.Int"), pair("indexOf(java.lang.Object)", "fun indexOf(o: kotlin.Any?): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.Iterator<E>"), pair("iterator()", "fun iterator(): kotlin.Iterator<E>"),
pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: jet.Any?): jet.Int"), pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: kotlin.Any?): kotlin.Int"),
pair("listIterator()", "fun listIterator(): jet.ListIterator<E>"), pair("listIterator()", "fun listIterator(): kotlin.ListIterator<E>"),
pair("listIterator(int)", "fun listIterator(index: jet.Int): jet.ListIterator<E>"), pair("listIterator(int)", "fun listIterator(index: kotlin.Int): kotlin.ListIterator<E>"),
pair("size()", "fun size(): jet.Int"), pair("size()", "fun size(): kotlin.Int"),
pair("subList(int, int)", "fun subList(fromIndex: jet.Int, toIndex: jet.Int): jet.List<E>") pair("subList(int, int)", "fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.List<E>")
); );
put(b, "java.util.List", "MutableList", put(b, "java.util.List", "MutableList",
pair("add(E)", "fun add(e: E): jet.Boolean"), pair("add(E)", "fun add(e: E): kotlin.Boolean"),
pair("add(int, E)", "fun add(index: jet.Int, element: E): jet.Unit"), pair("add(int, E)", "fun add(index: kotlin.Int, element: E): kotlin.Unit"),
pair("addAll(int, java.util.Collection<? extends E>)", "fun addAll(index: jet.Int, c: jet.Collection<E>): jet.Boolean"), pair("addAll(int, java.util.Collection<? extends E>)", "fun addAll(index: kotlin.Int, c: kotlin.Collection<E>): kotlin.Boolean"),
pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: jet.Collection<E>): jet.Boolean"), pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: kotlin.Collection<E>): kotlin.Boolean"),
pair("clear()", "fun clear(): jet.Unit"), pair("clear()", "fun clear(): kotlin.Unit"),
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("get(int)", "fun get(index: jet.Int): E"), pair("get(int)", "fun get(index: kotlin.Int): E"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("indexOf(java.lang.Object)", "fun indexOf(o: jet.Any?): jet.Int"), pair("indexOf(java.lang.Object)", "fun indexOf(o: kotlin.Any?): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.MutableIterator<E>"), pair("iterator()", "fun iterator(): kotlin.MutableIterator<E>"),
pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: jet.Any?): jet.Int"), pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: kotlin.Any?): kotlin.Int"),
pair("listIterator()", "fun listIterator(): jet.MutableListIterator<E>"), pair("listIterator()", "fun listIterator(): kotlin.MutableListIterator<E>"),
pair("listIterator(int)", "fun listIterator(index: jet.Int): jet.MutableListIterator<E>"), pair("listIterator(int)", "fun listIterator(index: kotlin.Int): kotlin.MutableListIterator<E>"),
pair("remove(int)", "fun remove(index: jet.Int): E"), pair("remove(int)", "fun remove(index: kotlin.Int): E"),
pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"), pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("set(int, E)", "fun set(index: jet.Int, element: E): E"), pair("set(int, E)", "fun set(index: kotlin.Int, element: E): E"),
pair("size()", "fun size(): jet.Int"), pair("size()", "fun size(): kotlin.Int"),
pair("subList(int, int)", "fun subList(fromIndex: jet.Int, toIndex: jet.Int): jet.MutableList<E>") pair("subList(int, int)", "fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.MutableList<E>")
); );
put(b, "java.util.Set", "Set", put(b, "java.util.Set", "Set",
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.Iterator<E>"), pair("iterator()", "fun iterator(): kotlin.Iterator<E>"),
pair("size()", "fun size(): jet.Int") pair("size()", "fun size(): kotlin.Int")
); );
put(b, "java.util.Set", "MutableSet", put(b, "java.util.Set", "MutableSet",
pair("add(E)", "fun add(e: E): jet.Boolean"), pair("add(E)", "fun add(e: E): kotlin.Boolean"),
pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: jet.Collection<E>): jet.Boolean"), pair("addAll(java.util.Collection<? extends E>)", "fun addAll(c: kotlin.Collection<E>): kotlin.Boolean"),
pair("clear()", "fun clear(): jet.Unit"), pair("clear()", "fun clear(): kotlin.Unit"),
pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"), pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("containsAll(java.util.Collection<?>)", "fun containsAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("iterator()", "fun iterator(): jet.MutableIterator<E>"), pair("iterator()", "fun iterator(): kotlin.MutableIterator<E>"),
pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"), pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("removeAll(java.util.Collection<?>)", "fun removeAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: jet.Collection<jet.Any?>): jet.Boolean"), pair("retainAll(java.util.Collection<?>)", "fun retainAll(c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean"),
pair("size()", "fun size(): jet.Int") pair("size()", "fun size(): kotlin.Int")
); );
put(b, "java.util.Map", "Map", put(b, "java.util.Map", "Map",
pair("containsKey(java.lang.Object)", "fun containsKey(key: jet.Any?): jet.Boolean"), pair("containsKey(java.lang.Object)", "fun containsKey(key: kotlin.Any?): kotlin.Boolean"),
pair("containsValue(java.lang.Object)", "fun containsValue(value: jet.Any?): jet.Boolean"), pair("containsValue(java.lang.Object)", "fun containsValue(value: kotlin.Any?): kotlin.Boolean"),
pair("entrySet()", "fun entrySet(): jet.Set<jet.Map.Entry<K, V>>"), pair("entrySet()", "fun entrySet(): kotlin.Set<kotlin.Map.Entry<K, V>>"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("get(java.lang.Object)", "fun get(key: jet.Any?): V?"), pair("get(java.lang.Object)", "fun get(key: kotlin.Any?): V?"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("keySet()", "fun keySet(): jet.Set<K>"), pair("keySet()", "fun keySet(): kotlin.Set<K>"),
pair("size()", "fun size(): jet.Int"), pair("size()", "fun size(): kotlin.Int"),
pair("values()", "fun values(): jet.Collection<V>") pair("values()", "fun values(): kotlin.Collection<V>")
); );
put(b, "java.util.Map", "MutableMap", put(b, "java.util.Map", "MutableMap",
pair("clear()", "fun clear(): jet.Unit"), pair("clear()", "fun clear(): kotlin.Unit"),
pair("containsKey(java.lang.Object)", "fun containsKey(key: jet.Any?): jet.Boolean"), pair("containsKey(java.lang.Object)", "fun containsKey(key: kotlin.Any?): kotlin.Boolean"),
pair("containsValue(java.lang.Object)", "fun containsValue(value: jet.Any?): jet.Boolean"), pair("containsValue(java.lang.Object)", "fun containsValue(value: kotlin.Any?): kotlin.Boolean"),
pair("entrySet()", "fun entrySet(): jet.MutableSet<jet.MutableMap.MutableEntry<K, V>>"), pair("entrySet()", "fun entrySet(): kotlin.MutableSet<kotlin.MutableMap.MutableEntry<K, V>>"),
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("get(java.lang.Object)", "fun get(key: jet.Any?): V?"), pair("get(java.lang.Object)", "fun get(key: kotlin.Any?): V?"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("isEmpty()", "fun isEmpty(): jet.Boolean"), pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
pair("keySet()", "fun keySet(): jet.MutableSet<K>"), pair("keySet()", "fun keySet(): kotlin.MutableSet<K>"),
pair("put(K, V)", "fun put(key: K, value: V): V?"), pair("put(K, V)", "fun put(key: K, value: V): V?"),
pair("putAll(java.util.Map<? extends K,? extends V>)", "fun putAll(m: jet.Map<out K, V>): jet.Unit"), pair("putAll(java.util.Map<? extends K,? extends V>)", "fun putAll(m: kotlin.Map<out K, V>): kotlin.Unit"),
pair("remove(java.lang.Object)", "fun remove(key: jet.Any?): V?"), pair("remove(java.lang.Object)", "fun remove(key: kotlin.Any?): V?"),
pair("size()", "fun size(): jet.Int"), pair("size()", "fun size(): kotlin.Int"),
pair("values()", "fun values(): jet.MutableCollection<V>") pair("values()", "fun values(): kotlin.MutableCollection<V>")
); );
put(b, "java.util.Map.Entry", "Map.Entry", put(b, "java.util.Map.Entry", "Map.Entry",
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("getKey()", "fun getKey(): K"), pair("getKey()", "fun getKey(): K"),
pair("getValue()", "fun getValue(): V"), pair("getValue()", "fun getValue(): V"),
pair("hashCode()", "fun hashCode(): jet.Int") pair("hashCode()", "fun hashCode(): kotlin.Int")
); );
put(b, "java.util.Map.Entry", "MutableMap.MutableEntry", put(b, "java.util.Map.Entry", "MutableMap.MutableEntry",
pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"), pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("getKey()", "fun getKey(): K"), pair("getKey()", "fun getKey(): K"),
pair("getValue()", "fun getValue(): V"), pair("getValue()", "fun getValue(): V"),
pair("hashCode()", "fun hashCode(): jet.Int"), pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("setValue(V)", "fun setValue(value: V): V") pair("setValue(V)", "fun setValue(value: V): V")
); );
put(b, "java.util.ListIterator", "ListIterator", put(b, "java.util.ListIterator", "ListIterator",
pair("hasNext()", "fun hasNext(): jet.Boolean"), pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("hasPrevious()", "fun hasPrevious(): jet.Boolean"), pair("hasPrevious()", "fun hasPrevious(): kotlin.Boolean"),
pair("next()", "fun next(): T"), pair("next()", "fun next(): T"),
pair("nextIndex()", "fun nextIndex(): jet.Int"), pair("nextIndex()", "fun nextIndex(): kotlin.Int"),
pair("previous()", "fun previous(): T"), pair("previous()", "fun previous(): T"),
pair("previousIndex()", "fun previousIndex(): jet.Int") pair("previousIndex()", "fun previousIndex(): kotlin.Int")
); );
put(b, "java.util.ListIterator", "MutableListIterator", put(b, "java.util.ListIterator", "MutableListIterator",
pair("add(E)", "fun add(e: T): jet.Unit"), pair("add(E)", "fun add(e: T): kotlin.Unit"),
pair("hasNext()", "fun hasNext(): jet.Boolean"), pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("hasPrevious()", "fun hasPrevious(): jet.Boolean"), pair("hasPrevious()", "fun hasPrevious(): kotlin.Boolean"),
pair("next()", "fun next(): T"), pair("next()", "fun next(): T"),
pair("nextIndex()", "fun nextIndex(): jet.Int"), pair("nextIndex()", "fun nextIndex(): kotlin.Int"),
pair("previous()", "fun previous(): T"), pair("previous()", "fun previous(): T"),
pair("previousIndex()", "fun previousIndex(): jet.Int"), pair("previousIndex()", "fun previousIndex(): kotlin.Int"),
pair("remove()", "fun remove(): jet.Unit"), pair("remove()", "fun remove(): kotlin.Unit"),
pair("set(E)", "fun set(e: T): jet.Unit") pair("set(E)", "fun set(e: T): kotlin.Unit")
); );
map = b.build(); map = b.build();
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+5 -7
View File
@@ -33,7 +33,6 @@ import java.lang.reflect.Modifier;
import java.util.Collection; import java.util.Collection;
import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.DECLARATION_CANT_BE_INLINED;
import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*;
import static org.jetbrains.jet.renderer.DescriptorRenderer.SHORT_NAMES_IN_TYPES; import static org.jetbrains.jet.renderer.DescriptorRenderer.SHORT_NAMES_IN_TYPES;
@@ -214,7 +213,7 @@ public class DefaultErrorMessages {
NAME, ELEMENT_TEXT); NAME, ELEMENT_TEXT);
MAP.put(ASSIGN_OPERATOR_AMBIGUITY, "Assignment operators ambiguity: {0}", AMBIGUOUS_CALLS); MAP.put(ASSIGN_OPERATOR_AMBIGUITY, "Assignment operators ambiguity: {0}", AMBIGUOUS_CALLS);
MAP.put(EQUALS_MISSING, "No method 'equals(jet.Any?) : jet.Boolean' available"); MAP.put(EQUALS_MISSING, "No method 'equals(kotlin.Any?): kotlin.Boolean' available");
MAP.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context"); MAP.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context");
MAP.put(PACKAGE_IS_NOT_AN_EXPRESSION, "'package' is not an expression, it can only be used on the left-hand side of a dot ('.')"); MAP.put(PACKAGE_IS_NOT_AN_EXPRESSION, "'package' is not an expression, it can only be used on the left-hand side of a dot ('.')");
MAP.put(SUPER_IS_NOT_AN_EXPRESSION, "''{0}'' is not an expression, it can only be used on the left-hand side of a dot ('.')", TO_STRING); MAP.put(SUPER_IS_NOT_AN_EXPRESSION, "''{0}'' is not an expression, it can only be used on the left-hand side of a dot ('.')", TO_STRING);
@@ -244,8 +243,7 @@ public class DefaultErrorMessages {
MAP.put(HAS_NEXT_MISSING, "hasNext() cannot be called on iterator() of type ''{0}''", RENDER_TYPE); MAP.put(HAS_NEXT_MISSING, "hasNext() cannot be called on iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(HAS_NEXT_FUNCTION_AMBIGUITY, "hasNext() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE); MAP.put(HAS_NEXT_FUNCTION_AMBIGUITY, "hasNext() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, "None of the hasNext() functions is applicable for iterator() of type ''{0}''", RENDER_TYPE); MAP.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, "None of the hasNext() functions is applicable for iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(HAS_NEXT_FUNCTION_TYPE_MISMATCH, "The ''iterator().hasNext()'' function of the loop range must return jet.Boolean, but returns {0}", MAP.put(HAS_NEXT_FUNCTION_TYPE_MISMATCH, "The ''iterator().hasNext()'' function of the loop range must return kotlin.Boolean, but returns {0}", RENDER_TYPE);
RENDER_TYPE);
MAP.put(NEXT_MISSING, "next() cannot be called on iterator() of type ''{0}''", RENDER_TYPE); MAP.put(NEXT_MISSING, "next() cannot be called on iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(NEXT_AMBIGUITY, "next() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE); MAP.put(NEXT_AMBIGUITY, "next() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE);
@@ -260,7 +258,7 @@ public class DefaultErrorMessages {
MAP.put(DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH, "The ''{0}'' function of property delegate is expected to return ''{1}'', but returns ''{2}''", MAP.put(DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH, "The ''{0}'' function of property delegate is expected to return ''{1}'', but returns ''{2}''",
TO_STRING, RENDER_TYPE, RENDER_TYPE); TO_STRING, RENDER_TYPE, RENDER_TYPE);
MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return jet.Int, but returns {0}", RENDER_TYPE); MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return kotlin.Int, but returns {0}", RENDER_TYPE);
MAP.put(CALLEE_NOT_A_FUNCTION, "Expecting a function type, but found {0}", RENDER_TYPE); MAP.put(CALLEE_NOT_A_FUNCTION, "Expecting a function type, but found {0}", RENDER_TYPE);
MAP.put(RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY, MAP.put(RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY,
@@ -359,9 +357,9 @@ public class DefaultErrorMessages {
MAP.put(TYPE_MISMATCH_IN_FOR_LOOP, "The loop iterates over values of type {0} but the parameter is declared to be {1}", RENDER_TYPE, MAP.put(TYPE_MISMATCH_IN_FOR_LOOP, "The loop iterates over values of type {0} but the parameter is declared to be {1}", RENDER_TYPE,
RENDER_TYPE); RENDER_TYPE);
MAP.put(TYPE_MISMATCH_IN_CONDITION, "Condition must be of type jet.Boolean, but is of type {0}", RENDER_TYPE); MAP.put(TYPE_MISMATCH_IN_CONDITION, "Condition must be of type kotlin.Boolean, but is of type {0}", RENDER_TYPE);
MAP.put(INCOMPATIBLE_TYPES, "Incompatible types: {0} and {1}", RENDER_TYPE, RENDER_TYPE); MAP.put(INCOMPATIBLE_TYPES, "Incompatible types: {0} and {1}", RENDER_TYPE, RENDER_TYPE);
MAP.put(EXPECTED_CONDITION, "Expected condition of jet.Boolean type"); MAP.put(EXPECTED_CONDITION, "Expected condition of type kotlin.Boolean");
MAP.put(CANNOT_CHECK_FOR_ERASED, "Cannot check for instance of erased type: {0}", RENDER_TYPE); MAP.put(CANNOT_CHECK_FOR_ERASED, "Cannot check for instance of erased type: {0}", RENDER_TYPE);
MAP.put(UNCHECKED_CAST, "Unchecked cast: {0} to {1}", RENDER_TYPE, RENDER_TYPE); MAP.put(UNCHECKED_CAST, "Unchecked cast: {0} to {1}", RENDER_TYPE, RENDER_TYPE);
compiler/testData/asJava/lightClasses/Declared.kt
+4 -4
View File
@@ -27,11 +27,11 @@ trait Trait
// Deprecation // Deprecation
deprecated("") class Deprecated deprecated("") class Deprecated
jet.deprecated("") class DeprecatedFQN kotlin.deprecated("") class DeprecatedFQN
jet. deprecated /**/ ("") class DeprecatedFQNSpaces kotlin. deprecated /**/ ("") class DeprecatedFQNSpaces
[deprecated("")] class DeprecatedWithBrackets [deprecated("")] class DeprecatedWithBrackets
[jet.deprecated("")] class DeprecatedWithBracketsFQN [kotlin.deprecated("")] class DeprecatedWithBracketsFQN
[jet [kotlin
./**/deprecated ("")] class DeprecatedWithBracketsFQNSpaces ./**/deprecated ("")] class DeprecatedWithBracketsFQNSpaces
// Generic // Generic
compiler/tests/org/jetbrains/jet/ScriptTest.java
+1 -1
View File
@@ -106,6 +106,6 @@ public class ScriptTest {
@NotNull @NotNull
private static List<AnalyzerScriptParameter> numIntParam() { private static List<AnalyzerScriptParameter> numIntParam() {
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("jet.Int"))); return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("kotlin.Int")));
} }
} }
compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+5 -5
View File
@@ -126,20 +126,20 @@ public class CodegenTestFiles {
String valueString = scriptParametersMatcher.group(3); String valueString = scriptParametersMatcher.group(3);
Object value; Object value;
if (type.equals("jet.String")) { if (type.equals("kotlin.String")) {
value = valueString; value = valueString;
} }
else if (type.equals("jet.Long")) { else if (type.equals("kotlin.Long")) {
value = Long.parseLong(valueString); value = Long.parseLong(valueString);
} }
else if (type.equals("jet.Int")) { else if (type.equals("kotlin.Int")) {
value = Integer.parseInt(valueString); value = Integer.parseInt(valueString);
} }
else if (type.equals("jet.Array<jet.String>")) { else if (type.equals("kotlin.Array<kotlin.String>")) {
value = valueString.split(" "); value = valueString.split(" ");
} }
else { else {
throw new AssertionError("TODO"); throw new AssertionError("TODO: " + type);
} }
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type))); scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type)));
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class ScriptGenTest extends CodegenTestCase {
protected Object scriptInstance; protected Object scriptInstance;
public static final JetScriptDefinition FIB_SCRIPT_DEFINITION = public static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "jet.Int")); new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "kotlin.Int"));
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+2 -2
View File
@@ -28,13 +28,13 @@ import java.io.File
fun assertExists(file: File): Unit = fun assertExists(file: File): Unit =
if (!file.exists()) error("Output dir does not exist: ${file.getAbsolutePath()}") if (!file.exists()) error("Output dir does not exist: ${file.getAbsolutePath()}")
val BUILT_INS_DIR = File("core/builtins/src/jet/") val BUILT_INS_DIR = File("core/builtins/src/kotlin/")
val RUNTIME_JVM_DIR = File("core/runtime.jvm/src/kotlin/") val RUNTIME_JVM_DIR = File("core/runtime.jvm/src/kotlin/")
abstract class BuiltInsSourceGenerator(val out: PrintWriter) { abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
protected abstract fun generateBody(): Unit protected abstract fun generateBody(): Unit
protected open fun getPackage(): String = "jet" protected open fun getPackage(): String = "kotlin"
final fun generate() { final fun generate() {
out.println(File("injector-generator/copyright.txt").readText()) out.println(File("injector-generator/copyright.txt").readText())
idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java
+3 -2
View File
@@ -154,9 +154,10 @@ public class KotlinRuntimeLibraryUtil {
ImmutableList<String> candidateClassNames = ImmutableList.of( ImmutableList<String> candidateClassNames = ImmutableList.of(
kotlinPackageClassFqName, kotlinPackageClassFqName,
"jet.Unit", "kotlin.Unit",
// For older versions // For older versions
"kotlin.namespace" "kotlin.namespace",
"jet.Unit"
); );
for (String className : candidateClassNames) { for (String className : candidateClassNames) {
idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest {
doTest(new Function1<MessageChecker, Void>() { doTest(new Function1<MessageChecker, Void>() {
@Override @Override
public Void invoke(MessageChecker checker) { public Void invoke(MessageChecker checker) {
checker.expect(warning().text("Unnecessary non-null assertion (!!) on a non-null receiver of type jet.String") checker.expect(warning().text("Unnecessary non-null assertion (!!) on a non-null receiver of type kotlin.String")
.at("test.kt", 4, 4)); .at("test.kt", 4, 4));
return null; return null;
} }
idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
+2 -2
View File
@@ -52,11 +52,11 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
} }
public void testClassWithJavaAnalog() throws IOException { public void testClassWithJavaAnalog() throws IOException {
doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Iterator", "jet.Iterator"); doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Iterator", "kotlin.Iterator");
} }
public void testNavigationInKotlinBuiltIns() throws IOException { public void testNavigationInKotlinBuiltIns() throws IOException {
doNavigationInSourcesTest("libraries/stdlib/src/generated/_Arrays.kt", "Array", "jet.Array"); doNavigationInSourcesTest("libraries/stdlib/src/generated/_Arrays.kt", "Array", "kotlin.Array");
} }
private void doNavigationInSourcesTest(@NotNull String path, @NotNull String element, @NotNull String expectedFqName) throws IOException { private void doNavigationInSourcesTest(@NotNull String path, @NotNull String element, @NotNull String expectedFqName) throws IOException {
js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+6 -6
View File
@@ -87,20 +87,20 @@ public final class StandardClasses {
@NotNull @NotNull
public static StandardClasses bindImplementations(@NotNull JsScope kotlinObjectScope) { public static StandardClasses bindImplementations(@NotNull JsScope kotlinObjectScope) {
StandardClasses standardClasses = new StandardClasses(kotlinObjectScope); StandardClasses standardClasses = new StandardClasses(kotlinObjectScope);
declareJetObjects(standardClasses); declareKotlinStandardClasses(standardClasses);
return standardClasses; return standardClasses;
} }
private static void declareJetObjects(@NotNull StandardClasses standardClasses) { private static void declareKotlinStandardClasses(@NotNull StandardClasses standardClasses) {
standardClasses.declare().forFQ("jet.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext"); standardClasses.declare().forFQ("kotlin.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
standardClasses.declare().forFQ("jet.IntRange").kotlinClass("NumberRange") standardClasses.declare().forFQ("kotlin.IntRange").kotlinClass("NumberRange")
.methods("iterator", "contains").properties("start", "end", "increment"); .methods("iterator", "contains").properties("start", "end", "increment");
standardClasses.declare().forFQ("jet.IntProgression").kotlinClass("NumberProgression") standardClasses.declare().forFQ("kotlin.IntProgression").kotlinClass("NumberProgression")
.methods("iterator", "contains").properties("start", "end", "increment"); .methods("iterator", "contains").properties("start", "end", "increment");
standardClasses.declare().forFQ("jet.Enum").kotlinClass("Enum"); standardClasses.declare().forFQ("kotlin.Enum").kotlinClass("Enum");
} }
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
+1 -1
View File
@@ -26,7 +26,7 @@ public final class StringOperationFIF extends CompositeFIF {
public static final FunctionIntrinsicFactory INSTANCE = new StringOperationFIF(); public static final FunctionIntrinsicFactory INSTANCE = new StringOperationFIF();
private StringOperationFIF() { private StringOperationFIF() {
add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt")); add(pattern("kotlin", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC); add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC); add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC);
} }
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
+8 -8
View File
@@ -46,7 +46,7 @@ import static org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionInt
import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
public final class TopLevelFIF extends CompositeFIF { public final class TopLevelFIF extends CompositeFIF {
public static final DescriptorPredicate EQUALS_IN_ANY = pattern("jet", "Any", "equals"); public static final DescriptorPredicate EQUALS_IN_ANY = pattern("kotlin", "Any", "equals");
@NotNull @NotNull
public static final KotlinFunctionIntrinsic KOTLIN_EQUALS = new KotlinFunctionIntrinsic("equals"); public static final KotlinFunctionIntrinsic KOTLIN_EQUALS = new KotlinFunctionIntrinsic("equals");
@NotNull @NotNull
@@ -141,16 +141,16 @@ public final class TopLevelFIF extends CompositeFIF {
private TopLevelFIF() { private TopLevelFIF() {
add(EQUALS_IN_ANY, KOTLIN_EQUALS); add(EQUALS_IN_ANY, KOTLIN_EQUALS);
add(pattern("jet", "toString").receiverExists(), TO_STRING); add(pattern("kotlin", "toString").receiverExists(), TO_STRING);
add(pattern("jet", "equals").receiverExists(), KOTLIN_EQUALS); add(pattern("kotlin", "equals").receiverExists(), KOTLIN_EQUALS);
add(pattern("jet", "identityEquals").receiverExists(), IDENTITY_EQUALS); add(pattern("kotlin", "identityEquals").receiverExists(), IDENTITY_EQUALS);
add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), KOTLIN_EQUALS); add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), KOTLIN_EQUALS);
add(pattern("String|Boolean|Char|Number.equals"), KOTLIN_EQUALS); add(pattern("String|Boolean|Char|Number.equals"), KOTLIN_EQUALS);
add(pattern("jet", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray")); add(pattern("kotlin", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray"));
add(pattern("jet", "PropertyMetadataImpl", "<init>"), PROPERTY_METADATA_IMPL); add(pattern("kotlin", "PropertyMetadataImpl", "<init>"), PROPERTY_METADATA_IMPL);
add(pattern("jet", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC); add(pattern("kotlin", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC);
add(pattern("jet", "Map", "get").checkOverridden(), NATIVE_MAP_GET); add(pattern("kotlin", "Map", "get").checkOverridden(), NATIVE_MAP_GET);
add(pattern("js", "set").receiverExists(), NATIVE_MAP_SET); add(pattern("js", "set").receiverExists(), NATIVE_MAP_SET);
add(pattern("java.util", "HashMap", "<init>"), new MapSelectImplementationIntrinsic(false)); add(pattern("java.util", "HashMap", "<init>"), new MapSelectImplementationIntrinsic(false));
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+2 -2
View File
@@ -30,7 +30,7 @@ import java.util.List;
public final class PatternBuilder { public final class PatternBuilder {
@NotNull @NotNull
private static final NamePredicate JET = new NamePredicate("jet"); private static final NamePredicate KOTLIN_NAME_PREDICATE = new NamePredicate("kotlin");
@NotNull @NotNull
private static final Name KOTLIN_NAME = Name.identifier(Namer.KOTLIN_LOWER_NAME); private static final Name KOTLIN_NAME = Name.identifier(Namer.KOTLIN_LOWER_NAME);
@@ -74,7 +74,7 @@ public final class PatternBuilder {
assert !checkers.isEmpty(); assert !checkers.isEmpty();
final List<NamePredicate> checkersWithPrefixChecker = Lists.newArrayList(); final List<NamePredicate> checkersWithPrefixChecker = Lists.newArrayList();
if (!checkers.get(0).apply(KOTLIN_NAME)) { if (!checkers.get(0).apply(KOTLIN_NAME)) {
checkersWithPrefixChecker.add(JET); checkersWithPrefixChecker.add(KOTLIN_NAME_PREDICATE);
} }
checkersWithPrefixChecker.addAll(checkers); checkersWithPrefixChecker.addAll(checkers);
libraries/docs/apidoc/pom.xml
-1
View File
@@ -50,7 +50,6 @@
<ignorePackage>com</ignorePackage> <ignorePackage>com</ignorePackage>
<ignorePackage>sun</ignorePackage> <ignorePackage>sun</ignorePackage>
<ignorePackage>java</ignorePackage> <ignorePackage>java</ignorePackage>
<ignorePackage>jet</ignorePackage>
<ignorePackage>js</ignorePackage> <ignorePackage>js</ignorePackage>
<ignorePackage>junit</ignorePackage> <ignorePackage>junit</ignorePackage>
<ignorePackage>org</ignorePackage> <ignorePackage>org</ignorePackage>
libraries/docs/jsdoc/pom.xml
-1
View File
@@ -57,7 +57,6 @@
<ignorePackage>com</ignorePackage> <ignorePackage>com</ignorePackage>
<ignorePackage>sun</ignorePackage> <ignorePackage>sun</ignorePackage>
<ignorePackage>java</ignorePackage> <ignorePackage>java</ignorePackage>
<ignorePackage>jet</ignorePackage>
<ignorePackage>junit</ignorePackage> <ignorePackage>junit</ignorePackage>
<ignorePackage>org</ignorePackage> <ignorePackage>org</ignorePackage>
</ignorePackages> </ignorePackages>
libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
+1 -1
View File
@@ -3,8 +3,8 @@ package test.kotlin.jtests;
import static kotlin.KotlinPackage.*; import static kotlin.KotlinPackage.*;
import static kotlin.util.UtilPackage.*; import static kotlin.util.UtilPackage.*;
import jet.Function1;
import junit.framework.TestCase; import junit.framework.TestCase;
import kotlin.Function1;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package kotlin.jdbc
import java.sql.* import java.sql.*
// Workaround for an import clash // Workaround for an import clash
import jet.Array import kotlin.Array
/** /**
* Executes the specfied block with result set and then closes it * Executes the specfied block with result set and then closes it
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+1 -1
View File
@@ -760,7 +760,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate
// TODO really dirty hack alert!!! // TODO really dirty hack alert!!!
// until the resolver is working, lets try adding a few prefixes :) // until the resolver is working, lets try adding a few prefixes :)
for (prefix in arrayList("java.lang", "java.util", "java.util.concurrent", "java.util.regex", "java.io", for (prefix in arrayList("java.lang", "java.util", "java.util.concurrent", "java.util.regex", "java.io",
"jet", "java.awt", "java.awt.event", "java.sql", "java.beans", "java.awt", "java.awt.event", "java.sql", "java.beans",
"javax.swing", "javax.swing.event", "javax.swing", "javax.swing.event",
"org.w3c.dom", "org.w3c.dom",
"kotlin.template")) { "kotlin.template")) {
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
Vendored
+1 -1
View File
@@ -134,7 +134,7 @@ abstract class KDocTemplate() : TextTemplate() {
return if (c != null) { return if (c != null) {
val prefix = if (c.isAnnotation()) "@" else "" val prefix = if (c.isAnnotation()) "@" else ""
val cname = c.name val cname = c.name
if ((cname.startsWith("jet.Function") || cname.startsWith("jet.ExtensionFunction")) && arguments.isNotEmpty()) { if ((cname.startsWith("kotlin.Function") || cname.startsWith("kotlin.ExtensionFunction")) && arguments.isNotEmpty()) {
val rt = arguments.last() val rt = arguments.last()
// TODO use drop() // TODO use drop()
val rest = arguments.subList(0, arguments.size - 1).orEmpty() val rest = arguments.subList(0, arguments.size - 1).orEmpty()
libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
-1
View File
@@ -42,7 +42,6 @@ class KDocTest {
val ignorePackages = config.ignorePackages val ignorePackages = config.ignorePackages
ignorePackages.add("org.jetbrains.kotlin") ignorePackages.add("org.jetbrains.kotlin")
ignorePackages.add("java") ignorePackages.add("java")
ignorePackages.add("jet")
ignorePackages.add("junit") ignorePackages.add("junit")
ignorePackages.add("sun") ignorePackages.add("sun")
ignorePackages.add("org") ignorePackages.add("org")