From c6a040a380ea90b9a59ddb94e9363f0d1b21c0cd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 17 Sep 2012 14:28:21 +0400 Subject: [PATCH] Removed sure() function from built-ins. --- compiler/frontend/src/jet/Library.jet | 2 -- compiler/testData/builtin-classes.txt | 1 - .../namespaceComparatorWithJavaMerge/stdlib-log.txt | 1 - idea/testData/completion/handlers/SureInsert.kt | 3 --- idea/testData/completion/handlers/SureInsert.kt.after | 3 --- idea/testData/resolve/std/sure.kt | 2 -- .../jet/completion/handlers/CompletionHandlerTest.java | 4 ---- .../references/StandardLibraryReferenceResolverTest.java | 4 ---- .../org/jetbrains/k2js/translate/context/StandardClasses.java | 2 -- 9 files changed, 22 deletions(-) delete mode 100644 idea/testData/completion/handlers/SureInsert.kt delete mode 100644 idea/testData/completion/handlers/SureInsert.kt.after delete mode 100644 idea/testData/resolve/std/sure.kt diff --git a/compiler/frontend/src/jet/Library.jet b/compiler/frontend/src/jet/Library.jet index b132b00d588..93643bba20e 100644 --- a/compiler/frontend/src/jet/Library.jet +++ b/compiler/frontend/src/jet/Library.jet @@ -16,8 +16,6 @@ public fun Any?.equals(other : Any?) : Boolean// = this === other // Returns "null" for null public fun Any?.toString() : String// = this === other -public fun T?.sure() : T - public fun String?.plus(other: Any?) : String public trait Comparable { diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index f4994d4f308..ae5d0a19483 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1466,6 +1466,5 @@ public final fun jet.Iterator.iterator(): jet.Iterator public final fun jet.LongIterator.iterator(): jet.LongIterator public final fun jet.ShortIterator.iterator(): jet.ShortIterator public final fun jet.String?.plus(/*0*/ other: jet.Any?): jet.String -public final fun T?.sure(): T public final fun synchronized(/*0*/ lock: jet.Any, /*1*/ block: jet.Function0): R public final fun jet.Any?.toString(): jet.String diff --git a/compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt b/compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt index 11513f97feb..4603e755d0e 100644 --- a/compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt +++ b/compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt @@ -1378,7 +1378,6 @@ public final fun jet.Iterator.iterator(): jet.Iterator public final fun jet.LongIterator.iterator(): jet.LongIterator public final fun jet.ShortIterator.iterator(): jet.ShortIterator public final fun jet.String?.plus(/*0*/ other: jet.Any?): jet.String -public final fun T?.sure(): T public final fun synchronized(/*0*/ lock: jet.Any, /*1*/ block: jet.Function0): R public final fun jet.Any?.toString(): jet.String // diff --git a/idea/testData/completion/handlers/SureInsert.kt b/idea/testData/completion/handlers/SureInsert.kt deleted file mode 100644 index 0daa1455f68..00000000000 --- a/idea/testData/completion/handlers/SureInsert.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args : Array) { - "".sur -} \ No newline at end of file diff --git a/idea/testData/completion/handlers/SureInsert.kt.after b/idea/testData/completion/handlers/SureInsert.kt.after deleted file mode 100644 index dc4a19cc514..00000000000 --- a/idea/testData/completion/handlers/SureInsert.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args : Array) { - "".sure() -} \ No newline at end of file diff --git a/idea/testData/resolve/std/sure.kt b/idea/testData/resolve/std/sure.kt deleted file mode 100644 index e6f03137c38..00000000000 --- a/idea/testData/resolve/std/sure.kt +++ /dev/null @@ -1,2 +0,0 @@ -val x = 5.sure() -//jet/Library.jet:sure \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java index 8d08c5db676..0be2e25cd40 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java @@ -68,10 +68,6 @@ public class CompletionHandlerTest extends LightCompletionTestCase { doTest(); } - public void testSureInsert() { - doTest(); - } - public void testHigherOrderFunction() { doTest(); } diff --git a/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java index 7365213c9d5..324235e7553 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java @@ -51,10 +51,6 @@ public class StandardLibraryReferenceResolverTest extends ResolveTestCase { doTest(); } - public void testSure() throws Exception { - doTest(); - } - public void testTimes() throws Exception { doTest(); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java index ee81cae0fc2..466c23be6a1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java @@ -105,8 +105,6 @@ public final class StandardClasses { standardClasses.declare().forFQ("jet.IntRange").kotlinClass("NumberRange") .methods("iterator", "contains").properties("start", "size", "end", "reversed"); - standardClasses.declare().forFQ("jet.sure").kotlinFunction("sure"); - standardClasses.declare().forFQ("jet.Any.toString").kotlinFunction("toString"); standardClasses.declare().forFQ("java.util.Collections..max").kotlinFunction("collectionsMax");