Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated test data and stdlib code which dependent on Tuple0/Unit

aliasing.
  • Loading branch information...
commit 66e7a0110c7c26e3c8da12a3c59e95c7eb927839 1 parent 8a021ab
@geevee geevee authored
View
3  compiler/testData/loadKotlin/type/Tuple0.kt
@@ -1,3 +0,0 @@
-package test
-
-fun tuple0() = Unit.VALUE
View
3  compiler/testData/loadKotlin/type/Tuple0.txt
@@ -1,3 +0,0 @@
-package test
-
-internal fun tuple0() : Unit
View
3  compiler/testData/loadKotlin/type/Unit.kt
@@ -0,0 +1,3 @@
+package test
+
+fun unit() = Unit.VALUE
View
3  compiler/testData/loadKotlin/type/Unit.txt
@@ -0,0 +1,3 @@
+package test
+
+internal fun unit() : Unit
View
4 compiler/testData/renderer/FunctionTypes.kt
@@ -1,8 +1,8 @@
-var v1 : () -> Tuple0
+var v1 : () -> Unit
var v2 : (Int) -> Int
var v3 : (Int, String) -> String
var v4 : Function1<Int, String>
-var v4 : (() -> Int, (String) -> Tuple0) -> String
+var v4 : (() -> Int, (String) -> Unit) -> String
var v5 : Int.() -> Int
var v6 : Int.(String, Int) -> Unit
var v7 : ExtensionFunction1<Int, String, Boolean>
View
8 compiler/testData/renderer/TupleTypes.kt
@@ -1,9 +1,5 @@
-var v1 : Tuple0
-var v2 : Tuple0?
-var v3 : Unit
-var v4 : Unit?
+var v1 : Unit
+var v2 : Unit?
//internal var v1 : Unit defined in root package
//internal var v2 : Unit? defined in root package
-//internal var v3 : Unit defined in root package
-//internal var v4 : Unit? defined in root package
View
6 compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
@@ -986,9 +986,9 @@ public void testStringQ() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
}
- @TestMetadata("Tuple0.kt")
- public void testTuple0() throws Exception {
- doTestWithAccessors("compiler/testData/loadKotlin/type/Tuple0.kt");
+ @TestMetadata("Unit.kt")
+ public void testUnit() throws Exception {
+ doTestWithAccessors("compiler/testData/loadKotlin/type/Unit.kt");
}
}
View
6 compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -988,9 +988,9 @@ public void testStringQ() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
}
- @TestMetadata("Tuple0.kt")
- public void testTuple0() throws Exception {
- doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Tuple0.kt");
+ @TestMetadata("Unit.kt")
+ public void testUnit() throws Exception {
+ doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Unit.kt");
}
}
View
2  idea/testData/completion/class/InExpressionNoPrefix.kt
@@ -5,5 +5,5 @@ class Test {
}
// RUNTIME: 1
-// EXIST: Any, Nothing, Tuple0, Int, Number
+// EXIST: Any, Nothing, Unit, Int, Number
// EXIST: Array, Math, Hashable, OutputStream
View
2  idea/testData/completion/class/InExtendTypeAnnotation.kt
@@ -4,5 +4,5 @@ class Test : <caret> {
}
// RUNTIME: 1
-// EXIST: Any, Nothing, Tuple0, Int, Number
+// EXIST: Any, Nothing, Unit, Int, Number
// EXIST: Array, Math, Hashable, OutputStream
View
2  idea/testData/resolve/builtins/unit.kt
@@ -1,2 +1,2 @@
var x : <ref>Unit?
-//jet/Unit.jet:Tuple0
+//jet/Unit.jet:Unit
View
2  libraries/stdlib/src/kotlin/StringsJVM.kt
@@ -102,7 +102,7 @@ public inline fun String.getBytes(charset : java.nio.charset.Charset) : ByteArra
public inline fun String.getBytes(charsetName : String) : ByteArray = (this as java.lang.String).getBytes(charsetName)
-public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Tuple0 = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin)
+public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Unit = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin)
public inline fun String.indexOf(ch : Char) : Int = (this as java.lang.String).indexOf(ch.toString())
Please sign in to comment.
Something went wrong with that request. Please try again.