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

@@ -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<T>, but does not sit inside the class Array
 val <T> Array<T>.isEmpty : Boolean get() = size == 0

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<T>, but does not sit inside the class Array
 val <T> Array<T>.isEmpty : Boolean get() = size == 0

build.xml

@@ -153,7 +153,7 @@
     </target>
 
     <target name="generateStdlib" depends="compileTestlib" description="Generates the stdlib APIs for arrays and kotlin collections">
-        <java classname="kotlin.tools.namespace" failonerror="true" fork="true">
+        <java classname="org.jetbrains.kotlin.tools.namespace" failonerror="true" fork="true">
             <classpath>
                 <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
                 <pathelement location="${kotlin-home}/lib/kotlin-test.jar"/>

compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java

@@ -182,7 +182,7 @@ public class GenerationState {
         final ClassFileFactory factory = getFactory();
         List<String> 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));
 //            }

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<String> primitiveCastMethods = OperatorConventions.NUMBER_CONVERSIONS.asList();
         for (String method : primitiveCastMethods) {

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);

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;
 

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(){

compiler/testData/codegen/regressions/kt274.kt

@@ -1,4 +1,4 @@
-import std.*
+import kotlin.*
 
 fun box() : String {
     val vector = java.util.Vector<Int>()

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)
         }
     }
 }

compiler/testData/codegen/regressions/kt715.kt

@@ -1,4 +1,4 @@
-import std.*
+import kotlin.*
 
 val test = "lala".javaClass
 

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<Int>();

compiler/testData/codegen/regressions/kt864.jet

@@ -1,4 +1,4 @@
-import std.util.*
+import kotlin.util.*
 import java.io.*
 import java.util.*
 

compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet

@@ -1,6 +1,6 @@
 // +JDK
 
-package std1
+package kotlin1
 
 import java.util.*
 

compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet

@@ -1,6 +1,6 @@
 // +JDK
 
-package std1
+package kotlin1
 
 import java.util.*
 

compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet

@@ -1,6 +1,6 @@
 // +JDK
 
-package std1
+package kotlin1
 
 import java.util.*
 

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<String>) {

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.*
 

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
       }

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
 }

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`
+~foo~fun Int.foo() = this`:kotlin::Int`

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 {

compiler/testData/resolve/Projections.jet

@@ -48,7 +48,7 @@ fun testInOut() {
   (return : Inv<*>).`!`inf(1)
 
   Inv<Int>().`Inv.outf`outf()
-  ((return : Inv<in Int>).`Inv.outf`outf())`:std::Any`
+  ((return : Inv<in Int>).`Inv.outf`outf())`:kotlin::Any`
   (return : Inv<out Int>).`Inv.outf`outf()
   (return : Inv<*>).`Inv.outf`outf()
 

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<Int>(1)`:std::Int`
+  `t`t<Int>(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<String>() `plus`+ "1"
   X<String>() `plus`plus "sadfas"
   X<String>().`plus`plus("")
@@ -69,7 +69,7 @@ fun <T> 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 <T> 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
 }
 
 

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())
   }
 }

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`
   }
 }

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`
 }

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();

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<String, DeclarationDescriptor> nameToDescriptor = new HashMap<String, DeclarationDescriptor>();
-        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<String, PsiElement> nameToDeclaration = new HashMap<String, PsiElement>();
         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

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<String>) {
   // Easy to make BigDecimals user-friendly

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<String>) {
     // Problematic case does not compile

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<String>) {
     val MICROS_PER_DAY : Long = 24.toLong() * 60 * 60 * 1000 * 1000;

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<String>) {
     // Problematic case does not compile

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<String>) {
     println(-1.toByte().toChar().toInt())

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<String>) {
     var x = 1

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<String>) {
     // Problematic case does not compile

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<String>) {
     print("H" + "a")

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<String>) {
     val pig = "length: 10";

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<String>) {
     // \u0022 is the Unicode escape for double quote (")

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

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<String>) {
     // Note: \u000A is Unicode representation of linefeed (LF)

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() {

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() {

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();
 

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<String>) {
 //    for (b : Byte in Byte.MIN_VALUE..Byte.MAX_VALUE) {

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

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<String>) {
     var i : Short = -1.toShort()

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<T : Comparable<T>>() {
     fun curse(i : T, j : T) {

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<String>) {
 // Problematic code does not compile

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<String>) {
     println(decision())

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 =

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

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
 

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 {

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 {

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) {

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 {

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 {

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<String>) {

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

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
 
 /**

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
 

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.

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.

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

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

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

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

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

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

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;

examples/src/luhny/solution.kt

@@ -1,6 +1,6 @@
 package luhnybin
 
-import std.io.*
+import kotlin.io.*
 import java.io.*
 import java.util.ArrayDeque
 

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() {

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

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

js/js.translator/testFiles/stdlib/cases/Filter.kt

@@ -1,4 +1,4 @@
-package std
+package kotlin
 
 import java.util.*
 import java.lang.Iterable

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

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

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
 

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

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

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
 

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
 

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

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
 

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
 

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
 

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

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
 

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

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

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

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<String,KPackage>()
     public val packageMap: SortedMap<String, KPackage> = TreeMap<String, KPackage>()
 
@@ -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<String,KClass>()
     public val classMap: SortedMap<String, KClass> = TreeMap<String, KClass>()
 

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

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

kunit/kunit.iml

@@ -7,7 +7,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
+    <orderEntry type="library" exported="" name="KotlinRuntime" level="project" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-4.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

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() {
+}

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)
+    }
+}

runtests/runtests.iml

@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="stdlib" exported="" />
     <orderEntry type="module" module-name="testlib" exported="" />
+    <orderEntry type="module" module-name="kunit" exported="" />
   </component>
 </module>
 

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.*;