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

Fixed scope creations for properties scopes.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-05 20:35:22 +03:00
parent 67abdd755f
commit a502405779
12 changed files with 109 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ fun <<!REDECLARATION, REDECLARATION!>T<!>, <!REDECLARATION, REDECLARATION!>T<!>>
class P<<!REDECLARATION!>T<!>, <!REDECLARATION!>T<!>> {}
val <<!REDECLARATION, REDECLARATION, REDECLARATION, TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>T<!>, <!REDECLARATION, REDECLARATION, REDECLARATION!>T<!>> T.foo : Int
val <<!REDECLARATION, TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>T<!>, <!REDECLARATION!>T<!>> T.foo : Int
get() = 1
compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
package i
val <T> List<T>.length = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!>size<!>
val <T> List<T>.length = <!UNRESOLVED_REFERENCE, EXTENSION_PROPERTY_WITH_BACKING_FIELD!>size<!>
val <T> List<T>.length1 : Int get() = size
val String.bd = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!>this + "!"<!>
val String.bd = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!><!NO_THIS!>this<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> "!"<!>
val String.bd1 : String get() = this + "!"
@@ -13,7 +13,7 @@ class A {
val ii : Int = 1
}
val A.foo = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!>ii<!>
val A.foo = <!UNRESOLVED_REFERENCE, EXTENSION_PROPERTY_WITH_BACKING_FIELD!>ii<!>
val A.foo1 : Int get() = ii
compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.txt
Vendored
+3 -3
View File
@@ -2,13 +2,13 @@ package
package i {
public val i.C.bar: i.C.D
public val kotlin.String.bd: kotlin.String
public val kotlin.String.bd: [ERROR : <ERROR FUNCTION RETURN TYPE>]
public val kotlin.String.bd1: kotlin.String
public val i.A.foo: kotlin.Int = 1
public val i.A.foo: [ERROR : Type for ii]
public val i.C.foo: i.C.D
public val i.A.foo1: kotlin.Int
public val i.C.foo1: i.C.D
public val </*0*/ T> kotlin.List<T>.length: kotlin.Int
public val </*0*/ T> kotlin.List<T>.length: [ERROR : Type for size]
public val </*0*/ T> kotlin.List<T>.length1: kotlin.Int
public final class A {
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.dynamic.txt
Vendored
+5 -5
View File
@@ -65,8 +65,8 @@ public final fun get(/*0*/ p0: dynamic): dynamic
public final fun divAssign(/*0*/ p0: dynamic): dynamic
public final fun get(/*0*/ p0: dynamic): dynamic
public final fun modAssign(/*0*/ p0: dynamic): dynamic
public fun getValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic): dynamic
public fun propertyDelegated(/*0*/ p0: dynamic): dynamic
public fun getValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic): dynamic
public fun setValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic, /*2*/ p2: dynamic): dynamic
public fun propertyDelegated(/*0*/ p0: dynamic): dynamic
public final fun getValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic): dynamic
public final fun propertyDelegated(/*0*/ p0: dynamic): dynamic
public final fun getValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic): dynamic
public final fun setValue(/*0*/ p0: dynamic, /*1*/ p1: dynamic, /*2*/ p2: dynamic): dynamic
public final fun propertyDelegated(/*0*/ p0: dynamic): dynamic