azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
aliasing.
This commit is contained in:
Evgeny Gerashchenko
2013-03-19 21:49:42 +04:00
parent 8a021abaa5
commit 66e7a0110c
12 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadKotlin/type/Tuple0.kt
-3
View File
@@ -1,3 +0,0 @@
package test
fun tuple0() = Unit.VALUE
compiler/testData/loadKotlin/type/Tuple0.txt
-3
View File
@@ -1,3 +0,0 @@
package test
internal fun tuple0() : Unit
compiler/testData/loadKotlin/type/Unit.kt
+3
View File
@@ -0,0 +1,3 @@
package test
fun unit() = Unit.VALUE
compiler/testData/loadKotlin/type/Unit.txt
+3
View File
@@ -0,0 +1,3 @@
package test
internal fun unit() : Unit
compiler/testData/renderer/FunctionTypes.kt
+2 -2
View File
@@ -1,8 +1,8 @@
var v1 : () -> Tuple0 var v1 : () -> Unit
var v2 : (Int) -> Int var v2 : (Int) -> Int
var v3 : (Int, String) -> String var v3 : (Int, String) -> String
var v4 : Function1<Int, String> var v4 : Function1<Int, String>
var v4 : (() -> Int, (String) -> Tuple0) -> String var v4 : (() -> Int, (String) -> Unit) -> String
var v5 : Int.() -> Int var v5 : Int.() -> Int
var v6 : Int.(String, Int) -> Unit var v6 : Int.(String, Int) -> Unit
var v7 : ExtensionFunction1<Int, String, Boolean> var v7 : ExtensionFunction1<Int, String, Boolean>
compiler/testData/renderer/TupleTypes.kt
+2 -6
View File
@@ -1,9 +1,5 @@
var v1 : Tuple0 var v1 : Unit
var v2 : Tuple0? var v2 : Unit?
var v3 : Unit
var v4 : Unit?
//internal var v1 : Unit defined in root package //internal var v1 : Unit defined in root package
//internal var v2 : 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
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
+3 -3
View File
@@ -986,9 +986,9 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTestWithAccessors("compiler/testData/loadKotlin/type/StringQ.kt"); doTestWithAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
} }
@TestMetadata("Tuple0.kt") @TestMetadata("Unit.kt")
public void testTuple0() throws Exception { public void testUnit() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/type/Tuple0.kt"); doTestWithAccessors("compiler/testData/loadKotlin/type/Unit.kt");
} }
} }
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+3 -3
View File
@@ -988,9 +988,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/StringQ.kt"); doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
} }
@TestMetadata("Tuple0.kt") @TestMetadata("Unit.kt")
public void testTuple0() throws Exception { public void testUnit() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Tuple0.kt"); doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Unit.kt");
} }
} }
idea/testData/completion/class/InExpressionNoPrefix.kt
+1 -1
View File
@@ -5,5 +5,5 @@ class Test {
} }
// RUNTIME: 1 // RUNTIME: 1
// EXIST: Any, Nothing, Tuple0, Int, Number // EXIST: Any, Nothing, Unit, Int, Number
// EXIST: Array, Math, Hashable, OutputStream // EXIST: Array, Math, Hashable, OutputStream
idea/testData/completion/class/InExtendTypeAnnotation.kt
+1 -1
View File
@@ -4,5 +4,5 @@ class Test : <caret> {
} }
// RUNTIME: 1 // RUNTIME: 1
// EXIST: Any, Nothing, Tuple0, Int, Number // EXIST: Any, Nothing, Unit, Int, Number
// EXIST: Array, Math, Hashable, OutputStream // EXIST: Array, Math, Hashable, OutputStream
idea/testData/resolve/builtins/unit.kt
+1 -1
View File
@@ -1,2 +1,2 @@
var x : <ref>Unit? var x : <ref>Unit?
//jet/Unit.jet:Tuple0 //jet/Unit.jet:Unit
libraries/stdlib/src/kotlin/StringsJVM.kt
+1 -1
View File
@@ -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.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()) public inline fun String.indexOf(ch : Char) : Int = (this as java.lang.String).indexOf(ch.toString())