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

Drop inlineOptions and fix forgotten usages

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-23 12:07:07 +03:00
parent 67486b867b
commit 098f5462eb
58 changed files with 13 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes.txt
Vendored
-22
View File
@@ -591,22 +591,6 @@ public interface Function</*0*/ out R> {
/*primary*/ public constructor HiddenDeclaration()
}
public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
enum entry LOCAL_CONTINUE_AND_BREAK
enum entry ONLY_LOCAL_RETURN
/*primary*/ private constructor InlineOption()
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineOption): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineOption
public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineOption>
}
public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
/*primary*/ private constructor Int()
public final fun and(/*0*/ other: kotlin.Int): kotlin.Int
@@ -1268,12 +1252,6 @@ public object Unit {
/*primary*/ public constructor inline()
}
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class inlineOptions : kotlin.Annotation {
/*primary*/ public constructor inlineOptions(/*0*/ vararg value: kotlin.InlineOption /*kotlin.Array<out kotlin.InlineOption>*/)
public final val value: kotlin.Array<out kotlin.InlineOption>
public final fun <get-value>(): kotlin.Array<out kotlin.InlineOption>
}
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class noinline : kotlin.Annotation {
/*primary*/ public constructor noinline()
}
compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
abstract class A<R> {
abstract fun getO() : R
compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
abstract class A<R>(val param : R) {
abstract fun getO() : R
compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
//NO_CHECK_LAMBDA_INLINING
import builders.*
import kotlin.InlineOption.*
inline fun testAllInline(f: () -> String) : String {
val args = arrayOf("1", "2", "3")
compiler/testData/codegen/boxInline/capture/captureInlinable.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
inline fun <R> doWork(crossinline job: ()-> R) : R {
return notInline({job()})
compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
inline fun <R> doWork(crossinline job: ()-> R) : R {
val k = 10;
compiler/testData/codegen/boxInline/complex/with.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
public class Data()
compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package zzz
import kotlin.InlineOption.*
inline fun calc(crossinline lambda: () -> Int): Int {
return doCalc { lambda() }
compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
import kotlin.InlineOption.*
fun test1(param: String): String {
var result = "fail1"
compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
inline fun <R> call(crossinline f: () -> R) : R {
return {f()} ()
compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
import kotlin.InlineOption.*
fun testSameCaptured() : String {
var result = 0;
compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
inline fun <R> doWork(crossinline job: ()-> R) : R {
val k = 10;
compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
//NO_CHECK_LAMBDA_INLINING
import test.*
import kotlin.InlineOption.*
inline fun test1(crossinline param: () -> String): String {
var result = "fail"
compiler/testData/codegen/boxInline/simple/rootConstructor.2.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package test
import kotlin.InlineOption.*
inline fun <R> doWork(crossinline job: ()-> R) : R {
return notInline({job()})
compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
inline fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
inline fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun box(): String {
return test()
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
fun box(): String {
return test{"OK"}
compiler/testData/codegen/boxInline/smap/smap.1.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import builders.*
import kotlin.InlineOption.*
inline fun test(): String {
var res = "Fail"
compiler/testData/codegen/boxWithStdlib/reified/newArrayInt.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun<reified T> createArray(n: Int, crossinline block: () -> T): Array<T> {
return Array<T>(n) { block() }
compiler/testData/codegen/boxWithStdlib/reified/recursiveNewArray.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun<reified T> createArray(n: Int, crossinline block: () -> T): Array<T> {
return Array<T>(n) { block() }
compiler/testData/codegen/boxWithStdlib/reified/sameIndexRecursive.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun<reified T1, reified T2> createArray(n: Int, crossinline block: () -> Pair<T1, T2>): Pair<Array<T1>, Array<T2>> {
return Pair(Array(n) { block().first }, Array(n) { block().second })
compiler/testData/codegen/innerClassInfo/anonymousObjectInline.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
class A {
fun foo() {
compiler/testData/codegen/outerClassInfo/inlineLambda.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package foo
import kotlin.InlineOption.*
class Foo {
compiler/testData/codegen/outerClassInfo/inlineObject.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
package foo
import kotlin.InlineOption.*
class Foo {
compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ val a: Enum<E> = E.ENTRY
val b: Enum<RetentionPolicy> = RetentionPolicy.RUNTIME
// Test deserialized resolve
val c: Enum<InlineOption> = InlineOption.ONLY_LOCAL_RETURN
val c: Enum<AnnotationTarget> = AnnotationTarget.CLASS
compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
public val a: kotlin.Enum<E>
public val b: kotlin.Enum<java.lang.annotation.RetentionPolicy>
public val c: kotlin.Enum<kotlin.InlineOption>
public val c: kotlin.Enum<kotlin.annotation.AnnotationTarget>
public final enum class E : kotlin.Enum<E> {
enum entry ENTRY
compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
val s = object {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
val s = object {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun <R> onlyLocal(crossinline p: () -> R) {
inlineAll(p)
compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun <R> inlineFunWithAnnotation(crossinline p: () -> R) {
inlineFun {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.ONLY_LOCAL_RETURN
inline fun testSameCaptured(lambdaWithResultCaptured: () -> Unit) : String {
doWork({<!NON_LOCAL_RETURN_NOT_ALLOWED!>lambdaWithResultCaptured<!>()})
compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
<!NOT_YET_SUPPORTED_IN_INLINE!>fun a() {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
{
compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
inline fun <R> inlineFunOnlyLocal(crossinline p: () -> R) {
<!NOT_YET_SUPPORTED_IN_INLINE!>class A {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
fun <R> fun1(p: () -> R) {
inlineFun {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
import kotlin.InlineOption.*
class Z {
inline fun <R> inlineFun(crossinline p: () -> R) {
compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import kotlin.InlineOption.*
inline fun <R> toOnlyLocal(crossinline p: () -> R) {
p()