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 07ce098f0da..2ae51835a8f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -132,7 +132,7 @@ public class IntrinsicMethods { declareOverload(myStdLib.getLibraryScope().getFunctions("equals"), 1, EQUALS); declareOverload(myStdLib.getLibraryScope().getFunctions("identityEquals"), 1, IDENTITY_EQUALS); declareOverload(myStdLib.getLibraryScope().getFunctions("plus"), 1, STRING_PLUS); - declareOverload(myStdLib.getLibraryScope().getFunctions("Array"), 1, new NewArray()); + declareOverload(myStdLib.getLibraryScope().getFunctions("arrayOfNulls"), 1, new NewArray()); declareOverload(myStdLib.getLibraryScope().getFunctions("sure"), 0, new Sure()); declareOverload(myStdLib.getLibraryScope().getFunctions("synchronized"), 2, new StupidSync()); declareOverload(myStdLib.getLibraryScope().getFunctions("iterator"), 0, new IteratorIterator()); diff --git a/compiler/frontend/src/jet/Arrays.jet b/compiler/frontend/src/jet/Arrays.jet index 35aadde0c18..dc02070a140 100644 --- a/compiler/frontend/src/jet/Arrays.jet +++ b/compiler/frontend/src/jet/Arrays.jet @@ -1,6 +1,6 @@ package jet -public fun Array(public val size : Int) : Array +public fun arrayOfNulls(public val size : Int) : Array public class Array(public val size : Int, init : (Int) -> T) { public fun get(index : Int) : T diff --git a/compiler/testData/codegen/controlStructures/forIntRange.jet b/compiler/testData/codegen/controlStructures/forIntRange.jet index d215a925bb9..abe4d5cd808 100644 --- a/compiler/testData/codegen/controlStructures/forIntRange.jet +++ b/compiler/testData/codegen/controlStructures/forIntRange.jet @@ -1,5 +1,5 @@ fun box() : String { - val a = Array(3) + val a = arrayOfNulls(3) a[0] = "a" a[1] = "b" a[2] = "c" diff --git a/compiler/testData/codegen/controlStructures/forNullableIntArray.jet b/compiler/testData/codegen/controlStructures/forNullableIntArray.jet index 0177457e245..0b30bc8224f 100644 --- a/compiler/testData/codegen/controlStructures/forNullableIntArray.jet +++ b/compiler/testData/codegen/controlStructures/forNullableIntArray.jet @@ -1,5 +1,5 @@ fun box() : String { - val b : Array = Array (5) + val b : Array = arrayOfNulls (5) var i = 0 var sum = 0 while(i < 5) { diff --git a/compiler/testData/codegen/controlStructures/forUserType.jet b/compiler/testData/codegen/controlStructures/forUserType.jet index c7c8510f254..7c0a4d1203d 100644 --- a/compiler/testData/codegen/controlStructures/forUserType.jet +++ b/compiler/testData/codegen/controlStructures/forUserType.jet @@ -54,7 +54,7 @@ fun box() : String { } if(sum != 10) return "a failed" - val b : Array = Array (5) + val b : Array = arrayOfNulls (5) i = 0 while(i < 5) { b[i] = i++ diff --git a/compiler/testData/codegen/regressions/kt1018.kt b/compiler/testData/codegen/regressions/kt1018.kt index 5e96b01c0e5..5fac168ecf4 100644 --- a/compiler/testData/codegen/regressions/kt1018.kt +++ b/compiler/testData/codegen/regressions/kt1018.kt @@ -5,7 +5,7 @@ public class StockMarketTableModel() { } class object { - private val COLUMN_TITLES : Array = Array(10) + private val COLUMN_TITLES : Array = arrayOfNulls(10) } } diff --git a/compiler/testData/codegen/regressions/kt238.jet b/compiler/testData/codegen/regressions/kt238.jet index 9332cbf870f..2d68811606e 100644 --- a/compiler/testData/codegen/regressions/kt238.jet +++ b/compiler/testData/codegen/regressions/kt238.jet @@ -1,5 +1,5 @@ fun t1 () { - val a1 = Array(1) + val a1 = arrayOfNulls(1) a1[0] = "0" //ok val s = a1[0] //ok } @@ -11,7 +11,7 @@ fun t2 () { } fun t3 () { - val a3 = Array(1) + val a3 = arrayOfNulls(1) a3[0] = 0 //verify error var j = a3[0] //ok var k : Int = a3[0] ?: 5 //ok diff --git a/compiler/testData/codegen/regressions/kt560.jet b/compiler/testData/codegen/regressions/kt560.jet index 29da5fd53ba..bddfb6d8514 100644 --- a/compiler/testData/codegen/regressions/kt560.jet +++ b/compiler/testData/codegen/regressions/kt560.jet @@ -23,6 +23,6 @@ open class AllEvenNum() { } fun box() : String { - AllEvenNum.main(Array(0)) + AllEvenNum.main(arrayOfNulls(0)) return "OK" } diff --git a/compiler/testData/codegen/regressions/kt594.jet b/compiler/testData/codegen/regressions/kt594.jet index 93c5580e600..2662b218785 100644 --- a/compiler/testData/codegen/regressions/kt594.jet +++ b/compiler/testData/codegen/regressions/kt594.jet @@ -5,8 +5,8 @@ fun box() : String { array?.set(0, 3) if(array?.get(0) != 3) return "fail" - var a = Array?>(5) - var b = Array(1) + var a = arrayOfNulls>(5) + var b = arrayOfNulls(1) b.set(0, "239") a?.set(0, b) diff --git a/compiler/testData/codegen/regressions/kt602.jet b/compiler/testData/codegen/regressions/kt602.jet index aae930a7328..002cf675b6b 100644 --- a/compiler/testData/codegen/regressions/kt602.jet +++ b/compiler/testData/codegen/regressions/kt602.jet @@ -1 +1 @@ -fun box() = if(Array(10) is Array) "OK" else "fail" +fun box() = if(arrayOfNulls(10) is Array) "OK" else "fail" diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.jet b/compiler/testData/diagnostics/tests/inference/kt1293.jet index bcd6708d726..6c43da67d12 100644 --- a/compiler/testData/diagnostics/tests/inference/kt1293.jet +++ b/compiler/testData/diagnostics/tests/inference/kt1293.jet @@ -3,7 +3,7 @@ package kt1293 fun main(args : Array) { - val intArray = Array(10) + val intArray = arrayOfNulls(10) val i : Int = intArray[0] requiresInt(intArray[0]) } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java index aff2344d114..83935e04995 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java @@ -43,7 +43,7 @@ public class ArrayGenTest extends CodegenTestCase { } public void testCreateMultiIntNullable () throws Exception { - loadText("fun foo() = Array> (5, { Array(it) })"); + loadText("fun foo() = Array> (5, { arrayOfNulls(it) })"); Method foo = generateFunction(); Integer[][] invoke = (Integer[][]) foo.invoke(null); assertEquals(invoke[2].length, 2); diff --git a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java index bab19aa33da..5b18e101b47 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java @@ -398,7 +398,7 @@ public class NamespaceGenTest extends CodegenTestCase { } public void testArrayNewNullable() throws Exception { - loadText("fun foo() = Array(4)"); + loadText("fun foo() = arrayOfNulls(4)"); // System.out.println(generateToText()); final Method main = generateFunction(); Integer[] result = (Integer[]) main.invoke(null); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java index 7e445c78177..4ee6151550f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java @@ -127,7 +127,7 @@ public final class Intrinsics { } private void declareNullConstructorIntrinsic() { - FunctionDescriptor nullArrayConstructor = library.getLibraryScope().getFunctions("Array").iterator().next(); + FunctionDescriptor nullArrayConstructor = library.getLibraryScope().getFunctions("arrayOfNulls").iterator().next(); functionIntrinsics.put(nullArrayConstructor, new CallStandardMethodIntrinsic("Kotlin.nullArray", false, 1)); } diff --git a/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt b/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt index 0b0cad9557b..74ab5b8e675 100644 --- a/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt +++ b/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt @@ -1,6 +1,6 @@ package foo -val a1 = Array(10) +val a1 = arrayOfNulls(10) fun box() : Boolean { var c = 0 diff --git a/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt b/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt index 951265396c3..d056f147f9c 100644 --- a/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt +++ b/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt @@ -1,6 +1,6 @@ package foo -val a1 = Array(0) +val a1 = arrayOfNulls(0) fun box() : Boolean { for (a in a1) { diff --git a/js/js.translator/testFiles/standardClasses/cases/array.kt b/js/js.translator/testFiles/standardClasses/cases/array.kt index 39bf1b06d99..061fde44366 100644 --- a/js/js.translator/testFiles/standardClasses/cases/array.kt +++ b/js/js.translator/testFiles/standardClasses/cases/array.kt @@ -2,7 +2,7 @@ package foo fun box() : Boolean { - val a = Array(2) + val a = arrayOfNulls(2) a.set(1, 2) return a.get(1) == 2 } diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt b/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt index 95abf5a8fdc..b4d4885f1e4 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt @@ -1,7 +1,7 @@ package foo fun box() : Boolean { - val a = Array(4) + val a = arrayOfNulls(4) a[1] = 2 a[2] = 3 return (a[1] == 2) && (a[2] == 3) diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt b/js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt index abd58ef8ed9..e232fb320e5 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt @@ -1,5 +1,5 @@ package foo -val a = Array(3) +val a = arrayOfNulls(3) fun box() = (a[0] == null && a[1] == null && a[2] == null) \ No newline at end of file diff --git a/js/js.translator/testFiles/standardClasses/cases/arraySize.kt b/js/js.translator/testFiles/standardClasses/cases/arraySize.kt index 3a9039acffc..fd236c8ff85 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arraySize.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arraySize.kt @@ -2,7 +2,7 @@ package foo class A() {} -val a1 = Array(3) -val a2 = Array(2) +val a1 = arrayOfNulls(3) +val a2 = arrayOfNulls(2) fun box() = (a1.size == 3 && a2.size == 2) \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/JUtil.kt b/libraries/stdlib/src/kotlin/JUtil.kt index 59b69ef4ce9..3367dc8edfa 100644 --- a/libraries/stdlib/src/kotlin/JUtil.kt +++ b/libraries/stdlib/src/kotlin/JUtil.kt @@ -32,7 +32,7 @@ val Collection<*>.indices : IntRange get() = 0..size-1 public inline fun java.util.Collection.toArray() : Array { - val answer = Array(this.size) + val answer = arrayOfNulls(this.size) var idx = 0 for (elem in this) answer[idx++] = elem