Render receivers as 'this@owner: type'

Add test for generic inner class with generic outer class.
2017-04-19 18:19:31 +03:00
parent 1bf6f8fc57
commit a511540aad
99 changed files with 944 additions and 905 deletions
@@ -1,36 +1,36 @@
 FILE /delegatedImplementation.kt
  CLASS INTERFACE IBase
    FUN public abstract fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter s: kotlin.String
    FUN public abstract fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase
    FUN public abstract fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IBase>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@IBase: IBase
+      $receiver: VALUE_PARAMETER this@qux: String
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT BaseImpl
-    $new: VALUE_PARAMETER <receiver: BaseImpl>
+    $new: VALUE_PARAMETER this@BaseImpl: BaseImpl
    CONSTRUCTOR private constructor BaseImpl()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='BaseImpl'
    FUN public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter s: kotlin.String
      BLOCK_BODY
    FUN public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='bar(): Int'
          CONST Int type=kotlin.Int value='42'
    FUN public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
+      $receiver: VALUE_PARAMETER this@qux: String
      BLOCK_BODY
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -38,24 +38,24 @@ FILE /delegatedImplementation.kt
  CLASS INTERFACE IOther
    PROPERTY public abstract val x: kotlin.String
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-x>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
    PROPERTY public abstract var y: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
    PROPERTY public abstract val kotlin.Byte.z1: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<get-z1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z1: Byte
    PROPERTY public abstract var kotlin.Byte.z2: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<get-z2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z2: Byte
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<set-z2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z2: Byte
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -67,7 +67,7 @@ FILE /delegatedImplementation.kt
      RETURN type=kotlin.Nothing from='otherImpl(String, Int): IOther'
        BLOCK type=otherImpl.<no name provided> origin=OBJECT_LITERAL
          CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER <receiver: <no name provided>>
+            $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
            CONSTRUCTOR public constructor <no name provided>()
              BLOCK_BODY
                DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -77,45 +77,45 @@ FILE /delegatedImplementation.kt
                EXPRESSION_BODY
                  GET_VAR 'value-parameter x0: String' type=kotlin.String origin=null
              FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-x>(): kotlin.String
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<get-x>(): String'
                    GET_FIELD 'x: String' type=kotlin.String origin=null
-                      receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                      receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
            PROPERTY public open override var y: kotlin.Int
              FIELD PROPERTY_BACKING_FIELD public open override var y: kotlin.Int
                EXPRESSION_BODY
                  GET_VAR 'value-parameter y0: Int' type=kotlin.Int origin=null
              FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-y>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<get-y>(): Int'
                    GET_FIELD 'y: Int' type=kotlin.Int origin=null
-                      receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                      receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
              FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
                BLOCK_BODY
                  SET_FIELD 'y: Int' type=kotlin.Unit origin=null
-                    receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                    receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
                    value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
            PROPERTY public open override val kotlin.Byte.z1: kotlin.Int
              FUN public open override fun kotlin.Byte.<get-z1>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z1: Byte
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<get-z1>() on Byte: Int'
                    CONST Int type=kotlin.Int value='1'
            PROPERTY public open override var kotlin.Byte.z2: kotlin.Int
              FUN public open override fun kotlin.Byte.<get-z2>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z2: Byte
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<get-z2>() on Byte: Int'
                    CONST Int type=kotlin.Int value='2'
              FUN public open override fun kotlin.Byte.<set-z2>(value: kotlin.Int): kotlin.Unit
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z2: Byte
                VALUE_PARAMETER value-parameter value: kotlin.Int
                BLOCK_BODY
            FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
@@ -123,7 +123,7 @@ FILE /delegatedImplementation.kt
            FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
          CALL 'constructor <no name provided>()' type=otherImpl.<no name provided> origin=OBJECT_LITERAL
  CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -132,35 +132,35 @@ FILE /delegatedImplementation.kt
      EXPRESSION_BODY
        GET_OBJECT 'BaseImpl' type=BaseImpl
    FUN DELEGATED_MEMBER public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='bar(): Int'
          CALL 'bar(): Int' type=kotlin.Int origin=null
            $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
    FUN DELEGATED_MEMBER public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter s: kotlin.String
      BLOCK_BODY
        CALL 'foo(Int, String): Unit' type=kotlin.Unit origin=null
          $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
          x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
          s: GET_VAR 'value-parameter s: String' type=kotlin.String origin=null
    FUN DELEGATED_MEMBER public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test1>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@Test1: Test1
+      $receiver: VALUE_PARAMETER this@qux: String
      BLOCK_BODY
        CALL 'qux() on String: Unit' type=kotlin.Unit origin=null
          $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
-          $receiver: GET_VAR '<receiver: qux() on String: Unit>' type=kotlin.String origin=null
+            receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
+          $receiver: GET_VAR 'this@qux: String' type=kotlin.String origin=null
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
    CONSTRUCTOR public constructor Test2()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -169,30 +169,30 @@ FILE /delegatedImplementation.kt
      EXPRESSION_BODY
        GET_OBJECT 'BaseImpl' type=BaseImpl
    FUN DELEGATED_MEMBER public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='bar(): Int'
          CALL 'bar(): Int' type=kotlin.Int origin=null
            $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
    FUN DELEGATED_MEMBER public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter s: kotlin.String
      BLOCK_BODY
        CALL 'foo(Int, String): Unit' type=kotlin.Unit origin=null
          $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+            receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
          x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
          s: GET_VAR 'value-parameter s: String' type=kotlin.String origin=null
    FUN DELEGATED_MEMBER public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test2>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@Test2: Test2
+      $receiver: VALUE_PARAMETER this@qux: String
      BLOCK_BODY
        CALL 'qux() on String: Unit' type=kotlin.Unit origin=null
          $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-          $receiver: GET_VAR '<receiver: qux() on String: Unit>' type=kotlin.String origin=null
+            receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+          $receiver: GET_VAR 'this@qux: String' type=kotlin.String origin=null
    FIELD DELEGATE val `Test2$IOther$delegate`: IOther
      EXPRESSION_BODY
        CALL 'otherImpl(String, Int): IOther' type=IOther origin=null
@@ -200,57 +200,57 @@ FILE /delegatedImplementation.kt
          y0: CONST Int type=kotlin.Int value='42'
    PROPERTY DELEGATED_MEMBER public open override val kotlin.Byte.z1: kotlin.Int
      FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<get-z1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z1: Byte
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-z1>() on Byte: Int'
            CALL '<get-z1>() on Byte: Int' type=kotlin.Int origin=null
              $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-              $receiver: GET_VAR '<receiver: z1: Int on Byte>' type=kotlin.Byte origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+              $receiver: GET_VAR 'this@z1: Byte' type=kotlin.Byte origin=null
    PROPERTY DELEGATED_MEMBER public open override val x: kotlin.String
      FUN DELEGATED_MEMBER public open override fun <get-x>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-x>(): String'
            CALL '<get-x>(): String' type=kotlin.String origin=null
              $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
    PROPERTY DELEGATED_MEMBER public open override var kotlin.Byte.z2: kotlin.Int
      FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<get-z2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z2: Byte
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-z2>() on Byte: Int'
            CALL '<get-z2>() on Byte: Int' type=kotlin.Int origin=null
              $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-              $receiver: GET_VAR '<receiver: z2: Int on Byte>' type=kotlin.Byte origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+              $receiver: GET_VAR 'this@z2: Byte' type=kotlin.Byte origin=null
      FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<set-z2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z2: Byte
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
        BLOCK_BODY
          CALL '<set-z2>(Int) on Byte: Unit' type=kotlin.Unit origin=null
            $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-            $receiver: GET_VAR '<receiver: z2: Int on Byte>' type=kotlin.Byte origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+            $receiver: GET_VAR 'this@z2: Byte' type=kotlin.Byte origin=null
            <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
    PROPERTY DELEGATED_MEMBER public open override var y: kotlin.Int
      FUN DELEGATED_MEMBER public open override fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-y>(): Int'
            CALL '<get-y>(): Int' type=kotlin.Int origin=null
              $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
      FUN DELEGATED_MEMBER public open override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
        BLOCK_BODY
          CALL '<set-y>(Int): Unit' type=kotlin.Unit origin=null
            $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
            <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int