testData format update: detailed descriptor rendering.

2016-09-06 11:27:06 +03:00
parent 993c3fe51e
commit 4e112b3f88
92 changed files with 2105 additions and 2100 deletions
@@ -4,5 +4,5 @@ FILE /anonymousFunction.kt
      BLOCK type=() -> kotlin.Unit operator=ANONYMOUS_FUNCTION
        FUN local final fun <no name provided>(): kotlin.Unit
          BLOCK_BODY
-            CALL .println type=kotlin.Unit operator=null
-        CALLABLE_REFERENCE <no name provided> type=() -> kotlin.Unit operator=ANONYMOUS_FUNCTION
+            CALL 'println(): Unit' type=kotlin.Unit operator=null
+        CALLABLE_REFERENCE '<no name provided>(): Unit' type=() -> kotlin.Unit operator=ANONYMOUS_FUNCTION
@@ -1,13 +1,13 @@
 FILE /extensionLambda.kt
  FUN public fun test1(): kotlin.Int
    BLOCK_BODY
-      RETURN type=kotlin.Nothing from=test1
-        CALL .run type=kotlin.Int operator=null
+      RETURN type=kotlin.Nothing from='test1(): Int'
+        CALL 'run(String.() -> Int) on String: Int' type=kotlin.Int operator=null
          $receiver: CONST String type=kotlin.String value='42'
          block: BLOCK type=kotlin.String.() -> kotlin.Int operator=LAMBDA
            FUN local final fun kotlin.String.<anonymous>(): kotlin.Int
              BLOCK_BODY
-                RETURN type=kotlin.Nothing from=<anonymous>
-                  CALL .<get-length> type=kotlin.Int operator=GET_PROPERTY
-                    $this: $RECEIVER of: <anonymous> type=kotlin.String
-            CALLABLE_REFERENCE <anonymous> type=kotlin.String.() -> kotlin.Int operator=LAMBDA
+                RETURN type=kotlin.Nothing from='<anonymous>() on String: Int'
+                  CALL '<get-length>(): Int' type=kotlin.Int operator=GET_PROPERTY
+                    $this: $RECEIVER of '<anonymous>() on String: Int' type=kotlin.String
+            CALLABLE_REFERENCE '<anonymous>() on String: Int' type=kotlin.String.() -> kotlin.Int operator=LAMBDA
@@ -4,13 +4,13 @@ FILE /justLambda.kt
      BLOCK type=() -> kotlin.Int operator=LAMBDA
        FUN local final fun <anonymous>(): kotlin.Int
          BLOCK_BODY
-            RETURN type=kotlin.Nothing from=<anonymous>
+            RETURN type=kotlin.Nothing from='<anonymous>(): Int'
              CONST Int type=kotlin.Int value='42'
-        CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Int operator=LAMBDA
+        CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int operator=LAMBDA
  PROPERTY public val test2: () -> kotlin.Unit
    EXPRESSION_BODY
      BLOCK type=() -> kotlin.Unit operator=LAMBDA
        FUN local final fun <anonymous>(): kotlin.Unit
          BLOCK_BODY
-            RETURN type=kotlin.Nothing from=<anonymous>
-        CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Unit operator=LAMBDA
+            RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
+        CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit operator=LAMBDA
@@ -7,9 +7,9 @@ FILE /localFunction.kt
        BLOCK_BODY
          BLOCK type=kotlin.Int operator=POSTFIX_INCR
            VAR val tmp0: kotlin.Int
-              GET_VAR x type=kotlin.Int operator=POSTFIX_INCR
-            SET_VAR x type=kotlin.Unit operator=POSTFIX_INCR
-              CALL .inc type=kotlin.Int operator=POSTFIX_INCR
-                $this: GET_VAR tmp0 type=kotlin.Int operator=null
-            GET_VAR tmp0 type=kotlin.Int operator=null
-      CALL .local type=kotlin.Unit operator=null
+              GET_VAR 'x: Int' type=kotlin.Int operator=POSTFIX_INCR
+            SET_VAR 'x: Int' type=kotlin.Unit operator=POSTFIX_INCR
+              CALL 'inc(): Int' type=kotlin.Int operator=POSTFIX_INCR
+                $this: GET_VAR 'tmp0: Int' type=kotlin.Int operator=null
+            GET_VAR 'tmp0: Int' type=kotlin.Int operator=null
+      CALL 'local(): Unit' type=kotlin.Unit operator=null
@@ -2,49 +2,49 @@ FILE /multipleImplicitReceivers.kt
  CLASS OBJECT A
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL Any
-        INSTANCE_INITIALIZER_CALL classDescriptor=A
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='A'
  CLASS OBJECT B
    CONSTRUCTOR private constructor B()
      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL Any
-        INSTANCE_INITIALIZER_CALL classDescriptor=B
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='B'
  CLASS INTERFACE IFoo
    PROPERTY public open val A.foo: B
      PROPERTY_GETTER public open fun A.<get-foo>(): B
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from=<get-foo>
-            GET_OBJECT B type=B
+          RETURN type=kotlin.Nothing from='<get-foo>() on A: B'
+            GET_OBJECT 'B' type=B
  CLASS INTERFACE IInvoke
    FUN public open operator fun B.invoke(): kotlin.Int
      BLOCK_BODY
-        RETURN type=kotlin.Nothing from=invoke
+        RETURN type=kotlin.Nothing from='invoke() on B: Int'
          CONST Int type=kotlin.Int value='42'
-  FUN public fun test(/*0*/ fooImpl: IFoo, /*1*/ invokeImpl: IInvoke): kotlin.Unit
+  FUN public fun test(fooImpl: IFoo, invokeImpl: IInvoke): kotlin.Unit
    BLOCK_BODY
-      CALL .with type=kotlin.Int operator=null
-        receiver: GET_OBJECT A type=A
+      CALL 'with(A, A.() -> Int): Int' type=kotlin.Int operator=null
+        receiver: GET_OBJECT 'A' type=A
        block: BLOCK type=A.() -> kotlin.Int operator=LAMBDA
          FUN local final fun A.<anonymous>(): kotlin.Int
            BLOCK_BODY
-              RETURN type=kotlin.Nothing from=<anonymous>
-                CALL .with type=kotlin.Int operator=null
-                  receiver: GET_VAR fooImpl type=IFoo operator=null
+              RETURN type=kotlin.Nothing from='<anonymous>() on A: Int'
+                CALL 'with(IFoo, IFoo.() -> Int): Int' type=kotlin.Int operator=null
+                  receiver: GET_VAR 'value-parameter fooImpl: IFoo' type=IFoo operator=null
                  block: BLOCK type=IFoo.() -> kotlin.Int operator=LAMBDA
                    FUN local final fun IFoo.<anonymous>(): kotlin.Int
                      BLOCK_BODY
-                        RETURN type=kotlin.Nothing from=<anonymous>
-                          CALL .with type=kotlin.Int operator=null
-                            receiver: GET_VAR invokeImpl type=IInvoke operator=null
+                        RETURN type=kotlin.Nothing from='<anonymous>() on IFoo: Int'
+                          CALL 'with(IInvoke, IInvoke.() -> Int): Int' type=kotlin.Int operator=null
+                            receiver: GET_VAR 'value-parameter invokeImpl: IInvoke' type=IInvoke operator=null
                            block: BLOCK type=IInvoke.() -> kotlin.Int operator=LAMBDA
                              FUN local final fun IInvoke.<anonymous>(): kotlin.Int
                                BLOCK_BODY
-                                  RETURN type=kotlin.Nothing from=<anonymous>
-                                    CALL .invoke type=kotlin.Int operator=INVOKE
-                                      $this: $RECEIVER of: <anonymous> type=IInvoke
-                                      $receiver: CALL .<get-foo> type=B operator=GET_PROPERTY
-                                        $this: $RECEIVER of: <anonymous> type=IFoo
-                                        $receiver: $RECEIVER of: <anonymous> type=A
-                              CALLABLE_REFERENCE <anonymous> type=IInvoke.() -> kotlin.Int operator=LAMBDA
-                    CALLABLE_REFERENCE <anonymous> type=IFoo.() -> kotlin.Int operator=LAMBDA
-          CALLABLE_REFERENCE <anonymous> type=A.() -> kotlin.Int operator=LAMBDA
+                                  RETURN type=kotlin.Nothing from='<anonymous>() on IInvoke: Int'
+                                    CALL 'invoke() on B: Int' type=kotlin.Int operator=INVOKE
+                                      $this: $RECEIVER of '<anonymous>() on IInvoke: Int' type=IInvoke
+                                      $receiver: CALL '<get-foo>() on A: B' type=B operator=GET_PROPERTY
+                                        $this: $RECEIVER of '<anonymous>() on IFoo: Int' type=IFoo
+                                        $receiver: $RECEIVER of '<anonymous>() on A: Int' type=A
+                              CALLABLE_REFERENCE '<anonymous>() on IInvoke: Int' type=IInvoke.() -> kotlin.Int operator=LAMBDA
+                    CALLABLE_REFERENCE '<anonymous>() on IFoo: Int' type=IFoo.() -> kotlin.Int operator=LAMBDA
+          CALLABLE_REFERENCE '<anonymous>() on A: Int' type=A.() -> kotlin.Int operator=LAMBDA
@@ -1,57 +1,57 @@
 FILE /nonLocalReturn.kt
  FUN public fun test0(): kotlin.Unit
    BLOCK_BODY
-      CALL .run type=kotlin.Nothing operator=null
+      CALL 'run(() -> Nothing): Nothing' type=kotlin.Nothing operator=null
        block: BLOCK type=() -> kotlin.Nothing operator=LAMBDA
          FUN local final fun <anonymous>(): kotlin.Nothing
            BLOCK_BODY
-              RETURN type=kotlin.Nothing from=test0
-          CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Nothing operator=LAMBDA
+              RETURN type=kotlin.Nothing from='test0(): Unit'
+          CALLABLE_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing operator=LAMBDA
  FUN public fun test1(): kotlin.Unit
    BLOCK_BODY
-      CALL .run type=kotlin.Unit operator=null
+      CALL 'run(() -> Unit): Unit' type=kotlin.Unit operator=null
        block: BLOCK type=() -> kotlin.Unit operator=LAMBDA
          FUN local final fun <anonymous>(): kotlin.Unit
            BLOCK_BODY
-              RETURN type=kotlin.Nothing from=<anonymous>
-          CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Unit operator=LAMBDA
+              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
+          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit operator=LAMBDA
  FUN public fun test2(): kotlin.Unit
    BLOCK_BODY
-      CALL .run type=kotlin.Unit operator=null
+      CALL 'run(() -> Unit): Unit' type=kotlin.Unit operator=null
        block: BLOCK type=() -> kotlin.Unit operator=LAMBDA
          FUN local final fun <anonymous>(): kotlin.Unit
            BLOCK_BODY
-              RETURN type=kotlin.Nothing from=<anonymous>
-          CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Unit operator=LAMBDA
-  FUN public fun testLrmFoo1(/*0*/ ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
+          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit operator=LAMBDA
+  FUN public fun testLrmFoo1(ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    BLOCK_BODY
-      CALL .forEach type=kotlin.Unit operator=null
-        $receiver: GET_VAR ints type=kotlin.collections.List<kotlin.Int> operator=null
+      CALL 'forEach((Int) -> Unit) on Iterable<Int>: Unit' type=kotlin.Unit operator=null
+        $receiver: GET_VAR 'value-parameter ints: List<Int>' type=kotlin.collections.List<kotlin.Int> operator=null
        action: BLOCK type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
-          FUN local final fun <anonymous>(/*0*/ it: kotlin.Int): kotlin.Unit
+          FUN local final fun <anonymous>(it: kotlin.Int): kotlin.Unit
            BLOCK_BODY
              WHEN type=kotlin.Unit operator=IF
-                if: CALL .EQEQ type=kotlin.Boolean operator=EQEQ
-                  arg0: GET_VAR it type=kotlin.Int operator=null
+                if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean operator=EQEQ
+                  arg0: GET_VAR 'value-parameter it: Int' type=kotlin.Int operator=null
                  arg1: CONST Int type=kotlin.Int value='0'
-                then: RETURN type=kotlin.Nothing from=<anonymous>
-              RETURN type=kotlin.Nothing from=<anonymous>
-                CALL .print type=kotlin.Unit operator=null
-                  message: GET_VAR it type=kotlin.Int operator=null
-          CALLABLE_REFERENCE <anonymous> type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
-  FUN public fun testLrmFoo2(/*0*/ ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+                then: RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
+              RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
+                CALL 'print(Int): Unit' type=kotlin.Unit operator=null
+                  message: GET_VAR 'value-parameter it: Int' type=kotlin.Int operator=null
+          CALLABLE_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
+  FUN public fun testLrmFoo2(ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    BLOCK_BODY
-      CALL .forEach type=kotlin.Unit operator=null
-        $receiver: GET_VAR ints type=kotlin.collections.List<kotlin.Int> operator=null
+      CALL 'forEach((Int) -> Unit) on Iterable<Int>: Unit' type=kotlin.Unit operator=null
+        $receiver: GET_VAR 'value-parameter ints: List<Int>' type=kotlin.collections.List<kotlin.Int> operator=null
        action: BLOCK type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
-          FUN local final fun <anonymous>(/*0*/ it: kotlin.Int): kotlin.Unit
+          FUN local final fun <anonymous>(it: kotlin.Int): kotlin.Unit
            BLOCK_BODY
              WHEN type=kotlin.Unit operator=IF
-                if: CALL .EQEQ type=kotlin.Boolean operator=EQEQ
-                  arg0: GET_VAR it type=kotlin.Int operator=null
+                if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean operator=EQEQ
+                  arg0: GET_VAR 'value-parameter it: Int' type=kotlin.Int operator=null
                  arg1: CONST Int type=kotlin.Int value='0'
-                then: RETURN type=kotlin.Nothing from=<anonymous>
-              RETURN type=kotlin.Nothing from=<anonymous>
-                CALL .print type=kotlin.Unit operator=null
-                  message: GET_VAR it type=kotlin.Int operator=null
-          CALLABLE_REFERENCE <anonymous> type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
+                then: RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
+              RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
+                CALL 'print(Int): Unit' type=kotlin.Unit operator=null
+                  message: GET_VAR 'value-parameter it: Int' type=kotlin.Int operator=null
+          CALLABLE_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit operator=LAMBDA
@@ -2,13 +2,13 @@ FILE /samAdapter.kt
  FUN public fun test1(): kotlin.Unit
    BLOCK_BODY
      VAR val hello: java.lang.Runnable
-        CALL .Runnable type=java.lang.Runnable operator=null
+        CALL 'Runnable(() -> Unit): Runnable' type=java.lang.Runnable operator=null
          function: BLOCK type=() -> kotlin.Unit operator=LAMBDA
            FUN local final fun <anonymous>(): kotlin.Unit
              BLOCK_BODY
-                RETURN type=kotlin.Nothing from=<anonymous>
-                  CALL .println type=kotlin.Unit operator=null
+                RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
+                  CALL 'println(Any?): Unit' type=kotlin.Unit operator=null
                    message: CONST String type=kotlin.String value='Hello, world!'
-            CALLABLE_REFERENCE <anonymous> type=() -> kotlin.Unit operator=LAMBDA
-      CALL .run type=kotlin.Unit operator=null
-        $this: GET_VAR hello type=java.lang.Runnable operator=null
+            CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit operator=LAMBDA
+      CALL 'run(): Unit' type=kotlin.Unit operator=null
+        $this: GET_VAR 'hello: Runnable' type=java.lang.Runnable operator=null