From eb3aac9acb24dcf65da432414a9f9c615fec585f Mon Sep 17 00:00:00 2001 From: James Strachan Date: Sat, 3 Mar 2012 12:11:06 +0000 Subject: [PATCH] refactored std.* package to be kotlin.*. Due to KT-1381 I had to move the functions from kotlin.test into the stdlib for now (I made them not depend on JUnit for now) --- build-tools/test/compilation-fail/Bottles.kt | 4 +- build-tools/test/longer-examples/Bottles.kt | 2 +- build.xml | 2 +- .../jet/codegen/GenerationState.java | 2 +- .../codegen/intrinsics/IntrinsicMethods.java | 2 +- .../org/jetbrains/jet/cli/KotlinCompiler.java | 7 ++ .../jet/lang/StandardConfiguration.java | 2 +- .../testData/codegen/regressions/kt1406.kt | 2 +- .../testData/codegen/regressions/kt274.kt | 2 +- .../testData/codegen/regressions/kt529.kt | 4 +- .../testData/codegen/regressions/kt715.kt | 2 +- .../testData/codegen/regressions/kt789.jet | 2 +- .../testData/codegen/regressions/kt864.jet | 2 +- .../tests/alt-headers/ArrayListAndMap.jet | 2 +- .../tests/alt-headers/ArrayListClone.jet | 2 +- .../tests/alt-headers/ArrayListToArray.jet | 2 +- .../diagnostics/tests/regressions/kt524.jet | 2 +- .../diagnostics/tests/regressions/kt860.jet | 2 +- compiler/testData/resolve/Basic.jet | 16 ++-- compiler/testData/resolve/ErrorSupertype.jet | 4 +- .../testData/resolve/ExtensionFunctions.jet | 4 +- .../testData/resolve/PrimaryConstructors.jet | 6 +- compiler/testData/resolve/Projections.jet | 2 +- .../resolve/ResolveOfInfixExpressions.jet | 18 ++-- compiler/testData/resolve/ResolveToJava.jet | 8 +- compiler/testData/resolve/ResolveToJava3.jet | 2 +- .../resolve/ResolveToJavaTypeTransform.jet | 2 +- .../jet/resolve/ExpectedResolveData.java | 11 ++- .../jetbrains/jet/resolve/JetResolveTest.java | 10 +-- .../BigDecimalSolution.kt | 2 +- .../_03_Long_Division/LongDivision.kt | 2 +- .../_03_Long_Division/LongDivisionSolution.kt | 2 +- .../_04_Elementary/Elementary.kt | 2 +- .../_02_expressive/_06_Multicast/Multicast.kt | 2 +- .../_07_Swap_Meat/CleverSwap.kt | 2 +- .../_02_expressive/_08_Dos_Equis/DosEquis.kt | 2 +- .../_11_The_Last_Laugh/LastLaugh.kt | 2 +- .../_13_Animal_Farm/AnimalFarm.kt | 4 +- .../_14_Escape_Rout/EscapeRout.kt | 4 +- .../_03_character/_15_Hello_Whirled/Test.kt | 4 +- .../_16_Line_Printer/LinePrinter.kt | 4 +- .../_03_character/_20_Whats_My_Class/Me.kt | 6 +- .../_21_Whats_My_Class_Take_2/MeToo.kt | 6 +- .../_23_No_Pain_No_Gain/Rhymes.kt | 2 +- .../BigDelight.kt | 2 +- .../_04_loopy/_25_In_the_Loop/InTheLoop.kt | 2 +- .../_31_Ghost_of_Looper/GhostOfLooper.kt | 2 +- .../_32_Curse_of_Looper/CurseOfLooper.kt | 2 +- .../_04_loopy/_34_Down_for_the_Count/Count.kt | 2 +- .../_36_Indecision/Indecisive.kt | 2 +- .../_38_Unwelcome_Guest/UnwelcomeGuest.kt | 2 +- .../Reluctant.kt | 2 +- .../_42_Thrown_for_a_Loop/Loop.kt | 4 +- .../_06_classy/_47_Well_Dog_My_Cats/Ruckus.kt | 4 +- .../_48_All_I_Get_Is_Static/Bark.kt | 4 +- .../_06_classy/_53_Do_Your_Thing/MyThing.kt | 4 +- .../src/_06_classy/_54_Null_and_Void/Null.kt | 4 +- .../src/_06_classy/_55_Creationism/Creator.kt | 4 +- .../_07_library/_56_Big_Problem/BigProblem.kt | 4 +- .../_59_Whats_the_Difference/Differences.kt | 4 +- examples/example-vfs/src/FileSystem.kt | 4 +- examples/example-vfs/src/RefreshQueue.kt | 4 +- examples/example-vfs/src/Utils.kt | 2 +- examples/example-vfs/src/VirtualFile.kt | 2 +- examples/src/actors/src/Actors.kt | 4 +- examples/src/actors/src/Messages.kt | 2 +- examples/src/actors/src/StatCalculator.kt | 2 +- examples/src/actors/src/Stock.kt | 2 +- examples/src/actors/src/StockServer.kt | 2 +- examples/src/actors/src/StockServerShard.kt | 2 +- .../src/benchmarks/src/lockperf/LockPerf.kt | 6 +- examples/src/luhny/solution.kt | 2 +- .../quickfix/ImportClassHelperTest.java | 2 +- j2k/src/org/jetbrains/jet/j2k/Converter.java | 2 +- .../testData/ast/file/comp/intNullability.kt | 2 +- .../testFiles/stdlib/cases/Filter.kt | 2 +- .../kotlin/doc/JavadocStyleHtmlDoclet.kt | 4 +- .../kotlin/org/jetbrains/kotlin/doc/KDoc.kt | 4 +- .../doc/templates/AllClassesFrameTemplate.kt | 6 +- .../doc/templates/ClassExtensionsTemplate.kt | 6 +- .../kotlin/doc/templates/ClassTemplate.kt | 6 +- .../kotlin/doc/templates/HelpDocTemplate.kt | 6 +- .../kotlin/doc/templates/IndexTemplate.kt | 6 +- .../kotlin/doc/templates/KDocTemplate.kt | 4 +- .../doc/templates/OverviewFrameTemplate.kt | 6 +- .../doc/templates/OverviewSummaryTemplate.kt | 6 +- .../doc/templates/OverviewTreeTemplate.kt | 6 +- .../doc/templates/PackageFrameTemplate.kt | 6 +- .../doc/templates/PackageListTemplate.kt | 6 +- .../doc/templates/PackageSummaryTemplate.kt | 6 +- .../doc/templates/PackageTemplateSupport.kt | 6 +- .../kotlin/model/KModelCompilerPlugin.kt | 4 +- .../org/jetbrains/kotlin/model/KotlinModel.kt | 8 +- .../jetbrains/kotlin/template/TemplateCore.kt | 2 +- .../test/kotlin/template/TemplateCoreTest.kt | 6 +- kunit/kunit.iml | 11 ++- kunit/src/main/kotlin/TestSupport.kt | 10 +++ kunit/src/main/kotlin/junit/JUnit.kt | 26 ++++++ runtests/runtests.iml | 1 + .../stdlib/testall/CollectionTestAllTest.java | 2 +- .../test/stdlib/testall/DomTestAllTest.java | 2 +- .../stdlib/testall/LanguageTestAllTest.java | 2 +- .../stdlib/testall/PropertiesAllTest.java | 2 +- runtests/test/stdlib/testall/TestAll.java | 2 +- stdlib/ktSrc/Arrays.kt | 2 +- stdlib/ktSrc/Filter.kt | 2 +- stdlib/ktSrc/Integer.kt | 2 +- stdlib/ktSrc/Iterators.kt | 2 +- stdlib/ktSrc/JavaCollections.kt | 2 +- stdlib/ktSrc/JavaIo.kt | 2 +- stdlib/ktSrc/JavaIterables.kt | 2 +- stdlib/ktSrc/JavaIterablesSpecial.kt | 4 +- stdlib/ktSrc/JavaLang.kt | 6 +- stdlib/ktSrc/JavaMath.kt | 2 +- stdlib/ktSrc/JavaUtil.kt | 2 +- stdlib/ktSrc/JavaUtilMap.kt | 2 +- stdlib/ktSrc/Standard.kt | 2 +- stdlib/ktSrc/String.kt | 2 +- stdlib/ktSrc/System.kt | 2 +- stdlib/ktSrc/concurrent/FunctionalList.kt | 2 +- stdlib/ktSrc/concurrent/FunctionalQueue.kt | 2 +- stdlib/ktSrc/concurrent/Locks.kt | 2 +- stdlib/ktSrc/concurrent/Thread.kt | 2 +- stdlib/ktSrc/concurrent/Timer.kt | 2 +- stdlib/ktSrc/dom/Dom.kt | 6 +- stdlib/ktSrc/dom/DomJVM.kt | 2 +- .../generated/ArraysFromJavaCollections.kt | 2 +- .../generated/ArraysFromJavaIterables.kt | 4 +- .../JavaUtilIterablesFromJavaCollections.kt | 2 +- .../generated/StandardFromJavaCollections.kt | 2 +- .../generated/StandardFromJavaIterables.kt | 4 +- stdlib/ktSrc/properties/Properties.kt | 6 +- .../main/kotlin => stdlib/ktSrc/test}/Test.kt | 85 ++++++++++++++++--- templatelib/src/TemplateCore.kt | 4 +- templatelib/src/TemplateHtml.kt | 10 +-- templatelib/src/TemplateJavaIo.kt | 4 +- templatelib/test/TemplateCoreTest.kt | 12 +-- templatelib/test/TemplateHtmlTest.kt | 14 +-- .../test/std/template/TemplateTestAll.java | 4 +- testlib/test/CollectionApiCheck.kt | 2 +- testlib/test/CollectionTest.kt | 9 +- testlib/test/GenerateStandardLib.kt | 18 ++-- testlib/test/GetOrElseTest.kt | 5 +- testlib/test/IoTest.kt | 7 +- testlib/test/JavaClassTest.kt | 3 +- testlib/test/ListTest.kt | 9 +- testlib/test/MapTest.kt | 9 +- testlib/test/MathTest.kt | 5 +- testlib/test/OldStdlibTest.kt | 9 +- testlib/test/SetTest.kt | 9 +- testlib/test/StandardCollectionTest.kt | 7 +- testlib/test/StdLibIssuesTest.kt | 5 +- testlib/test/StringTest.kt | 2 +- testlib/test/Test.kt | 9 +- testlib/test/TestDslExample.kt | 4 +- testlib/test/concurrent/FListTest.kt | 2 +- testlib/test/dom/DomBuilderTest.kt | 9 +- testlib/test/dom/DomTest.kt | 7 +- testlib/test/properties/PropertiesTest.kt | 6 +- testlib/test/regressions/Kt1149.kt | 2 +- testlib/test/regressions/kt1172.kt | 2 +- testlib/testlib.iml | 5 +- 162 files changed, 454 insertions(+), 324 deletions(-) create mode 100644 kunit/src/main/kotlin/TestSupport.kt create mode 100644 kunit/src/main/kotlin/junit/JUnit.kt rename {kunit/src/main/kotlin => stdlib/ktSrc/test}/Test.kt (58%) diff --git a/build-tools/test/compilation-fail/Bottles.kt b/build-tools/test/compilation-fail/Bottles.kt index 7e2e0f02c99..3224e5fc901 100644 --- a/build-tools/test/compilation-fail/Bottles.kt +++ b/build-tools/test/compilation-fail/Bottles.kt @@ -48,12 +48,12 @@ fun bottlesOfBeer(count : Int) : String = * An excerpt from the Standard Library */ -// From the std.io package +// From the kotlin.io package // These are simple functions that wrap standard Java API calls fun print(message : String) { System.out?.print(message) } fun println(message : String) { System.out?.println(message) } -// From the std package +// From the kotlin package // This is an extension property, i.e. a property that is defined for the // type Array, but does not sit inside the class Array val Array.isEmpty : Boolean get() = size == 0 diff --git a/build-tools/test/longer-examples/Bottles.kt b/build-tools/test/longer-examples/Bottles.kt index aec2e41c0e7..053b8ca0731 100644 --- a/build-tools/test/longer-examples/Bottles.kt +++ b/build-tools/test/longer-examples/Bottles.kt @@ -74,7 +74,7 @@ fun bottlesOfBeer(count : Int) : String = */ -// From the std package +// From the kotlin package // This is an extension property, i.e. a property that is defined for the // type Array, but does not sit inside the class Array val Array.isEmpty : Boolean get() = size == 0 diff --git a/build.xml b/build.xml index 43bd9ea83d9..55b2e90f42c 100644 --- a/build.xml +++ b/build.xml @@ -153,7 +153,7 @@ - + diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java index 210197ec257..b15081a2d4b 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java @@ -182,7 +182,7 @@ public class GenerationState { final ClassFileFactory factory = getFactory(); List files = factory.files(); for (String file : files) { -// if (!file.startsWith("std/")) { +// if (!file.startsWith("kotlin/")) { answer.append("@").append(file).append('\n'); answer.append(factory.asText(file)); // } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java index 532862d60a3..6b9f38f9ad0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -72,7 +72,7 @@ public class IntrinsicMethods { myProject = project; myStdLib = stdlib; - namedMethods.put("\"std.javaClass.function\"", new JavaClassFunction()); + namedMethods.put("\"kotlin.javaClass.function\"", new JavaClassFunction()); List primitiveCastMethods = OperatorConventions.NUMBER_CONVERSIONS.asList(); for (String method : primitiveCastMethods) { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java index 427200ba63e..a07fdba3fa9 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java @@ -56,6 +56,9 @@ public class KotlinCompiler { @Argument(value = "module", description = "module to compile") public String module; + @Argument(value = "classpath", description = "classpath to use when compiling") + public String classpath; + @Argument(value = "includeRuntime", description = "include Kotlin runtime in to resulting jar") public boolean includeRuntime; @@ -140,6 +143,10 @@ public class KotlinCompiler { environment.setStdlib(arguments.stdlib); } + if (arguments.classpath != null) { + environment.addToClasspath(arguments.classpath); + } + boolean ok; if (arguments.module != null) { ok = environment.compileModuleScript(arguments.module, arguments.jar, arguments.outputDir, arguments.includeRuntime); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java index 2dfe2c23776..cc5b0ab145d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope; * @author svtk */ public class StandardConfiguration implements Configuration { - public static final String[] DEFAULT_JET_IMPORTS = new String[] { "std.*", "std.io.*" }; + public static final String[] DEFAULT_JET_IMPORTS = new String[] { "kotlin.*", "kotlin.io.*" }; private Project project; diff --git a/compiler/testData/codegen/regressions/kt1406.kt b/compiler/testData/codegen/regressions/kt1406.kt index 092b8fb7c24..1334ab1ebad 100644 --- a/compiler/testData/codegen/regressions/kt1406.kt +++ b/compiler/testData/codegen/regressions/kt1406.kt @@ -4,7 +4,7 @@ import java.util.Collection import java.util.ArrayList import java.util.regex.Pattern -import std.util.* +import kotlin.util.* class C{ public fun foo(){ diff --git a/compiler/testData/codegen/regressions/kt274.kt b/compiler/testData/codegen/regressions/kt274.kt index f1c439758e8..8645dc33dab 100644 --- a/compiler/testData/codegen/regressions/kt274.kt +++ b/compiler/testData/codegen/regressions/kt274.kt @@ -1,4 +1,4 @@ -import std.* +import kotlin.* fun box() : String { val vector = java.util.Vector() diff --git a/compiler/testData/codegen/regressions/kt529.kt b/compiler/testData/codegen/regressions/kt529.kt index ba5d7464b33..9f6e87e1334 100644 --- a/compiler/testData/codegen/regressions/kt529.kt +++ b/compiler/testData/codegen/regressions/kt529.kt @@ -78,10 +78,10 @@ class Luhny() { private fun print(c : Char) { if (c.isDigit() && toBeMasked > 0) { - std.io.print('X') + kotlin.io.print('X') toBeMasked-- } else { - std.io.print(c) + kotlin.io.print(c) } } } diff --git a/compiler/testData/codegen/regressions/kt715.kt b/compiler/testData/codegen/regressions/kt715.kt index 9c65d8b9698..3d5de9a0a3e 100644 --- a/compiler/testData/codegen/regressions/kt715.kt +++ b/compiler/testData/codegen/regressions/kt715.kt @@ -1,4 +1,4 @@ -import std.* +import kotlin.* val test = "lala".javaClass diff --git a/compiler/testData/codegen/regressions/kt789.jet b/compiler/testData/codegen/regressions/kt789.jet index 79014973767..13caeb84569 100644 --- a/compiler/testData/codegen/regressions/kt789.jet +++ b/compiler/testData/codegen/regressions/kt789.jet @@ -2,7 +2,7 @@ package foo import java.util.*; -import std.util.* +import kotlin.util.* fun box() : String { val a = ArrayList(); diff --git a/compiler/testData/codegen/regressions/kt864.jet b/compiler/testData/codegen/regressions/kt864.jet index 6771b2eb2cf..094e1159271 100644 --- a/compiler/testData/codegen/regressions/kt864.jet +++ b/compiler/testData/codegen/regressions/kt864.jet @@ -1,4 +1,4 @@ -import std.util.* +import kotlin.util.* import java.io.* import java.util.* diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet b/compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet index 0d16696dd45..d5d2a7bdeef 100644 --- a/compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet +++ b/compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet @@ -1,6 +1,6 @@ // +JDK -package std1 +package kotlin1 import java.util.* diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet b/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet index 190c6241227..85970377c28 100644 --- a/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet +++ b/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet @@ -1,6 +1,6 @@ // +JDK -package std1 +package kotlin1 import java.util.* diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet b/compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet index ba8dede4330..c35cd5d365a 100644 --- a/compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet +++ b/compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet @@ -1,6 +1,6 @@ // +JDK -package std1 +package kotlin1 import java.util.* diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.jet b/compiler/testData/diagnostics/tests/regressions/kt524.jet index f4da82809a4..38988714802 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt524.jet +++ b/compiler/testData/diagnostics/tests/regressions/kt524.jet @@ -5,7 +5,7 @@ package StringBuilder import java.lang.StringBuilder -//import std.io.* +//import kotlin.io.* //import java.io.* fun main(args : Array) { diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.jet b/compiler/testData/diagnostics/tests/regressions/kt860.jet index 4f01757e730..75b040d5985 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt860.jet +++ b/compiler/testData/diagnostics/tests/regressions/kt860.jet @@ -1,7 +1,7 @@ // KT-860 ConcurrentModificationException in frontend // +JDK -package std.util +package kotlin.util import java.util.* diff --git a/compiler/testData/resolve/Basic.jet b/compiler/testData/resolve/Basic.jet index ea9e8c4a5ff..74f3a8c647a 100644 --- a/compiler/testData/resolve/Basic.jet +++ b/compiler/testData/resolve/Basic.jet @@ -3,11 +3,11 @@ ~B()~this(i: Int) {} } - ~foo~fun foo(~foo.a~a : `std::Char`Char) = `foo.a`a`:std::Char` - ~fooB~fun fooB() = `foo`foo('1')`:std::Char` - ~foo.1~fun foo() : Int = (1.`std::Int.plus(Int)`plus(1))`:std::Int` + ~foo~fun foo(~foo.a~a : `kotlin::Char`Char) = `foo.a`a`:kotlin::Char` + ~fooB~fun fooB() = `foo`foo('1')`:kotlin::Char` + ~foo.1~fun foo() : Int = (1.`kotlin::Int.plus(Int)`plus(1))`:kotlin::Int` ~foo1~fun foo1() : `B`B = `B`B()`:B` - ~A.a~val a : `std::Int`Int + ~A.a~val a : `kotlin::Int`Int } ~C~class C : `A`A { @@ -20,16 +20,16 @@ fun test() : Unit { for (~i~i in 1..2) { - `i`i`:std::Int` + `i`i`:kotlin::Int` } for (val ~j~j in 1..2) { - `j`j`:std::Int` + `j`j`:kotlin::Int` } for (val ~k~k : Int in 1..2) { - `k`k`:std::Int` + `k`k`:kotlin::Int` } for (~l~l : Int in 1..2) { - `l`l`:std::Int` + `l`l`:kotlin::Int` while (true) { `l`l } diff --git a/compiler/testData/resolve/ErrorSupertype.jet b/compiler/testData/resolve/ErrorSupertype.jet index c1395fb8d1a..cf1cbeb3a6d 100644 --- a/compiler/testData/resolve/ErrorSupertype.jet +++ b/compiler/testData/resolve/ErrorSupertype.jet @@ -1,3 +1,3 @@ -class C(x : `std::Int`Int) : NotFound { - val xx : `std::Int`Int +class C(x : `kotlin::Int`Int) : NotFound { + val xx : `kotlin::Int`Int } \ No newline at end of file diff --git a/compiler/testData/resolve/ExtensionFunctions.jet b/compiler/testData/resolve/ExtensionFunctions.jet index 73d2ac45cfc..19f490db5c6 100644 --- a/compiler/testData/resolve/ExtensionFunctions.jet +++ b/compiler/testData/resolve/ExtensionFunctions.jet @@ -28,8 +28,8 @@ fun test() { val y = 1.`abs`abs } ~abs~val Int.abs : Int - get() = if (this`:std::Int` > 0) this else -this`:std::Int`; + get() = if (this`:kotlin::Int` > 0) this else -this`:kotlin::Int`; val <~TT~T> `TT`T.foo : `TT`T -~foo~fun Int.foo() = this`:std::Int` \ No newline at end of file +~foo~fun Int.foo() = this`:kotlin::Int` \ No newline at end of file diff --git a/compiler/testData/resolve/PrimaryConstructors.jet b/compiler/testData/resolve/PrimaryConstructors.jet index 99b37ac6c76..72e3e71fca6 100644 --- a/compiler/testData/resolve/PrimaryConstructors.jet +++ b/compiler/testData/resolve/PrimaryConstructors.jet @@ -6,9 +6,9 @@ class A(~a~val a : Int) { fun test() { ~va~val a = A() - `va`a.`$a`a`:std::Int` - a.`b`b`:std::Int` - a.`f`f()`:std::Int` + `va`a.`$a`a`:kotlin::Int` + a.`b`b`:kotlin::Int` + a.`f`f()`:kotlin::Int` } package Jet65 { diff --git a/compiler/testData/resolve/Projections.jet b/compiler/testData/resolve/Projections.jet index 65a2de5aab9..36e50736a23 100644 --- a/compiler/testData/resolve/Projections.jet +++ b/compiler/testData/resolve/Projections.jet @@ -48,7 +48,7 @@ fun testInOut() { (return : Inv<*>).`!`inf(1) Inv().`Inv.outf`outf() - ((return : Inv).`Inv.outf`outf())`:std::Any` + ((return : Inv).`Inv.outf`outf())`:kotlin::Any` (return : Inv).`Inv.outf`outf() (return : Inv<*>).`Inv.outf`outf() diff --git a/compiler/testData/resolve/ResolveOfInfixExpressions.jet b/compiler/testData/resolve/ResolveOfInfixExpressions.jet index 2298f7d0034..b250db32e22 100644 --- a/compiler/testData/resolve/ResolveOfInfixExpressions.jet +++ b/compiler/testData/resolve/ResolveOfInfixExpressions.jet @@ -3,7 +3,7 @@ import java.util.* fun f_plus(): Int { var x: Int = 1 - x = x `std::Int.plus(Int)`+ 1 + x = x `kotlin::Int.plus(Int)`+ 1 return x } @@ -20,11 +20,11 @@ fun f_plus(): Int { } ~t~fun <~t.T~T> t(~t.t~t : `t.T`T) : `t.T`T { - `t`t(1)`:std::Int` + `t`t(1)`:kotlin::Int` `t`t<`t.T`T>(`t.t`t)`:t.T` `X`X<`t.T`T>() - 1 `std::Int.plus(Int)`+ 1 - 1 `std::Int.plus(Int)`+= 1 + 1 `kotlin::Int.plus(Int)`+ 1 + 1 `kotlin::Int.plus(Int)`+= 1 X() `plus`+ "1" X() `plus`plus "sadfas" X().`plus`plus("") @@ -69,7 +69,7 @@ fun tt(t : T) : T { (x`java::java.util.List.set()`[1]) = null x`java::java.util.List.set()`[null] = null (x`java::java.util.List.set()`[null, 2]) = null - (`not`!foo)[1]`:std::Char` + (`not`!foo)[1]`:kotlin::Char` val y = Bar() y`inc`++ `inc`++y @@ -78,10 +78,10 @@ fun tt(t : T) : T { y `+=`+= 1 `+`+y `-`-y - 1 `std::Int.compareTo(Double)`> 2.0 - 1 `std::Int.compareTo(Double)`< 2.0 - 1 `std::Int.compareTo(Double)`>= 2.0 - 1 `std::Int.compareTo(Double)`<= 2.0 + 1 `kotlin::Int.compareTo(Double)`> 2.0 + 1 `kotlin::Int.compareTo(Double)`< 2.0 + 1 `kotlin::Int.compareTo(Double)`>= 2.0 + 1 `kotlin::Int.compareTo(Double)`<= 2.0 } diff --git a/compiler/testData/resolve/ResolveToJava.jet b/compiler/testData/resolve/ResolveToJava.jet index 807f1d4bc0b..66f1b26670b 100644 --- a/compiler/testData/resolve/ResolveToJava.jet +++ b/compiler/testData/resolve/ResolveToJava.jet @@ -1,9 +1,9 @@ import `java::java`java.* import java.`java::java.util`util.* -fun foo(~a~a : `std::Array`Array<`std::Int`Int>) : `java::java.util.List`List { - `a`a.`std::Array.get(Int)`get(1) - `a`a.`std::Array.set(Int, Int)`set(1, 1) +fun foo(~a~a : `kotlin::Array`Array<`kotlin::Int`Int>) : `java::java.util.List`List { + `a`a.`kotlin::Array.get(Int)`get(1) + `a`a.`kotlin::Array.set(Int, Int)`set(1, 1) } fun foo(o : `java::java.lang.Object`Object, l : `java::java.util`util.`java::java.util.List`List) : `java::java.util.List`List {} @@ -27,7 +27,7 @@ class B : `java::java.lang.Object`Object { `java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList() } - fun barrr() : `std::Int`Int { + fun barrr() : `kotlin::Int`Int { `foo`foo(`A`A()) } } diff --git a/compiler/testData/resolve/ResolveToJava3.jet b/compiler/testData/resolve/ResolveToJava3.jet index 105bd77bca1..e928c032b61 100644 --- a/compiler/testData/resolve/ResolveToJava3.jet +++ b/compiler/testData/resolve/ResolveToJava3.jet @@ -3,6 +3,6 @@ import java.`java::java.util`util.* class B : `java::java.lang.Object`Object { fun bar(~o~o : `java::java.lang.Object`Object) { - `java::java.lang.System`System.`java::java.lang.System.out`out.`java::java.io.PrintStream.print(Object)`print(`o`o)`:std::Unit` + `java::java.lang.System`System.`java::java.lang.System.out`out.`java::java.io.PrintStream.print(Object)`print(`o`o)`:kotlin::Unit` } } diff --git a/compiler/testData/resolve/ResolveToJavaTypeTransform.jet b/compiler/testData/resolve/ResolveToJavaTypeTransform.jet index e51f899bdaa..750a8f1f6fa 100644 --- a/compiler/testData/resolve/ResolveToJavaTypeTransform.jet +++ b/compiler/testData/resolve/ResolveToJavaTypeTransform.jet @@ -2,5 +2,5 @@ import `java::java`java.* import java.`java::java.util`util.* fun typeTransform() { - Integer.getInteger("", 239)`:std::Int` + Integer.getInteger("", 239)`:kotlin::Int` } diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 61af96eacbc..775ed096a06 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -53,6 +53,8 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; */ public abstract class ExpectedResolveData { + protected static final String STANDARD_PREFIX = "kotlin::"; + private static class Position { private final PsiElement element; @@ -212,7 +214,7 @@ public abstract class ExpectedResolveData { } JetReferenceExpression reference = getAncestorOfType(JetReferenceExpression.class, element); - if (expected == null && name.startsWith("std::")) { + if (expected == null && name.startsWith(STANDARD_PREFIX)) { DeclarationDescriptor expectedDescriptor = nameToDescriptor.get(name); JetTypeReference typeReference = getAncestorOfType(JetTypeReference.class, element); if (expectedDescriptor != null) { @@ -225,7 +227,7 @@ public abstract class ExpectedResolveData { JetType actualType = bindingContext.get(BindingContext.TYPE, typeReference); assertNotNull("Type " + name + " not resolved for reference " + name, actualType); - ClassifierDescriptor expectedClass = lib.getLibraryScope().getClassifier(name.substring(5)); + ClassifierDescriptor expectedClass = lib.getLibraryScope().getClassifier(name.substring(STANDARD_PREFIX.length())); assertNotNull("Expected class not found: " + name); assertSame("Type resolution mismatch: ", expectedClass.getTypeConstructor(), actualType.getConstructor()); continue; @@ -282,8 +284,9 @@ public abstract class ExpectedResolveData { JetType expressionType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression); TypeConstructor expectedTypeConstructor; - if (typeName.startsWith("std::")) { - ClassifierDescriptor expectedClass = lib.getLibraryScope().getClassifier(typeName.substring(5)); + if (typeName.startsWith(STANDARD_PREFIX)) { + String name = typeName.substring(STANDARD_PREFIX.length()); + ClassifierDescriptor expectedClass = lib.getLibraryScope().getClassifier(name); assertNotNull("Expected class not found: " + typeName, expectedClass); expectedTypeConstructor = expectedClass.getTypeConstructor(); diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index 72ec2fecbac..55b49c3342e 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -64,13 +64,13 @@ public class JetResolveTest extends ExtensibleResolveTestCase { Project project = getProject(); JetStandardLibrary lib = JetStandardLibrary.getInstance(); Map nameToDescriptor = new HashMap(); - nameToDescriptor.put("std::Int.plus(Int)", standardFunction(lib.getInt(), "plus", lib.getIntType())); + nameToDescriptor.put("kotlin::Int.plus(Int)", standardFunction(lib.getInt(), "plus", lib.getIntType())); FunctionDescriptor descriptorForGet = standardFunction(lib.getArray(), Collections.singletonList(new TypeProjection(lib.getIntType())), "get", lib.getIntType()); - nameToDescriptor.put("std::Array.get(Int)", descriptorForGet.getOriginal()); - nameToDescriptor.put("std::Int.compareTo(Double)", standardFunction(lib.getInt(), "compareTo", lib.getDoubleType())); + nameToDescriptor.put("kotlin::Array.get(Int)", descriptorForGet.getOriginal()); + nameToDescriptor.put("kotlin::Int.compareTo(Double)", standardFunction(lib.getInt(), "compareTo", lib.getDoubleType())); @NotNull FunctionDescriptor descriptorForSet = standardFunction(lib.getArray(), Collections.singletonList(new TypeProjection(lib.getIntType())), "set", lib.getIntType(), lib.getIntType()); - nameToDescriptor.put("std::Array.set(Int, Int)", descriptorForSet.getOriginal()); + nameToDescriptor.put("kotlin::Array.set(Int, Int)", descriptorForSet.getOriginal()); Map nameToDeclaration = new HashMap(); PsiClass java_util_Collections = findClass("java.util.Collections"); @@ -147,7 +147,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { } } } - throw new IllegalArgumentException("Not found: std::" + classDescriptor.getName() + "." + name + "(" + parameterTypeList + ")"); + throw new IllegalArgumentException("Not found: kotlin::" + classDescriptor.getName() + "." + name + "(" + parameterTypeList + ")"); } @Override diff --git a/docs/exPuzzlers/src/_02_expressive/_02_Time_for_a_Change/BigDecimalSolution.kt b/docs/exPuzzlers/src/_02_expressive/_02_Time_for_a_Change/BigDecimalSolution.kt index 11c717e56c6..e01d247c9e4 100644 --- a/docs/exPuzzlers/src/_02_expressive/_02_Time_for_a_Change/BigDecimalSolution.kt +++ b/docs/exPuzzlers/src/_02_expressive/_02_Time_for_a_Change/BigDecimalSolution.kt @@ -1,7 +1,7 @@ namespace change import java.math.BigDecimal -import std.io.* +import kotlin.io.* fun main(args : Array) { // Easy to make BigDecimals user-friendly diff --git a/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivision.kt b/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivision.kt index 171d3e21945..bf4812daca9 100644 --- a/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivision.kt +++ b/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivision.kt @@ -1,6 +1,6 @@ namespace long.division -import std.io.* +import kotlin.io.* fun main(args : Array) { // Problematic case does not compile diff --git a/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivisionSolution.kt b/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivisionSolution.kt index bbb969f17ba..ebe4a17cc34 100644 --- a/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivisionSolution.kt +++ b/docs/exPuzzlers/src/_02_expressive/_03_Long_Division/LongDivisionSolution.kt @@ -1,6 +1,6 @@ namespace long.division.solution -import std.io.* +import kotlin.io.* fun main(args : Array) { val MICROS_PER_DAY : Long = 24.toLong() * 60 * 60 * 1000 * 1000; diff --git a/docs/exPuzzlers/src/_02_expressive/_04_Elementary/Elementary.kt b/docs/exPuzzlers/src/_02_expressive/_04_Elementary/Elementary.kt index 317b82acd09..b382a406e74 100644 --- a/docs/exPuzzlers/src/_02_expressive/_04_Elementary/Elementary.kt +++ b/docs/exPuzzlers/src/_02_expressive/_04_Elementary/Elementary.kt @@ -1,6 +1,6 @@ namespace elementary -import std.io.* +import kotlin.io.* fun main(args : Array) { // Problematic case does not compile diff --git a/docs/exPuzzlers/src/_02_expressive/_06_Multicast/Multicast.kt b/docs/exPuzzlers/src/_02_expressive/_06_Multicast/Multicast.kt index e1f472181ac..4ad429ebc6e 100644 --- a/docs/exPuzzlers/src/_02_expressive/_06_Multicast/Multicast.kt +++ b/docs/exPuzzlers/src/_02_expressive/_06_Multicast/Multicast.kt @@ -1,6 +1,6 @@ namespace multicast -import std.io.* +import kotlin.io.* fun main(args : Array) { println(-1.toByte().toChar().toInt()) diff --git a/docs/exPuzzlers/src/_02_expressive/_07_Swap_Meat/CleverSwap.kt b/docs/exPuzzlers/src/_02_expressive/_07_Swap_Meat/CleverSwap.kt index 68debbabd4b..4d0062ffeee 100644 --- a/docs/exPuzzlers/src/_02_expressive/_07_Swap_Meat/CleverSwap.kt +++ b/docs/exPuzzlers/src/_02_expressive/_07_Swap_Meat/CleverSwap.kt @@ -1,6 +1,6 @@ namespace cleverswap -import std.io.* +import kotlin.io.* fun main(args : Array) { var x = 1 diff --git a/docs/exPuzzlers/src/_02_expressive/_08_Dos_Equis/DosEquis.kt b/docs/exPuzzlers/src/_02_expressive/_08_Dos_Equis/DosEquis.kt index 1231cb2b1af..8dbef36d673 100644 --- a/docs/exPuzzlers/src/_02_expressive/_08_Dos_Equis/DosEquis.kt +++ b/docs/exPuzzlers/src/_02_expressive/_08_Dos_Equis/DosEquis.kt @@ -1,6 +1,6 @@ namespace dos.equis -import std.io.* +import kotlin.io.* fun main(args : Array) { // Problematic case does not compile diff --git a/docs/exPuzzlers/src/_03_character/_11_The_Last_Laugh/LastLaugh.kt b/docs/exPuzzlers/src/_03_character/_11_The_Last_Laugh/LastLaugh.kt index 3f4b33b5431..8a25fb84bca 100644 --- a/docs/exPuzzlers/src/_03_character/_11_The_Last_Laugh/LastLaugh.kt +++ b/docs/exPuzzlers/src/_03_character/_11_The_Last_Laugh/LastLaugh.kt @@ -1,6 +1,6 @@ namespace last.laugh -import std.io.* +import kotlin.io.* fun main(args : Array) { print("H" + "a") diff --git a/docs/exPuzzlers/src/_03_character/_13_Animal_Farm/AnimalFarm.kt b/docs/exPuzzlers/src/_03_character/_13_Animal_Farm/AnimalFarm.kt index 7dd33235955..8551bbcb5d7 100644 --- a/docs/exPuzzlers/src/_03_character/_13_Animal_Farm/AnimalFarm.kt +++ b/docs/exPuzzlers/src/_03_character/_13_Animal_Farm/AnimalFarm.kt @@ -1,7 +1,7 @@ namespace animal.farm -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* fun main(args : Array) { val pig = "length: 10"; diff --git a/docs/exPuzzlers/src/_03_character/_14_Escape_Rout/EscapeRout.kt b/docs/exPuzzlers/src/_03_character/_14_Escape_Rout/EscapeRout.kt index 072690e498b..545eecd5efd 100644 --- a/docs/exPuzzlers/src/_03_character/_14_Escape_Rout/EscapeRout.kt +++ b/docs/exPuzzlers/src/_03_character/_14_Escape_Rout/EscapeRout.kt @@ -1,7 +1,7 @@ namespace escape.rout -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* fun main(args : Array) { // \u0022 is the Unicode escape for double quote (") diff --git a/docs/exPuzzlers/src/_03_character/_15_Hello_Whirled/Test.kt b/docs/exPuzzlers/src/_03_character/_15_Hello_Whirled/Test.kt index 8b65f7c8508..dd34e012730 100644 --- a/docs/exPuzzlers/src/_03_character/_15_Hello_Whirled/Test.kt +++ b/docs/exPuzzlers/src/_03_character/_15_Hello_Whirled/Test.kt @@ -1,7 +1,7 @@ namespace hello.whirled -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* /** * Generated by the IBM IDL-to-Java compiler, version 1.0 diff --git a/docs/exPuzzlers/src/_03_character/_16_Line_Printer/LinePrinter.kt b/docs/exPuzzlers/src/_03_character/_16_Line_Printer/LinePrinter.kt index 71bdc7fa976..73df2a17ef8 100644 --- a/docs/exPuzzlers/src/_03_character/_16_Line_Printer/LinePrinter.kt +++ b/docs/exPuzzlers/src/_03_character/_16_Line_Printer/LinePrinter.kt @@ -1,7 +1,7 @@ namespace line.printer -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* fun main(args : Array) { // Note: \u000A is Unicode representation of linefeed (LF) diff --git a/docs/exPuzzlers/src/_03_character/_20_Whats_My_Class/Me.kt b/docs/exPuzzlers/src/_03_character/_20_Whats_My_Class/Me.kt index 9d9add2653e..bd2f9849e31 100644 --- a/docs/exPuzzlers/src/_03_character/_20_Whats_My_Class/Me.kt +++ b/docs/exPuzzlers/src/_03_character/_20_Whats_My_Class/Me.kt @@ -1,8 +1,8 @@ namespace whats.my.`class` -import std.io.* -import std.string.* -import std.jutils.* +import kotlin.io.* +import kotlin.string.* +import kotlin.jutils.* class Me() { fun main() { diff --git a/docs/exPuzzlers/src/_03_character/_21_Whats_My_Class_Take_2/MeToo.kt b/docs/exPuzzlers/src/_03_character/_21_Whats_My_Class_Take_2/MeToo.kt index 5b42573147e..ae8458df5c9 100644 --- a/docs/exPuzzlers/src/_03_character/_21_Whats_My_Class_Take_2/MeToo.kt +++ b/docs/exPuzzlers/src/_03_character/_21_Whats_My_Class_Take_2/MeToo.kt @@ -1,8 +1,8 @@ namespace whats.my.`class`.take2 -import std.io.* -import std.string.* -import std.jutils.* +import kotlin.io.* +import kotlin.string.* +import kotlin.jutils.* import java.io.File; class MeToo() { diff --git a/docs/exPuzzlers/src/_03_character/_23_No_Pain_No_Gain/Rhymes.kt b/docs/exPuzzlers/src/_03_character/_23_No_Pain_No_Gain/Rhymes.kt index aaf19a1b16d..b1ba2813157 100644 --- a/docs/exPuzzlers/src/_03_character/_23_No_Pain_No_Gain/Rhymes.kt +++ b/docs/exPuzzlers/src/_03_character/_23_No_Pain_No_Gain/Rhymes.kt @@ -1,6 +1,6 @@ namespace no.pain.no.gain -import std.io.* +import kotlin.io.* val rnd = java.util.Random(); diff --git a/docs/exPuzzlers/src/_04_loopy/_24_Big_Delight_in_Every_Byte/BigDelight.kt b/docs/exPuzzlers/src/_04_loopy/_24_Big_Delight_in_Every_Byte/BigDelight.kt index efd528ec2c4..0eb9d09f97d 100644 --- a/docs/exPuzzlers/src/_04_loopy/_24_Big_Delight_in_Every_Byte/BigDelight.kt +++ b/docs/exPuzzlers/src/_04_loopy/_24_Big_Delight_in_Every_Byte/BigDelight.kt @@ -1,6 +1,6 @@ namespace big.delight.in.every.byte -import std.io.* +import kotlin.io.* fun main(args : Array) { // for (b : Byte in Byte.MIN_VALUE..Byte.MAX_VALUE) { diff --git a/docs/exPuzzlers/src/_04_loopy/_25_In_the_Loop/InTheLoop.kt b/docs/exPuzzlers/src/_04_loopy/_25_In_the_Loop/InTheLoop.kt index fffa305d4c9..4ccded72063 100644 --- a/docs/exPuzzlers/src/_04_loopy/_25_In_the_Loop/InTheLoop.kt +++ b/docs/exPuzzlers/src/_04_loopy/_25_In_the_Loop/InTheLoop.kt @@ -1,6 +1,6 @@ namespace `in`.the.loop -import std.io.* +import kotlin.io.* val END = Integer.MAX_VALUE val START = END - 100 diff --git a/docs/exPuzzlers/src/_04_loopy/_31_Ghost_of_Looper/GhostOfLooper.kt b/docs/exPuzzlers/src/_04_loopy/_31_Ghost_of_Looper/GhostOfLooper.kt index d732ff3f058..1d4d229ae90 100644 --- a/docs/exPuzzlers/src/_04_loopy/_31_Ghost_of_Looper/GhostOfLooper.kt +++ b/docs/exPuzzlers/src/_04_loopy/_31_Ghost_of_Looper/GhostOfLooper.kt @@ -1,6 +1,6 @@ namespace ghost.of.looper -import std.io.* +import kotlin.io.* fun main(args : Array) { var i : Short = -1.toShort() diff --git a/docs/exPuzzlers/src/_04_loopy/_32_Curse_of_Looper/CurseOfLooper.kt b/docs/exPuzzlers/src/_04_loopy/_32_Curse_of_Looper/CurseOfLooper.kt index e768340987c..2083c9f2f05 100644 --- a/docs/exPuzzlers/src/_04_loopy/_32_Curse_of_Looper/CurseOfLooper.kt +++ b/docs/exPuzzlers/src/_04_loopy/_32_Curse_of_Looper/CurseOfLooper.kt @@ -1,6 +1,6 @@ namespace curse.of.loooper // BUG!!! -import std.io.* +import kotlin.io.* class Curse>() { fun curse(i : T, j : T) { diff --git a/docs/exPuzzlers/src/_04_loopy/_34_Down_for_the_Count/Count.kt b/docs/exPuzzlers/src/_04_loopy/_34_Down_for_the_Count/Count.kt index 425fbb15671..4273e092946 100644 --- a/docs/exPuzzlers/src/_04_loopy/_34_Down_for_the_Count/Count.kt +++ b/docs/exPuzzlers/src/_04_loopy/_34_Down_for_the_Count/Count.kt @@ -1,6 +1,6 @@ namespace down.`for`.the.count -import std.io.* +import kotlin.io.* fun main(args : Array) { // Problematic code does not compile diff --git a/docs/exPuzzlers/src/_05_exceptional/_36_Indecision/Indecisive.kt b/docs/exPuzzlers/src/_05_exceptional/_36_Indecision/Indecisive.kt index 26bb03cf30c..8424586244a 100644 --- a/docs/exPuzzlers/src/_05_exceptional/_36_Indecision/Indecisive.kt +++ b/docs/exPuzzlers/src/_05_exceptional/_36_Indecision/Indecisive.kt @@ -1,6 +1,6 @@ namespace indecision -import std.io.* +import kotlin.io.* fun main(args : Array) { println(decision()) diff --git a/docs/exPuzzlers/src/_05_exceptional/_38_Unwelcome_Guest/UnwelcomeGuest.kt b/docs/exPuzzlers/src/_05_exceptional/_38_Unwelcome_Guest/UnwelcomeGuest.kt index 68dc0d91fe9..700ba1e1220 100644 --- a/docs/exPuzzlers/src/_05_exceptional/_38_Unwelcome_Guest/UnwelcomeGuest.kt +++ b/docs/exPuzzlers/src/_05_exceptional/_38_Unwelcome_Guest/UnwelcomeGuest.kt @@ -1,6 +1,6 @@ namespace unwelcome.guest -import std.io.* +import kotlin.io.* val GUEST_USER_ID = -1 val USER_ID = diff --git a/docs/exPuzzlers/src/_05_exceptional/_39_The_Reluctant_Constructor/Reluctant.kt b/docs/exPuzzlers/src/_05_exceptional/_39_The_Reluctant_Constructor/Reluctant.kt index b98e14d6db4..b72123c19ca 100644 --- a/docs/exPuzzlers/src/_05_exceptional/_39_The_Reluctant_Constructor/Reluctant.kt +++ b/docs/exPuzzlers/src/_05_exceptional/_39_The_Reluctant_Constructor/Reluctant.kt @@ -1,6 +1,6 @@ namespace the.reluctant.constructor -import std.io.* +import kotlin.io.* public class Reluctant() { val internalInstance = Reluctant() // Recursion is obvious diff --git a/docs/exPuzzlers/src/_05_exceptional/_42_Thrown_for_a_Loop/Loop.kt b/docs/exPuzzlers/src/_05_exceptional/_42_Thrown_for_a_Loop/Loop.kt index 2ee23e99c73..cd3234cbf65 100644 --- a/docs/exPuzzlers/src/_05_exceptional/_42_Thrown_for_a_Loop/Loop.kt +++ b/docs/exPuzzlers/src/_05_exceptional/_42_Thrown_for_a_Loop/Loop.kt @@ -1,7 +1,7 @@ namespace thrown.`for`.a.looop // BUG -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* fun iarr(vararg a : Int) = a // due to a BUG diff --git a/docs/exPuzzlers/src/_06_classy/_47_Well_Dog_My_Cats/Ruckus.kt b/docs/exPuzzlers/src/_06_classy/_47_Well_Dog_My_Cats/Ruckus.kt index 08c2ed5cb34..5a9f6b8678c 100644 --- a/docs/exPuzzlers/src/_06_classy/_47_Well_Dog_My_Cats/Ruckus.kt +++ b/docs/exPuzzlers/src/_06_classy/_47_Well_Dog_My_Cats/Ruckus.kt @@ -1,7 +1,7 @@ namespace well.dog.my.cats -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* open class Counter { class object { diff --git a/docs/exPuzzlers/src/_06_classy/_48_All_I_Get_Is_Static/Bark.kt b/docs/exPuzzlers/src/_06_classy/_48_All_I_Get_Is_Static/Bark.kt index 4c2fbb0bc40..78effebff8c 100644 --- a/docs/exPuzzlers/src/_06_classy/_48_All_I_Get_Is_Static/Bark.kt +++ b/docs/exPuzzlers/src/_06_classy/_48_All_I_Get_Is_Static/Bark.kt @@ -1,7 +1,7 @@ namespace all.i.get.`is`.static -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* open class Dog() { class object { diff --git a/docs/exPuzzlers/src/_06_classy/_53_Do_Your_Thing/MyThing.kt b/docs/exPuzzlers/src/_06_classy/_53_Do_Your_Thing/MyThing.kt index ff06e855549..cf63e66e746 100644 --- a/docs/exPuzzlers/src/_06_classy/_53_Do_Your_Thing/MyThing.kt +++ b/docs/exPuzzlers/src/_06_classy/_53_Do_Your_Thing/MyThing.kt @@ -1,7 +1,7 @@ namespace `do`.your.thing -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* import _06_classy._53_Do_Your_Thing.Thing class MyThing(val arg : Int) : Thing(arg) { diff --git a/docs/exPuzzlers/src/_06_classy/_54_Null_and_Void/Null.kt b/docs/exPuzzlers/src/_06_classy/_54_Null_and_Void/Null.kt index e73e94f3f1e..e23e6f3db13 100644 --- a/docs/exPuzzlers/src/_06_classy/_54_Null_and_Void/Null.kt +++ b/docs/exPuzzlers/src/_06_classy/_54_Null_and_Void/Null.kt @@ -1,7 +1,7 @@ namespace `null`.and.void -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* class Null() { class object { diff --git a/docs/exPuzzlers/src/_06_classy/_55_Creationism/Creator.kt b/docs/exPuzzlers/src/_06_classy/_55_Creationism/Creator.kt index ca14d6e801a..2dd0e94cfb8 100644 --- a/docs/exPuzzlers/src/_06_classy/_55_Creationism/Creator.kt +++ b/docs/exPuzzlers/src/_06_classy/_55_Creationism/Creator.kt @@ -1,7 +1,7 @@ namespace creationism -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* class Creature() { class object { diff --git a/docs/exPuzzlers/src/_07_library/_56_Big_Problem/BigProblem.kt b/docs/exPuzzlers/src/_07_library/_56_Big_Problem/BigProblem.kt index 815ffe9b105..af212ecd2ee 100644 --- a/docs/exPuzzlers/src/_07_library/_56_Big_Problem/BigProblem.kt +++ b/docs/exPuzzlers/src/_07_library/_56_Big_Problem/BigProblem.kt @@ -1,7 +1,7 @@ namespace big.problem -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* import java.math.BigInteger fun main(args : Array) { diff --git a/docs/exPuzzlers/src/_07_library/_59_Whats_the_Difference/Differences.kt b/docs/exPuzzlers/src/_07_library/_59_Whats_the_Difference/Differences.kt index c1afb5184f6..25b92c10076 100644 --- a/docs/exPuzzlers/src/_07_library/_59_Whats_the_Difference/Differences.kt +++ b/docs/exPuzzlers/src/_07_library/_59_Whats_the_Difference/Differences.kt @@ -1,7 +1,7 @@ namespace whats.the.difference -import std.io.* -import std.* +import kotlin.io.* +import kotlin.* import java.util.* fun iarray(vararg a : Int) = a // BUG diff --git a/examples/example-vfs/src/FileSystem.kt b/examples/example-vfs/src/FileSystem.kt index 9c256147527..341902db41f 100644 --- a/examples/example-vfs/src/FileSystem.kt +++ b/examples/example-vfs/src/FileSystem.kt @@ -1,6 +1,6 @@ package org.jetbrains.jet.samples.vfs; -import std.concurrent.* +import kotlin.concurrent.* import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.jetbrains.jet.samples.vfs.utils.*; @@ -12,7 +12,7 @@ import java.util.HashMap import java.util.Arrays import java.util.Map -import std.util.* +import kotlin.util.* import java.util.TimerTask /** diff --git a/examples/example-vfs/src/RefreshQueue.kt b/examples/example-vfs/src/RefreshQueue.kt index a92e60139fe..81e8b0900bc 100644 --- a/examples/example-vfs/src/RefreshQueue.kt +++ b/examples/example-vfs/src/RefreshQueue.kt @@ -6,8 +6,8 @@ import java.util.concurrent.locks.ReentrantLock import java.util.concurrent.LinkedBlockingQueue import java.util.ArrayList -import std.util.* -import std.concurrent.* +import kotlin.util.* +import kotlin.concurrent.* import java.util.Timer import java.util.TimerTask diff --git a/examples/example-vfs/src/Utils.kt b/examples/example-vfs/src/Utils.kt index 7926599c927..6b8d98efb65 100644 --- a/examples/example-vfs/src/Utils.kt +++ b/examples/example-vfs/src/Utils.kt @@ -2,7 +2,7 @@ package org.jetbrains.jet.samples.vfs.utils; import java.util.concurrent.locks.Lock import java.util.List -import std.util.* +import kotlin.util.* /** * Executes task with given lock acquired. diff --git a/examples/example-vfs/src/VirtualFile.kt b/examples/example-vfs/src/VirtualFile.kt index f848cedf4c7..3fd20757d8c 100644 --- a/examples/example-vfs/src/VirtualFile.kt +++ b/examples/example-vfs/src/VirtualFile.kt @@ -7,7 +7,7 @@ import java.io.FileInputStream import java.util.ArrayList import java.util.List -import std.util.* +import kotlin.util.* /** * Abstract virtual file. diff --git a/examples/src/actors/src/Actors.kt b/examples/src/actors/src/Actors.kt index fb6e1f350b3..d2327791fbf 100644 --- a/examples/src/actors/src/Actors.kt +++ b/examples/src/actors/src/Actors.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* -import std.util.* +import kotlin.concurrent.* +import kotlin.util.* import java.util.concurrent.* import java.util.concurrent.atomic.AtomicReferenceFieldUpdater diff --git a/examples/src/actors/src/Messages.kt b/examples/src/actors/src/Messages.kt index 5e815cce3a6..1f1751942c6 100644 --- a/examples/src/actors/src/Messages.kt +++ b/examples/src/actors/src/Messages.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* +import kotlin.concurrent.* import java.util.concurrent.Executor import java.util.LinkedList import java.util.concurrent.Executors diff --git a/examples/src/actors/src/StatCalculator.kt b/examples/src/actors/src/StatCalculator.kt index a73274fb0bc..e0871d7dd3c 100644 --- a/examples/src/actors/src/StatCalculator.kt +++ b/examples/src/actors/src/StatCalculator.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* +import kotlin.concurrent.* import org.jetbrains.kotlin.examples.actors.Actor import java.util.concurrent.Executors import java.util.LinkedList diff --git a/examples/src/actors/src/Stock.kt b/examples/src/actors/src/Stock.kt index 5d1d0d07c38..680295566b2 100644 --- a/examples/src/actors/src/Stock.kt +++ b/examples/src/actors/src/Stock.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* +import kotlin.concurrent.* import java.util.concurrent.Executor import java.util.LinkedList import java.util.concurrent.Executors diff --git a/examples/src/actors/src/StockServer.kt b/examples/src/actors/src/StockServer.kt index fcdb5e2aff0..58ba36aefed 100644 --- a/examples/src/actors/src/StockServer.kt +++ b/examples/src/actors/src/StockServer.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* +import kotlin.concurrent.* import java.util.concurrent.Executor import java.util.LinkedList import java.util.concurrent.Executors diff --git a/examples/src/actors/src/StockServerShard.kt b/examples/src/actors/src/StockServerShard.kt index 33d9a11358c..96b20d0b4b7 100644 --- a/examples/src/actors/src/StockServerShard.kt +++ b/examples/src/actors/src/StockServerShard.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.examples.actors -import std.concurrent.* +import kotlin.concurrent.* import java.util.concurrent.Executor import java.util.LinkedList import java.util.concurrent.Executors diff --git a/examples/src/benchmarks/src/lockperf/LockPerf.kt b/examples/src/benchmarks/src/lockperf/LockPerf.kt index 4e4193e8759..862e04f253d 100644 --- a/examples/src/benchmarks/src/lockperf/LockPerf.kt +++ b/examples/src/benchmarks/src/lockperf/LockPerf.kt @@ -16,9 +16,9 @@ package lockperf_kotlin -import std.io.* -import std.util.* -import std.concurrent.* +import kotlin.io.* +import kotlin.util.* +import kotlin.concurrent.* import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.CountDownLatch; diff --git a/examples/src/luhny/solution.kt b/examples/src/luhny/solution.kt index eee28c56d1e..230530551c9 100644 --- a/examples/src/luhny/solution.kt +++ b/examples/src/luhny/solution.kt @@ -1,6 +1,6 @@ package luhnybin -import std.io.* +import kotlin.io.* import java.io.* import java.util.ArrayDeque diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java index d381821129b..85d470797bb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java @@ -36,7 +36,7 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase { } public void testNoDefaultImport() { - testImportInFile("std.io.println"); + testImportInFile("kotlin.io.println"); } public void testImportBeforeObject() { diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.java b/j2k/src/org/jetbrains/jet/j2k/Converter.java index 9b016767a57..ade0192d4a0 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.java +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.java @@ -124,7 +124,7 @@ public class Converter { @NotNull public File fileToFileWithCompatibilityImport(@NotNull PsiJavaFile javaFile) { - return fileToFile(javaFile, Collections.singletonList("std.compatibility.*")); + return fileToFile(javaFile, Collections.singletonList("kotlin.compatibility.*")); } @NotNull diff --git a/j2k/tests/testData/ast/file/comp/intNullability.kt b/j2k/tests/testData/ast/file/comp/intNullability.kt index e243159d8b6..891c5720f20 100644 --- a/j2k/tests/testData/ast/file/comp/intNullability.kt +++ b/j2k/tests/testData/ast/file/comp/intNullability.kt @@ -1,5 +1,5 @@ package demo -import std.compatibility.* +import kotlin.compatibility.* open class Test() { open fun test() : Unit { var i : Int? = 10 diff --git a/js/js.translator/testFiles/stdlib/cases/Filter.kt b/js/js.translator/testFiles/stdlib/cases/Filter.kt index 321be2ecb69..5d7244b2a2d 100644 --- a/js/js.translator/testFiles/stdlib/cases/Filter.kt +++ b/js/js.translator/testFiles/stdlib/cases/Filter.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.util.* import java.lang.Iterable diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt index a8cbe7bdfda..1beb4cf3375 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.doc -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import org.jetbrains.kotlin.doc.templates.* import org.jetbrains.kotlin.template.TextTemplate diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt index 15eaaec2a11..45537030f9c 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.doc -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import org.jetbrains.kotlin.doc.templates.* import org.jetbrains.kotlin.template.TextTemplate diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt index 9985913c4aa..9fdc414a068 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt index 33fe30a186f..5412016010b 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel import org.jetbrains.kotlin.model.KPackage diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt index 8722eeeb34b..5c052091fd3 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel import org.jetbrains.kotlin.model.KPackage diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt index 2ca2c83b4b3..218dd073a95 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt index 79e6818170a..2a5a0b2ca8e 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt index 8f4237e40e3..ff9ae34c4a3 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.doc.templates -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import org.jetbrains.kotlin.model.KClass import org.jetbrains.kotlin.model.KAnnotation import org.jetbrains.kotlin.model.KPackage diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt index a7101ee533d..7c26f70a52d 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt index c5983170aaa..9ad826c4a5b 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt index d16c09f2c7b..79d8dc69647 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt index 9ec32d2ff98..bd7c0973fa0 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel import org.jetbrains.kotlin.model.KPackage diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt index 19109d99347..6ac6198c4f5 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt index 738e210116f..c3e261f0288 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt @@ -1,9 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.model.KModel import org.jetbrains.kotlin.model.KPackage diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt index 6884b94fbc2..b0170dd734c 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt @@ -1,8 +1,8 @@ package org.jetbrains.kotlin.doc.templates -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import java.util.* import org.jetbrains.kotlin.template.* import org.jetbrains.kotlin.model.KModel diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KModelCompilerPlugin.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KModelCompilerPlugin.kt index 19a7719ca03..ba0a7e7bbf7 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KModelCompilerPlugin.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KModelCompilerPlugin.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.model -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import org.jetbrains.kotlin.doc.templates.* import org.jetbrains.kotlin.template.TextTemplate diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt index a1bcd4bd8dd..52a8cd7f0dd 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt @@ -1,8 +1,8 @@ package org.jetbrains.kotlin.model import java.lang.String -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import java.util.* import org.jetbrains.jet.lang.descriptors.ClassDescriptor @@ -120,7 +120,7 @@ abstract class KClassOrPackage : KAnnotated() { } class KModel(var context: BindingContext, var title: String = "Documentation", var version: String = "TODO") { - // TODO generates java.lang.NoSuchMethodError: std.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; + // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; //val packages = sortedMap() public val packageMap: SortedMap = TreeMap() @@ -414,7 +414,7 @@ class KPackage(val model: KModel, val descriptor: NamespaceDescriptor, return if (answer.length == 0) "" else answer + "/" } - // TODO generates java.lang.NoSuchMethodError: std.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; + // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; //val classes = sortedMap() public val classMap: SortedMap = TreeMap() diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt index 12a8701ad58..964152345a4 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.template -import std.io.* +import kotlin.io.* import java.io.Writer import java.io.StringWriter import java.io.OutputStream diff --git a/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt b/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt index d194dc5fb93..2c43e1b9a62 100644 --- a/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt +++ b/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt @@ -1,9 +1,9 @@ package test.kotlin.template -import std.* +import kotlin.* import org.jetbrains.kotlin.template.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.util.* import junit.framework.TestCase diff --git a/kunit/kunit.iml b/kunit/kunit.iml index 3f40ca246b5..8783f1f072d 100644 --- a/kunit/kunit.iml +++ b/kunit/kunit.iml @@ -7,7 +7,16 @@ - + + + + + + + + + + diff --git a/kunit/src/main/kotlin/TestSupport.kt b/kunit/src/main/kotlin/TestSupport.kt new file mode 100644 index 00000000000..9f81d3205e7 --- /dev/null +++ b/kunit/src/main/kotlin/TestSupport.kt @@ -0,0 +1,10 @@ +package org.jetbrains.kotlin.junit + +import junit.framework.TestCase + +/** + * Useful base class for test cases using the old JUnit 3 naming convention of functions + * starting with "test*" as being a test case + */ +abstract class TestSupport() : TestCase() { +} diff --git a/kunit/src/main/kotlin/junit/JUnit.kt b/kunit/src/main/kotlin/junit/JUnit.kt new file mode 100644 index 00000000000..ebd721e5447 --- /dev/null +++ b/kunit/src/main/kotlin/junit/JUnit.kt @@ -0,0 +1,26 @@ +package org.jetbrains.kotlin.test.junit + +import kotlin.test.Asserter +import org.junit.Assert + +class JUnitAsserter : Asserter { + override fun assertEquals(message : String, expected : Any?, actual : Any?) { + Assert.assertEquals(message, expected, actual) + } + + override fun assertNotNull(message : String, actual : Any?) { + Assert.assertNotNull(message, actual) + } + + override fun assertNull(message : String, actual : Any?) { + Assert.assertNull(message, actual) + } + + override fun assertTrue(message : String, actual : Boolean) { + Assert.assertTrue(message, actual) + } + + override fun fail(message : String) { + Assert.fail(message) + } +} \ No newline at end of file diff --git a/runtests/runtests.iml b/runtests/runtests.iml index 49c63a49c3d..6676eb47c23 100644 --- a/runtests/runtests.iml +++ b/runtests/runtests.iml @@ -10,6 +10,7 @@ + diff --git a/runtests/test/stdlib/testall/CollectionTestAllTest.java b/runtests/test/stdlib/testall/CollectionTestAllTest.java index 367f346064e..4093319a49c 100644 --- a/runtests/test/stdlib/testall/CollectionTestAllTest.java +++ b/runtests/test/stdlib/testall/CollectionTestAllTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package stdlib.testall; +package kotlinlib.testall; import junit.framework.TestSuite; import test.collections.*; diff --git a/runtests/test/stdlib/testall/DomTestAllTest.java b/runtests/test/stdlib/testall/DomTestAllTest.java index 1e0cb3c4211..eabefaaa27b 100644 --- a/runtests/test/stdlib/testall/DomTestAllTest.java +++ b/runtests/test/stdlib/testall/DomTestAllTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package stdlib.testall; +package kotlinlib.testall; import junit.framework.TestSuite; import test.dom.*; diff --git a/runtests/test/stdlib/testall/LanguageTestAllTest.java b/runtests/test/stdlib/testall/LanguageTestAllTest.java index 3e4371e8e9e..15b4d796f08 100644 --- a/runtests/test/stdlib/testall/LanguageTestAllTest.java +++ b/runtests/test/stdlib/testall/LanguageTestAllTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package stdlib.testall; +package kotlinlib.testall; import junit.framework.TestSuite; import test.language.*; diff --git a/runtests/test/stdlib/testall/PropertiesAllTest.java b/runtests/test/stdlib/testall/PropertiesAllTest.java index 5b087567854..bbf141c056b 100644 --- a/runtests/test/stdlib/testall/PropertiesAllTest.java +++ b/runtests/test/stdlib/testall/PropertiesAllTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package stdlib.testall; +package kotlinlib.testall; import junit.framework.TestSuite; import test.properties.*; diff --git a/runtests/test/stdlib/testall/TestAll.java b/runtests/test/stdlib/testall/TestAll.java index 328d01f756a..b61a3656692 100644 --- a/runtests/test/stdlib/testall/TestAll.java +++ b/runtests/test/stdlib/testall/TestAll.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package stdlib.testall; +package kotlinlib.testall; import junit.framework.TestSuite; import test.collections.*; diff --git a/stdlib/ktSrc/Arrays.kt b/stdlib/ktSrc/Arrays.kt index cf8889b2821..18931942e0f 100644 --- a/stdlib/ktSrc/Arrays.kt +++ b/stdlib/ktSrc/Arrays.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.io.ByteArrayInputStream diff --git a/stdlib/ktSrc/Filter.kt b/stdlib/ktSrc/Filter.kt index 8c31626d436..5113ab38486 100644 --- a/stdlib/ktSrc/Filter.kt +++ b/stdlib/ktSrc/Filter.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.util.* import java.lang.Iterable diff --git a/stdlib/ktSrc/Integer.kt b/stdlib/ktSrc/Integer.kt index 60255b6c16b..dd8af8e21be 100644 --- a/stdlib/ktSrc/Integer.kt +++ b/stdlib/ktSrc/Integer.kt @@ -1,4 +1,4 @@ -package std +package kotlin inline fun Int.times(body : () -> Unit) { var count = this; diff --git a/stdlib/ktSrc/Iterators.kt b/stdlib/ktSrc/Iterators.kt index 7b3087e952e..76ea351421e 100644 --- a/stdlib/ktSrc/Iterators.kt +++ b/stdlib/ktSrc/Iterators.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util import java.util.* import java.util.Iterator diff --git a/stdlib/ktSrc/JavaCollections.kt b/stdlib/ktSrc/JavaCollections.kt index 673edbeec3f..5b39244aa19 100644 --- a/stdlib/ktSrc/JavaCollections.kt +++ b/stdlib/ktSrc/JavaCollections.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util import java.util.* diff --git a/stdlib/ktSrc/JavaIo.kt b/stdlib/ktSrc/JavaIo.kt index b9d97b089fd..0eba940c2a1 100644 --- a/stdlib/ktSrc/JavaIo.kt +++ b/stdlib/ktSrc/JavaIo.kt @@ -1,4 +1,4 @@ -package std.io +package kotlin.io import java.io.* import java.nio.charset.* diff --git a/stdlib/ktSrc/JavaIterables.kt b/stdlib/ktSrc/JavaIterables.kt index c8ac5b970ab..0248153abd6 100644 --- a/stdlib/ktSrc/JavaIterables.kt +++ b/stdlib/ktSrc/JavaIterables.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util import java.util.* diff --git a/stdlib/ktSrc/JavaIterablesSpecial.kt b/stdlib/ktSrc/JavaIterablesSpecial.kt index e0b301f7e3a..6edbb82e0e4 100644 --- a/stdlib/ktSrc/JavaIterablesSpecial.kt +++ b/stdlib/ktSrc/JavaIterablesSpecial.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util // Number of extension function for java.lang.Iterable that shouldn't participate in auto generation import java.util.Collection @@ -71,7 +71,7 @@ fun java.lang.Iterable.last() : T { * method will be used. */ fun java.lang.Iterable.contains(item : T) : Boolean { - std.io.println("!!!!!") + kotlin.io.println("!!!!!") if (this is java.util.AbstractCollection) { return this.contains(item); } diff --git a/stdlib/ktSrc/JavaLang.kt b/stdlib/ktSrc/JavaLang.kt index d19ead76817..83212bc03e6 100644 --- a/stdlib/ktSrc/JavaLang.kt +++ b/stdlib/ktSrc/JavaLang.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.lang.Class import java.lang.Object @@ -6,6 +6,6 @@ import java.lang.Object import jet.runtime.Intrinsic val T.javaClass : Class - [Intrinsic("std.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class + [Intrinsic("kotlin.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class -[Intrinsic("std.javaClass.function")] fun javaClass() : Class = null as Class +[Intrinsic("kotlin.javaClass.function")] fun javaClass() : Class = null as Class diff --git a/stdlib/ktSrc/JavaMath.kt b/stdlib/ktSrc/JavaMath.kt index 726ad082f58..40aeb16336f 100644 --- a/stdlib/ktSrc/JavaMath.kt +++ b/stdlib/ktSrc/JavaMath.kt @@ -1,4 +1,4 @@ -package std.math +package kotlin.math import java.math.BigInteger import java.math.BigDecimal diff --git a/stdlib/ktSrc/JavaUtil.kt b/stdlib/ktSrc/JavaUtil.kt index 50006784026..cdad00345e8 100644 --- a/stdlib/ktSrc/JavaUtil.kt +++ b/stdlib/ktSrc/JavaUtil.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util import java.util.* diff --git a/stdlib/ktSrc/JavaUtilMap.kt b/stdlib/ktSrc/JavaUtilMap.kt index 985e89225b5..7768c4cc50f 100644 --- a/stdlib/ktSrc/JavaUtilMap.kt +++ b/stdlib/ktSrc/JavaUtilMap.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util import java.util.Map as JMap import java.util.HashMap diff --git a/stdlib/ktSrc/Standard.kt b/stdlib/ktSrc/Standard.kt index bcbd9db2ac1..b0dfaa84efa 100644 --- a/stdlib/ktSrc/Standard.kt +++ b/stdlib/ktSrc/Standard.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.util.Collection import java.util.ArrayList diff --git a/stdlib/ktSrc/String.kt b/stdlib/ktSrc/String.kt index 4398507a648..dd38871b0d8 100644 --- a/stdlib/ktSrc/String.kt +++ b/stdlib/ktSrc/String.kt @@ -1,4 +1,4 @@ -package std +package kotlin import java.io.StringReader diff --git a/stdlib/ktSrc/System.kt b/stdlib/ktSrc/System.kt index bd761eac5fe..af27fe41cd1 100644 --- a/stdlib/ktSrc/System.kt +++ b/stdlib/ktSrc/System.kt @@ -1,4 +1,4 @@ -package std.util +package kotlin.util /** Executes current block and returns elapsed time in milliseconds diff --git a/stdlib/ktSrc/concurrent/FunctionalList.kt b/stdlib/ktSrc/concurrent/FunctionalList.kt index d3b4f2cd1ff..f441d73f47d 100644 --- a/stdlib/ktSrc/concurrent/FunctionalList.kt +++ b/stdlib/ktSrc/concurrent/FunctionalList.kt @@ -1,4 +1,4 @@ -package std.concurrent +package kotlin.concurrent abstract class FunctionalList(public val size: Int) { public abstract val head: T diff --git a/stdlib/ktSrc/concurrent/FunctionalQueue.kt b/stdlib/ktSrc/concurrent/FunctionalQueue.kt index 3dc6ee83303..10c3eaf3b03 100644 --- a/stdlib/ktSrc/concurrent/FunctionalQueue.kt +++ b/stdlib/ktSrc/concurrent/FunctionalQueue.kt @@ -1,4 +1,4 @@ -package std.concurrent +package kotlin.concurrent import java.util.concurrent.Executor import jet.Iterator diff --git a/stdlib/ktSrc/concurrent/Locks.kt b/stdlib/ktSrc/concurrent/Locks.kt index 54a5126f751..36d174b7bd8 100644 --- a/stdlib/ktSrc/concurrent/Locks.kt +++ b/stdlib/ktSrc/concurrent/Locks.kt @@ -1,4 +1,4 @@ -package std.concurrent +package kotlin.concurrent import java.util.concurrent.locks.Lock import java.util.concurrent.locks.ReadWriteLock diff --git a/stdlib/ktSrc/concurrent/Thread.kt b/stdlib/ktSrc/concurrent/Thread.kt index a6ecf1eaee3..6a513291ead 100644 --- a/stdlib/ktSrc/concurrent/Thread.kt +++ b/stdlib/ktSrc/concurrent/Thread.kt @@ -1,4 +1,4 @@ -package std.concurrent +package kotlin.concurrent import java.lang.* import java.util.concurrent.Executor diff --git a/stdlib/ktSrc/concurrent/Timer.kt b/stdlib/ktSrc/concurrent/Timer.kt index cc350f305d5..d3ad1b68fc8 100644 --- a/stdlib/ktSrc/concurrent/Timer.kt +++ b/stdlib/ktSrc/concurrent/Timer.kt @@ -1,4 +1,4 @@ -package std.concurrent +package kotlin.concurrent import java.util.Timer import java.util.TimerTask diff --git a/stdlib/ktSrc/dom/Dom.kt b/stdlib/ktSrc/dom/Dom.kt index 29ac4efb210..15e10aca02f 100644 --- a/stdlib/ktSrc/dom/Dom.kt +++ b/stdlib/ktSrc/dom/Dom.kt @@ -1,7 +1,7 @@ -package std.dom +package kotlin.dom -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import java.util.* import org.w3c.dom.* diff --git a/stdlib/ktSrc/dom/DomJVM.kt b/stdlib/ktSrc/dom/DomJVM.kt index 93d01af2bfe..cd0b283a16f 100644 --- a/stdlib/ktSrc/dom/DomJVM.kt +++ b/stdlib/ktSrc/dom/DomJVM.kt @@ -1,7 +1,7 @@ /** * JVM specific API implementations using JAXB and so forth which would not be used when compiling to JS */ -package std.dom +package kotlin.dom import org.w3c.dom.* import javax.xml.parsers.DocumentBuilder diff --git a/stdlib/ktSrc/generated/ArraysFromJavaCollections.kt b/stdlib/ktSrc/generated/ArraysFromJavaCollections.kt index 3b1f0c23224..d8b1c6e14ff 100644 --- a/stdlib/ktSrc/generated/ArraysFromJavaCollections.kt +++ b/stdlib/ktSrc/generated/ArraysFromJavaCollections.kt @@ -1,5 +1,5 @@ // NOTE this file is auto-generated from stdlib/ktSrc/JavaCollections.kt -package std +package kotlin import java.util.* diff --git a/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt b/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt index 05597f4094a..fe57720f022 100644 --- a/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt +++ b/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt @@ -1,7 +1,7 @@ // NOTE this file is auto-generated from stdlib/ktSrc/JavaIterables.kt -package std +package kotlin -import std.util.* +import kotlin.util.* import java.util.* diff --git a/stdlib/ktSrc/generated/JavaUtilIterablesFromJavaCollections.kt b/stdlib/ktSrc/generated/JavaUtilIterablesFromJavaCollections.kt index 0900ca1de80..db9fa82bdef 100644 --- a/stdlib/ktSrc/generated/JavaUtilIterablesFromJavaCollections.kt +++ b/stdlib/ktSrc/generated/JavaUtilIterablesFromJavaCollections.kt @@ -1,5 +1,5 @@ // NOTE this file is auto-generated from stdlib/ktSrc/JavaCollections.kt -package std.util +package kotlin.util import java.util.* diff --git a/stdlib/ktSrc/generated/StandardFromJavaCollections.kt b/stdlib/ktSrc/generated/StandardFromJavaCollections.kt index e79bfb9f5e1..0421c4a631e 100644 --- a/stdlib/ktSrc/generated/StandardFromJavaCollections.kt +++ b/stdlib/ktSrc/generated/StandardFromJavaCollections.kt @@ -1,5 +1,5 @@ // NOTE this file is auto-generated from stdlib/ktSrc/JavaCollections.kt -package std +package kotlin import java.util.* diff --git a/stdlib/ktSrc/generated/StandardFromJavaIterables.kt b/stdlib/ktSrc/generated/StandardFromJavaIterables.kt index e2992f217cb..3e324d54c3d 100644 --- a/stdlib/ktSrc/generated/StandardFromJavaIterables.kt +++ b/stdlib/ktSrc/generated/StandardFromJavaIterables.kt @@ -1,7 +1,7 @@ // NOTE this file is auto-generated from stdlib/ktSrc/JavaIterables.kt -package std +package kotlin -import std.util.* +import kotlin.util.* import java.util.* diff --git a/stdlib/ktSrc/properties/Properties.kt b/stdlib/ktSrc/properties/Properties.kt index 373e8994109..3636d7bec01 100644 --- a/stdlib/ktSrc/properties/Properties.kt +++ b/stdlib/ktSrc/properties/Properties.kt @@ -1,7 +1,7 @@ -package std.properties +package kotlin.properties -import std.* -import std.util.* +import kotlin.* +import kotlin.util.* import java.util.List import java.util.Map import java.util.HashMap diff --git a/kunit/src/main/kotlin/Test.kt b/stdlib/ktSrc/test/Test.kt similarity index 58% rename from kunit/src/main/kotlin/Test.kt rename to stdlib/ktSrc/test/Test.kt index 94cd78c3e38..310cf5cf33f 100644 --- a/kunit/src/main/kotlin/Test.kt +++ b/stdlib/ktSrc/test/Test.kt @@ -3,13 +3,32 @@ */ package kotlin.test -import org.junit.Assert -import junit.framework.TestCase +import java.util.ServiceLoader + +private var _asserter: Asserter? = null + +fun asserter(): Asserter { + if (_asserter == null) { + /* TODO + val loader = ServiceLoader.load(javaClass) + for (a in loader) { + if (a != null) { + _asserter = a + break + } + } + */ + if (_asserter == null) { + _asserter = DefaultAsserter() + } + } + return _asserter.sure() +} /** Asserts that the given block returns true */ inline fun assertTrue(message: String, block: ()-> Boolean) { val actual = block() - Assert.assertTrue(message, actual) + asserter().assertTrue(message, actual) } /** Asserts that the given block returns true */ @@ -35,22 +54,22 @@ inline fun assertFalse(actual: Boolean, message: String = "") { /** Asserts that the expected value is equal to the actual value, with an optional message */ inline fun assertEquals(expected: Any?, actual: Any?, message: String = "") { - Assert.assertEquals(message, expected, actual) + asserter().assertEquals(message, expected, actual) } /** Asserts that the expression is not null, with an optional message */ inline fun assertNotNull(actual: Any?, message: String = "") { - Assert.assertNotNull(message, actual) + asserter().assertNotNull(message, actual) } /** Asserts that the expression is null, with an optional message */ inline fun assertNull(actual: Any?, message: String = "") { - Assert.assertNull(message, actual) + asserter().assertNull(message, actual) } /** Marks a test as having failed if this point in the execution path is reached, with an optional message */ inline fun fail(message: String = "") { - Assert.fail(message) + asserter().fail(message) } /** Asserts that given function block returns the given expected value */ @@ -68,7 +87,7 @@ inline fun expect(expected: T, message: String, block: ()-> T) { fun fails(block: ()-> Unit): Exception? { try { block() - Assert.fail("Expected an exception to be thrown") + asserter().fail("Expected an exception to be thrown") return null } catch (e: Exception) { println("Caught excepted exception: $e") @@ -80,7 +99,7 @@ fun fails(block: ()-> Unit): Exception? { fun failsWith(block: ()-> Unit) { try { block() - Assert.fail("Expected an exception to be thrown") + asserter().fail("Expected an exception to be thrown") } catch (e: T) { println("Caught excepted exception: $e") // OK @@ -95,10 +114,50 @@ inline fun todo(block: ()-> Any) { println("TODO at " + (Exception() as java.lang.Throwable).getStackTrace()?.get(1) + " for " + block) } +/** + * A plugin for performing assertions which can reuse JUnit or TestNG + */ +trait Asserter { + fun assertTrue(message: String, actual: Boolean): Unit + + fun assertEquals(message: String, expected: Any?, actual: Any?): Unit + + fun assertNotNull(message: String, actual: Any?): Unit + + fun assertNull(message: String, actual: Any?): Unit + + fun fail(message: String): Unit +} /** - * Useful base class for test cases using the old JUnit 3 naming convention of functions - * starting with "test*" as being a test case + * Default implementation to avoid dependency on JUnit or TestNG */ -abstract class TestSupport() : TestCase() { -} +class DefaultAsserter() : Asserter { + + override fun assertTrue(message : String, actual : Boolean) { + if (!actual) { + fail(message) + } + } + + override fun assertEquals(message : String, expected : Any?, actual : Any?) { + if (expected != actual) { + fail("$message. Expected <$expected> actual <$actual>") + } + } + + override fun assertNotNull(message : String, actual : Any?) { + if (actual == null) { + fail(message) + } + } + + override fun assertNull(message : String, actual : Any?) { + if (actual != null) { + fail(message) + } + } + override fun fail(message : String) { + throw AssertionError(message) + } +} \ No newline at end of file diff --git a/templatelib/src/TemplateCore.kt b/templatelib/src/TemplateCore.kt index c89004208fc..aae8fede573 100644 --- a/templatelib/src/TemplateCore.kt +++ b/templatelib/src/TemplateCore.kt @@ -1,6 +1,6 @@ -package std.template +package kotlin.template -import std.io.* +import kotlin.io.* /** * Represents a generic API to templates which should be usable diff --git a/templatelib/src/TemplateHtml.kt b/templatelib/src/TemplateHtml.kt index 39323d78b90..63df6d5d202 100644 --- a/templatelib/src/TemplateHtml.kt +++ b/templatelib/src/TemplateHtml.kt @@ -1,9 +1,9 @@ -package std.template.html +package kotlin.template.html -import std.* -import std.template.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.template.* +import kotlin.io.* +import kotlin.util.* import java.io.* import java.util.* diff --git a/templatelib/src/TemplateJavaIo.kt b/templatelib/src/TemplateJavaIo.kt index 79e33c79630..7941dd93c0d 100644 --- a/templatelib/src/TemplateJavaIo.kt +++ b/templatelib/src/TemplateJavaIo.kt @@ -1,8 +1,8 @@ // Server side Java IO code to avoid coupling // the core template code to java.* for easier JS porting -package std.template.io +package kotlin.template.io -import std.template.* +import kotlin.template.* import java.io.Writer import java.io.OutputStream import java.io.OutputStreamWriter diff --git a/templatelib/test/TemplateCoreTest.kt b/templatelib/test/TemplateCoreTest.kt index 44633b477ac..b42c86638d4 100644 --- a/templatelib/test/TemplateCoreTest.kt +++ b/templatelib/test/TemplateCoreTest.kt @@ -1,10 +1,10 @@ -package std.template +package kotlin.template -import std.* -import std.template.io.* -import std.io.* -import std.util.* -import std.test.* +import kotlin.* +import kotlin.template.io.* +import kotlin.io.* +import kotlin.util.* +import kotlin.test.* import java.util.* class EmailTemplate(var name: String = "James", var time: Date = Date()) : TextTemplate() { diff --git a/templatelib/test/TemplateHtmlTest.kt b/templatelib/test/TemplateHtmlTest.kt index b087a98cda0..71812b88ba5 100644 --- a/templatelib/test/TemplateHtmlTest.kt +++ b/templatelib/test/TemplateHtmlTest.kt @@ -1,11 +1,11 @@ -package std.template.html +package kotlin.template.html -import std.* -import std.template.* -import std.template.io.* -import std.io.* -import std.util.* -import std.test.* +import kotlin.* +import kotlin.template.* +import kotlin.template.io.* +import kotlin.io.* +import kotlin.util.* +import kotlin.test.* import java.util.* val justBody = body { diff --git a/templatelib/test/std/template/TemplateTestAll.java b/templatelib/test/std/template/TemplateTestAll.java index 589f02d5bbd..0207a670734 100644 --- a/templatelib/test/std/template/TemplateTestAll.java +++ b/templatelib/test/std/template/TemplateTestAll.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package std.template; +package kotlin.template; -import std.template.html.*; +import kotlin.template.html.*; import junit.framework.TestSuite; diff --git a/testlib/test/CollectionApiCheck.kt b/testlib/test/CollectionApiCheck.kt index ba9970fa7f5..811508f8908 100644 --- a/testlib/test/CollectionApiCheck.kt +++ b/testlib/test/CollectionApiCheck.kt @@ -1,6 +1,6 @@ package test.apicheck -import std.util.* +import kotlin.util.* import java.util.* trait Traversable { diff --git a/testlib/test/CollectionTest.kt b/testlib/test/CollectionTest.kt index aeb5543aee8..bdb6fdf9551 100644 --- a/testlib/test/CollectionTest.kt +++ b/testlib/test/CollectionTest.kt @@ -4,12 +4,13 @@ import kotlin.test.* // TODO can we avoid importing all this stuff by default I wonder? // e.g. making println and the collection builder methods public by default? -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import java.util.* +import junit.framework.TestCase -class CollectionTest() : TestSupport() { +class CollectionTest() : TestCase() { class IterableWrapper(collection : java.lang.Iterable) : java.lang.Iterable { private val collection = collection diff --git a/testlib/test/GenerateStandardLib.kt b/testlib/test/GenerateStandardLib.kt index 347f99bc0e9..42fcbd0afb4 100644 --- a/testlib/test/GenerateStandardLib.kt +++ b/testlib/test/GenerateStandardLib.kt @@ -1,8 +1,8 @@ -package kotlin.tools +package org.jetbrains.kotlin.tools -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import java.io.* import java.util.* @@ -58,26 +58,26 @@ fun main(args: Array) { // JavaIterables - Generic iterable stuff - generateFile(File(outDir, "ArraysFromJavaIterables.kt"), "package std\n\nimport std.util.*", File(srcDir, "JavaIterables.kt")) { + generateFile(File(outDir, "ArraysFromJavaIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterables.kt")) { it.replaceAll("java.lang.Iterable", "Array") } - generateFile(File(outDir, "StandardFromJavaIterables.kt"), "package std\n\nimport std.util.*", File(srcDir, "JavaIterables.kt")) { + generateFile(File(outDir, "StandardFromJavaIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JavaIterables.kt")) { it.replaceAll("java.lang.Iterable", "Iterable") } // JavaCollections - methods returning a collection of the same input size (if its a collection) - generateFile(File(outDir, "ArraysFromJavaCollections.kt"), "package std", File(srcDir, "JavaCollections.kt")) { + generateFile(File(outDir, "ArraysFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) { it.replaceAll("java.util.Collection", "Array") } - generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package std.util", File(srcDir, "JavaCollections.kt")) { + generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin.util", File(srcDir, "JavaCollections.kt")) { it.replaceAll("java.util.Collection", "java.lang.Iterable").replaceAll("(this.size)", "") } - generateFile(File(outDir, "StandardFromJavaCollections.kt"), "package std", File(srcDir, "JavaCollections.kt")) { + generateFile(File(outDir, "StandardFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) { it.replaceAll("java.util.Collection", "Iterable").replaceAll("(this.size)", "") } } diff --git a/testlib/test/GetOrElseTest.kt b/testlib/test/GetOrElseTest.kt index 6b43b80e3e6..37474d094ab 100644 --- a/testlib/test/GetOrElseTest.kt +++ b/testlib/test/GetOrElseTest.kt @@ -1,9 +1,10 @@ package test.standard -import std.* +import kotlin.* import kotlin.test.* +import junit.framework.TestCase -class GetOrElseTest() : TestSupport() { +class GetOrElseTest() : TestCase() { val v1: String? = "hello" val v2: String? = null var counter = 0 diff --git a/testlib/test/IoTest.kt b/testlib/test/IoTest.kt index cf5ef86e3d3..058f610c32f 100644 --- a/testlib/test/IoTest.kt +++ b/testlib/test/IoTest.kt @@ -2,12 +2,13 @@ package test.collections import kotlin.test.* -import std.io.* -import std.util.* +import kotlin.io.* +import kotlin.util.* import java.io.* import java.util.* +import junit.framework.TestCase -class IoTest() : TestSupport() { +class IoTest() : TestCase() { fun testLineIteratorWithManualClose() { val reader = sample().buffered() try { diff --git a/testlib/test/JavaClassTest.kt b/testlib/test/JavaClassTest.kt index 137fb5890b0..845336f73b8 100644 --- a/testlib/test/JavaClassTest.kt +++ b/testlib/test/JavaClassTest.kt @@ -1,10 +1,11 @@ package testjc import kotlin.test.* +import junit.framework.TestCase class C() -class JavaClassTest() : TestSupport() { +class JavaClassTest() : TestCase() { fun testMe () { assertEquals("java.util.ArrayList", java.util.ArrayList().javaClass.getName()) // assertEquals("java.util.ArrayList", javaClass>().getName()) diff --git a/testlib/test/ListTest.kt b/testlib/test/ListTest.kt index 2d8ecf8cc39..bb5c5b54fa2 100644 --- a/testlib/test/ListTest.kt +++ b/testlib/test/ListTest.kt @@ -4,12 +4,13 @@ import kotlin.test.* // TODO can we avoid importing all this stuff by default I wonder? // e.g. making println and the collection builder methods public by default? -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import java.util.* +import junit.framework.TestCase -class ListTest() : TestSupport() { +class ListTest() : TestCase() { val data = arrayList("foo", "bar") fun testHeadAndTail() { diff --git a/testlib/test/MapTest.kt b/testlib/test/MapTest.kt index d57b3ecc107..f7c46f6a976 100644 --- a/testlib/test/MapTest.kt +++ b/testlib/test/MapTest.kt @@ -4,12 +4,13 @@ import kotlin.test.* // TODO can we avoid importing all this stuff by default I wonder? // e.g. making println and the collection builder methods public by default? -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import java.util.* +import junit.framework.TestCase -class MapTest() : TestSupport() { +class MapTest() : TestCase() { val data: java.util.Map = java.util.HashMap() fun testGetOrElse() { diff --git a/testlib/test/MathTest.kt b/testlib/test/MathTest.kt index bad3ba757f4..f42b3129e14 100644 --- a/testlib/test/MathTest.kt +++ b/testlib/test/MathTest.kt @@ -1,12 +1,13 @@ package test.collections; -import std.math.* +import kotlin.math.* import java.math.BigInteger import java.math.BigDecimal import kotlin.test.* +import junit.framework.TestCase -class MathTest : TestSupport() { +class MathTest : TestCase() { fun testBigInteger() { val a = BigInteger("2") val b = BigInteger("3") diff --git a/testlib/test/OldStdlibTest.kt b/testlib/test/OldStdlibTest.kt index d88637ec876..3d1bcdfb465 100644 --- a/testlib/test/OldStdlibTest.kt +++ b/testlib/test/OldStdlibTest.kt @@ -1,13 +1,14 @@ package test.collections -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import kotlin.test.* import java.util.* import java.io.* +import junit.framework.TestCase -class OldStdlibTest() : TestSupport() { +class OldStdlibTest() : TestCase() { fun testCollectionEmpty() { assertNot { Arrays.asList(0, 1, 2)?.empty ?: false diff --git a/testlib/test/SetTest.kt b/testlib/test/SetTest.kt index 8727b99a06e..4b29b65c417 100644 --- a/testlib/test/SetTest.kt +++ b/testlib/test/SetTest.kt @@ -1,12 +1,13 @@ package test.collections -import std.* -import std.io.* -import std.util.* +import kotlin.* +import kotlin.io.* +import kotlin.util.* import kotlin.test.* import java.util.* +import junit.framework.TestCase -class SetTest() : TestSupport() { +class SetTest() : TestCase() { val data = hashSet("foo", "bar") fun testAny() { diff --git a/testlib/test/StandardCollectionTest.kt b/testlib/test/StandardCollectionTest.kt index 2b75f44cd9f..83cba4a97f3 100644 --- a/testlib/test/StandardCollectionTest.kt +++ b/testlib/test/StandardCollectionTest.kt @@ -1,9 +1,10 @@ package test.collections -import std.* +import kotlin.* import kotlin.test.* +import junit.framework.TestCase -class StandardCollectionTest() : TestSupport() { +class StandardCollectionTest() : TestCase() { fun testDisabled() { } @@ -11,7 +12,7 @@ class StandardCollectionTest() : TestSupport() { /* fun testAny() { // TODO requires KT-924 to be implemented - val data: Iterable = std.util.arrayList("foo", "bar") + val data: Iterable = kotlin.util.arrayList("foo", "bar") assertTrue { data.any{it.startsWith("f")} diff --git a/testlib/test/StdLibIssuesTest.kt b/testlib/test/StdLibIssuesTest.kt index 425671f163a..485f1f3e0c2 100644 --- a/testlib/test/StdLibIssuesTest.kt +++ b/testlib/test/StdLibIssuesTest.kt @@ -1,14 +1,15 @@ package test.stdlib.issues import java.util.List -import std.util.* +import kotlin.util.* import kotlin.test.* +import junit.framework.TestCase private fun listDifference(first : List, second : List) : List { return first.filter{ !second.contains(it) }.toList() } -class StdLibIssuesTest() : TestSupport() { +class StdLibIssuesTest() : TestCase() { fun test_KT_1131() { val data = arrayList("blah", "foo", "bar") diff --git a/testlib/test/StringTest.kt b/testlib/test/StringTest.kt index 020dc2baa97..dcde6bf4b3d 100644 --- a/testlib/test/StringTest.kt +++ b/testlib/test/StringTest.kt @@ -1,6 +1,6 @@ package testString -import std.io.* +import kotlin.io.* import kotlin.test.* import junit.framework.* diff --git a/testlib/test/Test.kt b/testlib/test/Test.kt index e3f94428bd1..f6eade6af77 100644 --- a/testlib/test/Test.kt +++ b/testlib/test/Test.kt @@ -1,13 +1,14 @@ -package stdhack.test +package kotlinhack.test -import std.io.* -import std.util.* +import junit.framework.* + +import kotlin.io.* +import kotlin.util.* import java.util.* import org.junit.* import org.junit.runner.* import org.junit.runner.notification.* -import junit.framework.* protected class TestBuilt(name: String, val builder: TestBuilder, val test: TestBuilt.() -> Unit) : TestCase(name) { private var myState: T? = null diff --git a/testlib/test/TestDslExample.kt b/testlib/test/TestDslExample.kt index 4e8ce5d4121..4bbdf7bdf7b 100644 --- a/testlib/test/TestDslExample.kt +++ b/testlib/test/TestDslExample.kt @@ -1,7 +1,7 @@ package testDslExample -import std.io.* -import stdhack.test.* +import kotlin.io.* +import kotlinhack.test.* import junit.framework.* import junit.textui.TestRunner diff --git a/testlib/test/concurrent/FListTest.kt b/testlib/test/concurrent/FListTest.kt index 8ad4c5c5bfb..fbc89746f6a 100644 --- a/testlib/test/concurrent/FListTest.kt +++ b/testlib/test/concurrent/FListTest.kt @@ -1,6 +1,6 @@ package test.concurrent -import std.concurrent.* +import kotlin.concurrent.* import junit.framework.* class FListTest() : TestCase() { diff --git a/testlib/test/dom/DomBuilderTest.kt b/testlib/test/dom/DomBuilderTest.kt index 2d5de2ab619..7720bae7a96 100644 --- a/testlib/test/dom/DomBuilderTest.kt +++ b/testlib/test/dom/DomBuilderTest.kt @@ -1,12 +1,13 @@ package test.dom -import std.* -import std.dom.* -import std.util.* +import kotlin.* +import kotlin.dom.* +import kotlin.util.* import kotlin.test.* import org.w3c.dom.* +import junit.framework.TestCase -class DomBuilderTest() : TestSupport() { +class DomBuilderTest() : TestCase() { fun testBuildDocument() { diff --git a/testlib/test/dom/DomTest.kt b/testlib/test/dom/DomTest.kt index ad51bf71065..9a6122ad193 100644 --- a/testlib/test/dom/DomTest.kt +++ b/testlib/test/dom/DomTest.kt @@ -1,11 +1,12 @@ package test.dom -import std.* -import std.dom.* +import kotlin.* +import kotlin.dom.* import kotlin.test.* import org.w3c.dom.* +import junit.framework.TestCase -class DomTest() : TestSupport() { +class DomTest() : TestCase() { fun testCreateDocument() { var doc = createDocument() diff --git a/testlib/test/properties/PropertiesTest.kt b/testlib/test/properties/PropertiesTest.kt index cb9052894a0..b31dab87288 100644 --- a/testlib/test/properties/PropertiesTest.kt +++ b/testlib/test/properties/PropertiesTest.kt @@ -1,8 +1,8 @@ package test.properties -import std.* -import std.properties.* -import std.util.* +import kotlin.* +import kotlin.properties.* +import kotlin.util.* import kotlin.test.* import java.util.* import junit.framework.TestCase diff --git a/testlib/test/regressions/Kt1149.kt b/testlib/test/regressions/Kt1149.kt index cfc1c911fe1..8404e5093f8 100644 --- a/testlib/test/regressions/Kt1149.kt +++ b/testlib/test/regressions/Kt1149.kt @@ -1,7 +1,7 @@ package test.regressions.kt1149 import java.util.ArrayList -import std.util.* +import kotlin.util.* import junit.framework.* public trait SomeTrait { diff --git a/testlib/test/regressions/kt1172.kt b/testlib/test/regressions/kt1172.kt index 9f60d47b4a0..4507af43cbe 100644 --- a/testlib/test/regressions/kt1172.kt +++ b/testlib/test/regressions/kt1172.kt @@ -1,6 +1,6 @@ package test.regressions.kt1172 -import std.concurrent.* +import kotlin.concurrent.* import junit.framework.* import java.util.* diff --git a/testlib/testlib.iml b/testlib/testlib.iml index d1780f417e7..451f44383d2 100644 --- a/testlib/testlib.iml +++ b/testlib/testlib.iml @@ -8,16 +8,17 @@ + + - + -