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

FIR: Adjust test data. FakeOverride -> SubssitutionOverride

Browse Source
This commit is contained in:
Denis Zharkov
2020-10-28 15:32:51 +03:00
parent 3e37995004
commit 65119adb6a
169 changed files with 408 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt
Vendored
+2 -2
View File
@@ -20,9 +20,9 @@ FILE: enumValues.kt
}
public final fun foo(): R|kotlin/Unit| {
lval values: R|kotlin/Array<MyEnum>| = Q|MyEnum|.R|/MyEnum.values|()
lval <iterator>: R|kotlin/collections/Iterator<MyEnum>| = R|<local>/values|.R|FakeOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<MyEnum>|>|()
lval <iterator>: R|kotlin/collections/Iterator<MyEnum>| = R|<local>/values|.R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<MyEnum>|>|()
while(R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()) {
lval value: R|MyEnum| = R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|MyEnum|>|()
lval value: R|MyEnum| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|MyEnum|>|()
R|<local>/value|.R|/MyEnum.bar|()
}
compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt
Vendored
+2 -2
View File
@@ -11,10 +11,10 @@ FILE: extensionPropertyInLambda.kt
}
public final var <T> R|C<T>|.y: R|T|
public get(): R|T| {
^ this@R|/y|.R|FakeOverride</C.x: R|T|>|
^ this@R|/y|.R|SubstitutionOverride</C.x: R|T|>|
}
public set(v: R|T|): R|kotlin/Unit| {
this@R|/y|.R|FakeOverride</C.x: R|T|>| = R|<local>/v|
this@R|/y|.R|SubstitutionOverride</C.x: R|T|>| = R|<local>/v|
}
public final fun use(f: R|() -> kotlin/String|): R|kotlin/Unit| {
}
compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt
Vendored
+2 -2
View File
@@ -12,7 +12,7 @@ FILE: test.kt
}
public final fun <D : R|Descriptor|> test(call: R|Call<D>|, resolvedCall: R|ResolvedCall<D>|): R|kotlin/Unit| {
R|<local>/call|.R|FakeOverride</Call.resultingDescriptor: R|D|>|.R|/name|
R|<local>/call|.R|SubstitutionOverride</Call.resultingDescriptor: R|D|>|.R|/name|
R|<local>/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name|
lval resolvedDescriptor: R|D?| = R|<local>/resolvedCall|.R|/ResolvedCall.candidateDescriptor|
when () {
@@ -24,6 +24,6 @@ FILE: test.kt
R|<local>/resolvedDescriptor|.R|/foo|()
}
public final fun otherTest(call: R|Call<*>|, resolvedCall: R|ResolvedCall<*>|): R|kotlin/Unit| {
R|<local>/call|.R|FakeOverride</Call.resultingDescriptor: R|CapturedType(*)|>|.R|/name|
R|<local>/call|.R|SubstitutionOverride</Call.resultingDescriptor: R|CapturedType(*)|>|.R|/name|
R|<local>/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name|
}
compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ FILE: test.kt
private final val DERIVED_FACTORY: R|DiagnosticFactory0<ft<DerivedElement, DerivedElement?>!>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|ft<DerivedElement, DerivedElement?>!|>()
private get(): R|DiagnosticFactory0<ft<DerivedElement, DerivedElement?>!>|
public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| {
lval casted: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>| = R|/DERIVED_FACTORY|.R|FakeOverride</DiagnosticFactory0.cast: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>|>|(R|<local>/d|)
lval casted: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|Diagnostic<ft<DerivedElement, DerivedElement?>!>|>|(R|<local>/d|)
lval element: R|DerivedElement| = R|<local>/casted|.R|/Diagnostic.element|
R|/Fix.Fix|(R|<local>/element|)
}
compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ FILE: genericPropertyAccess.kt
}
public final override fun foo(): R|T| {
^foo this@R|/Derived|.R|FakeOverride</Derived.x: R|T|>|
^foo this@R|/Derived|.R|SubstitutionOverride</Derived.x: R|T|>|
}
}
compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt
Vendored
+2 -2
View File
@@ -13,7 +13,7 @@ FILE: genericUsedInFunction.kt
}
public final fun test(arg: R|Generic<kotlin/String>|): R|kotlin/Unit| {
lval value: R|kotlin/String| = R|<local>/arg|.R|FakeOverride</Generic.value: R|kotlin/String|>|
lval foo: R|kotlin/String| = R|<local>/arg|.R|FakeOverride</Generic.foo: R|kotlin/String|>|()
lval value: R|kotlin/String| = R|<local>/arg|.R|SubstitutionOverride</Generic.value: R|kotlin/String|>|
lval foo: R|kotlin/String| = R|<local>/arg|.R|SubstitutionOverride</Generic.foo: R|kotlin/String|>|()
lval length: R|kotlin/Int| = R|<local>/foo|.R|kotlin/String.length|.R|kotlin/Int.plus|(R|<local>/value|.R|kotlin/String.length|)
}
compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt
Vendored
+1 -1
View File
@@ -31,5 +31,5 @@ FILE: importedReceiver.kt
Q|My|.R|/My.baz|()
(Q|My|, Boolean(true)).R|/My.gau|()
Q|My|.R|/Your.wat|()
(Q|My|, Boolean(false)).R|FakeOverride</My.watwat: R|kotlin/Unit|>|<R|kotlin/Boolean|>()
(Q|My|, Boolean(false)).R|SubstitutionOverride</My.watwat: R|kotlin/Unit|>|<R|kotlin/Boolean|>()
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FILE: doubleBrackets.kt
}
public final fun test(): R|kotlin/String| {
^test String(hello).R|/k|().R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
^test String(hello).R|/k|().R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt
Vendored
+2 -2
View File
@@ -11,9 +11,9 @@ FILE: extensionOnObject.kt
}
public final fun f(op: R|X.() -> kotlin/Unit|): R|kotlin/Unit| {
R|<local>/op|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(Q|X|)
R|<local>/op|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(Q|X|)
lval x: R|X| = Q|X|
R|<local>/op|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/x|)
R|<local>/op|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/x|)
}
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: extensionSafeCall.kt
public final fun bar(doIt: R|kotlin/Int.() -> kotlin/Int|): R|kotlin/Unit| {
lval i: R|kotlin/Int?| = Int(1)
R|<local>/i|?.{ R|<local>/doIt|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|($subj$) }
R|<local>/i|?.{ R|<local>/doIt|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|($subj$) }
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: inBrackets.kt
public final fun test(e: R|kotlin/Int.() -> kotlin/String|): R|kotlin/Unit| {
lval s: R|kotlin/String| = R|<local>/e|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
lval ss: R|kotlin/String| = R|<local>/e|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
lval s: R|kotlin/String| = R|<local>/e|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
lval ss: R|kotlin/String| = R|<local>/e|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/String|>|(Int(3))
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt
super<R|kotlin/Any|>()
}
public final val name: R|kotlin/String| = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
public final val name: R|kotlin/String| = R|<local>/name|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
public get(): R|kotlin/String|
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt
Vendored
+2 -2
View File
@@ -15,10 +15,10 @@ FILE: propertyWithExtensionType.kt
when () {
!=(R|<local>/a|.R|/A.x|, Null(null)) -> {
lval b: R|kotlin/String.() -> kotlin/Unit| = R|<local>/a|.R|/A.x|
R|<local>/b|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(String())
R|<local>/b|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(String())
}
}
lval c: R|kotlin/String.() -> kotlin/Int| = R|<local>/a|.R|/A.y|
lval d: R|kotlin/Int| = R|<local>/c|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
lval d: R|kotlin/Int| = R|<local>/c|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Int|>|(String())
}
compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt
Vendored
+4 -4
View File
@@ -23,18 +23,18 @@ FILE: threeReceiversCorrect.kt
}
public final fun <T, R> with(arg: R|T|, f: R|T.() -> R|): R|R| {
^with R|<local>/f|.R|FakeOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/arg|)
^with R|<local>/f|.R|SubstitutionOverride<kotlin/Function1.invoke: R|R|>|(R|<local>/arg|)
}
public final fun test(a: R|A|, b: R|B|, c: R|C|): R|kotlin/Unit| {
R|/with|<R|A|, R|kotlin/Unit|>(R|<local>/a|, <L> = with@fun R|A|.<anonymous>(): R|kotlin/Unit| {
R|/with|<R|C|, R|kotlin/Unit|>(R|<local>/c|, <L> = with@fun R|C|.<anonymous>(): R|kotlin/Unit| {
(this@R|special/anonymous|, R|<local>/b|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
(this@R|special/anonymous|, R|<local>/b|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
}
)
^ R|/with|<R|B|, R|kotlin/Unit|>(R|<local>/b|, <L> = with@fun R|B|.<anonymous>(): R|kotlin/Unit| {
(this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
(this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/c|)
^ R|/with|<R|C|, R|kotlin/Unit|>(R|<local>/c|, <L> = with@fun R|C|.<anonymous>(): R|kotlin/Unit| {
(this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|special/anonymous|)
(this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|special/anonymous|)
}
)
}
compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt
Vendored
+2 -2
View File
@@ -27,12 +27,12 @@ FILE: lambda.kt
lval s: R|kotlin/String| = fun <anonymous>(): R|kotlin/String| {
^ String(OK)
}
.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
lval f: R|() -> kotlin/String| = fun <anonymous>(): R|kotlin/String| {
^ String(OK)
}
lval ss: R|kotlin/String| = R|<local>/f|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
lval ss: R|kotlin/String| = R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
lval empty: R|() -> kotlin/Unit| = fun <anonymous>(): R|kotlin/Unit| {
^ Unit
}
compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt
Vendored
+2 -2
View File
@@ -4,10 +4,10 @@ FILE: lambdaWithReceiver.kt
}
public final fun <T> myWith(receiver: R|T|, block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/receiver|)
R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/receiver|)
}
public final fun <T> R|T|.myApply(block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
R|<local>/block|.R|FakeOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/myApply|)
R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/myApply|)
}
public final fun withA(block: R|A.() -> kotlin/Unit|): R|kotlin/Unit| {
}
compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
Vendored
+1 -1
View File
@@ -101,7 +101,7 @@ FILE: protectedVisibility.kt
}
protected final override fun foo(): R|kotlin/Int| {
^foo this@R|/DerivedGeneric|.super<R|Generic<kotlin/Int>|>.R|FakeOverride</Generic.foo: R|kotlin/Int|>|()
^foo this@R|/DerivedGeneric|.super<R|Generic<kotlin/Int>|>.R|SubstitutionOverride</Generic.foo: R|kotlin/Int|>|()
}
}
compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt
Vendored
+1 -1
View File
@@ -15,5 +15,5 @@ FILE: typeAliasConstructor.kt
public final typealias BB<U> = R|B<U>|
public final fun main(): R|kotlin/Unit| {
lval x: R|A| = R|/A.A|(Int(1))
lval y: R|B<kotlin/String>| = R|/B.B|<R|kotlin/String|>(String(bb))
lval y: R|B<kotlin/String>| = R|SubstitutionOverride</B.B>|<R|kotlin/String|>(String(bb))
}