Added init keyword to testdata

2015-04-01 05:21:26 +03:00
parent 6ab83c9b8c
commit b152211096
88 changed files with 114 additions and 114 deletions
@@ -2,7 +2,7 @@ var global = 0;

 class C {
  companion object {
-      {
+      init {
        global = 1;
      }
  }
@@ -1,7 +1,7 @@
 class C() {
  public var f: Int

-  {
+  init {
    $f = 610
  }
 }
@@ -5,7 +5,7 @@ class World() {
  public val items: ArrayList<Item> = ArrayList<Item>()

  inner class Item() {
-    {
+    init {
      items.add(this)
    }
  }
@@ -3,7 +3,7 @@ class A {
        val b = 0
        val c = b
        
-        {
+        init {
            val d = b
        }
    }
@@ -1,5 +1,5 @@
 class Reluctant() {
-     {
+     init {
        throw Exception("I'm not coming out")
     }
 }
@@ -1,7 +1,7 @@
 //adopted snippet from kdoc
 open class KModel {
    val sourcesInfo: String
-    ;{
+    init {
        fun relativePath(psiFile: String): String {
            return psiFile;
        }
@@ -5,7 +5,7 @@ class A {

 class B {
    class D {
-        {
+        init {
            A().bar {
                this.foo()
            }
@@ -1,7 +1,7 @@
 class Test {

    val property:Int
-    ;{
+    init {
        fun local():Int {
            return 10;
        }
@@ -1,7 +1,7 @@
 class A {
    var a: String = "Fail"

-    {
+    init {
        a = object {
            override fun toString(): String = "OK"
        }.toString()
@@ -1,7 +1,7 @@
 class A {
    var a: String = "Fail"

-    {
+    init {
        open class B() {
            open fun s() : String = "O"
        }
@@ -7,7 +7,7 @@ public object SomeObject {
        }
    }

-    {
+    init {
        workerThread.start()
    }

@@ -35,7 +35,7 @@ public class SomeClass() {
        }
    }

-    {
+    init {
        workerThread.start()
        workerThread.join()
    }
@@ -2,7 +2,7 @@ fun box() : String {
    var a = 1

    object {
-        {
+        init {
            a = 2
        }
    }
@@ -9,7 +9,7 @@ class Identifier<T>(t : T?, myHasDollar : Boolean) {
            return __
        }
    }
-    {
+    init {
        $myT = t
    }
 }
@@ -5,7 +5,7 @@ public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
    private var myHasDollar : Boolean
    private var myNullable : Boolean = true

-    {
+    init {
        $myName = myName
        $myHasDollar = myHasDollar
    }
@@ -3,7 +3,7 @@ import java.util.HashMap
 object O {
    val mmmap = HashMap<String, Int>();

-    {
+    init {
        fun doStuff() {
            mmmap.put("two", 2)
        }
@@ -5,7 +5,7 @@ public object RefreshQueue {
        }
    });

-    {
+    init {
        workerThread.start()
    }
 }
@@ -6,7 +6,7 @@ public class Foo
        private var bar = 0
    }

-    {
+    init {
        ++bar
    }

@@ -9,7 +9,7 @@ class Foo() {
    val c: String
    var d: String

-    {
+    init {
        c = bar
        d = Foo.bar
        boo = "O"
@@ -1,7 +1,7 @@
 object Foo {
    val bar: String

-    {
+    init {
        bar = "OK"
    }
 }
@@ -2,7 +2,7 @@ class Foo {
    companion object {
        val bar: String

-        {
+        init {
            bar = "OK"
        }
    }
@@ -1,5 +1,5 @@
 abstract class WaitFor {
-    {
+    init {
        condition()
    }

@@ -2,13 +2,13 @@ package one_extends_base

 open class Base<T>(name : T?) {
    var myName : T?
-    {
+    init {
        $myName = name
    }
 }
 open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
    var mySecond : K?
-    {
+    init {
        $mySecond = second
    }
 }
@@ -1,7 +1,7 @@
 fun box(): String {
    class A {
        var result: String = "Fail";
-        {
+        init {
            result = "OK"
        }
    }
@@ -4,7 +4,7 @@ fun box(): String {
    class L : C() {
        val a: Any

-        {
+        init {
            a = {}
        }
    }
@@ -6,7 +6,7 @@ fun box(): String {
    val l = object : C {
        override val a: Any

-        {
+        init {
            a = {}
        }
    }
@@ -15,7 +15,7 @@ class PrivatePropertyGet {
 class PrivatePropertySet {
    private var x = "a"

-    inner class Inner { { x = "b" } }
+    inner class Inner { init { x = "b" } }
 }

 class PrivateMethod {
@@ -23,7 +23,7 @@ class Example
        private set


-    {
+    init {
        a1 = 1
        a2 = 1
        a3 = 1
@@ -1,6 +1,6 @@
 class Foo {

-  {Foo.test()}
+  init {Foo.test()}

  companion object {
    private fun test() {
@@ -1,6 +1,6 @@
 class Foo {

-  {Foo.test}
+  init {Foo.test}

  companion object {
    private val test = "String"
@@ -1,6 +1,6 @@
 class Foo {

-  {Foo.test}
+  init {Foo.test}

  companion object {
    private var test = "String"
@@ -88,7 +88,7 @@ public class MethodOrderTest: CodegenTestCase() {
                        }

                        inner class Inner() {
-                            {
+                            init {
                                b = b + a
                                c()
                            }
@@ -388,7 +388,7 @@ public class PackageGenTest extends CodegenTestCase {
    }

    public void testPutBooleanAsVoid() throws Exception {
-        loadText("class C(val x: Int) { { x > 0 } } fun box() { val c = C(0) } ");
+        loadText("class C(val x: Int) { init { x > 0 } } fun box() { val c = C(0) } ");
        Method main = generateFunction();
        main.invoke(null);  // must not fail
    }
@@ -142,7 +142,7 @@ fun box(): String {
        suite("dataClass",
 """
 data class DataClass($DEFINITION_MARKER: String) {
-    {
+    init {
        $TEST_BLOCK_MARKER
    }
 }
@@ -1,7 +1,7 @@
 class A {
    companion object {

-        {
+        init {
            1 + 1 // A
            val a = 1 // A
            fun foo() {
@@ -18,7 +18,7 @@ var aDelegate: Int by Delegates.notNull()
 val aLambda = { 1 + 1 }

 class A {
-    {
+    init {
        // EXPRESSION: i
        // RESULT: 1: I

@@ -7,7 +7,7 @@ fun main(args: Array<String>) {
 }

 class A {
-    {
+    init {
        val a = 1
    }
 }
@@ -7,7 +7,7 @@ fun main(args: Array<String>) {
 }

 class A {
-    {
+    init {
        val a = 1
    }
 }
@@ -11,7 +11,7 @@ val <info textAttributesKey="KOTLIN_PACKAGE_PROPERTY"><info textAttributesKey="K
 }

 class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributesKey="KOTLIN_PARAMETER"><info textAttributesKey="KOTLIN_INSTANCE_PROPERTY"><info textAttributesKey="KOTLIN_PROPERTY_WITH_BACKING_FIELD">a</info></info></info> : <info textAttributesKey="KOTLIN_CLASS">Int</info>, <info textAttributesKey="KOTLIN_PARAMETER">b</info> : <info textAttributesKey="KOTLIN_CLASS">String</info>) {
-  {
+  <info>init</info> {
    <info textAttributesKey="KOTLIN_PARAMETER">b</info>
  }

@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"

 class A(foo: Int) {
-    {
+    init {
        val t: Int = foo
    }
 }
@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"

 class A {
-    {
+    init {
        val t: Int = <caret>foo
    }
 }
@@ -2,7 +2,7 @@
 class A() {
    var a : Int
    set(v) {}
-    {
+    init {
        <caret>$a = 1
    }
 }
@@ -2,7 +2,7 @@
 public open class Identifier() {
    var field : Boolean
    set(v) {}
-    {
+    init {
        <caret>this.$field = false;
    }
 }
@@ -2,7 +2,7 @@
 class A() {
    var a : Int
    set(v) {}
-    {
+    init {
        <caret>a = 1
    }
 }
@@ -2,7 +2,7 @@
 public open class Identifier() {
    var field : Boolean
    set(v) {}
-    {
+    init {
        <caret>this.field = false;
    }
 }
@@ -1,5 +1,5 @@
 class Bar {
-    {
+    init {
        Foo()()
    }
 }
@@ -1,7 +1,7 @@
 fun String.inc() = this + "+"

 class Foo {
-    {
+    init {
        var s = ""
        <selection>s++</selection>
        s.inc()
@@ -2,14 +2,14 @@ package foo

 class A(val x:Int) {
    var s = "sA"
-    {
+    init {
        s += ":init:" + x
    }
 }

 class B(val arg1:String, val arg2:String) {
    var msg = ""
-    {
+    init {
        msg = arg1 + arg2
    }
 }
@@ -25,7 +25,7 @@ class Foo() {
    val e: String
    val f: String

-    {
+    init {
        e = bar
        f = Foo.bar
        boo = "O"
@@ -3,7 +3,7 @@ package foo
 class Foo {
    val OK = "OK";
    var result: String = ""
-    {
+    init {
        fun bar(s: String? = null) {
            if (s != null) {
                result = s
@@ -11,7 +11,7 @@ class BaseImpl(val s: String) : Base {
 var global = ""

 open class DerivedBase() {
-    {
+    init {
        global += ":DerivedBase"
    }
 }
@@ -22,13 +22,13 @@ fun newBase(): Base {
 }

 class Derived() : DerivedBase(), Base by newBase() {
-    {
+    init {
        global += ":Derived"
    }
 }

 class Derived1() : Base by newBase(), DerivedBase() {
-    {
+    init {
        global += ":Derived"
    }
 }
@@ -19,7 +19,7 @@ class Base2Impl(val s: String) : Base2 {
 var global = ""

 open class DerivedBase() {
-    {
+    init {
        global += ":DerivedBase"
    }
 }
@@ -35,19 +35,19 @@ fun newBase2(): Base2 {
 }

 class Derived() : DerivedBase(), Base by newBase(), Base2 by newBase2() {
-    {
+    init {
        global += ":Derived"
    }
 }

 class Derived1() : Base by newBase(), DerivedBase(), Base2 by newBase2() {
-    {
+    init {
        global += ":Derived"
    }
 }

 class Derived2() : Base by newBase(), Base2 by newBase2(), DerivedBase() {
-    {
+    init {
        global += ":Derived"
    }
 }
@@ -5,7 +5,7 @@ enum class B(open val bar: Int) {
    var y = 12;
    a : B(0) {
        override val bar = 3
-        {
+        init {
            y = 0
        }
    }
@@ -1,7 +1,7 @@
 class C() {
    public var f: Int

-    {
+    init {
        $f = 610
    }
 }
@@ -4,7 +4,7 @@ var c = 0

 class A() {
    var  p = 0;
-    {
+    init {
        c++;
    }
 }
@@ -1,5 +1,5 @@
 class A(var a: Int) {
-    {
+    init {
        $a = 3
    }
 }
@@ -3,7 +3,7 @@ package foo
 class A() {
    fun lold() = true
    val p: () -> Boolean
-    {
+    init {
        $p = { { lold() }() }
    }
 }
@@ -3,7 +3,7 @@ package foo
 var x = false

 open class A {
-    {
+    init {
        x = (this as B).a != 3
    }
 }
@@ -3,31 +3,31 @@ package foo
 open class A() {

    var order = ""
-    {
+    init {
        order = order + "A"
    }
 }

 open class B() : A() {
-    {
+    init {
        order = order + "B"
    }
 }

 class C() : B() {
-    {
+    init {
        order = order + "C"
    }
 }

 class D() : B() {
-    {
+    init {
        order = order + "D"
    }
 }

 class E() : A() {
-    {
+    init {
        order = order + "E"
    }
 }
@@ -1,25 +1,25 @@
 package foo

 class C() : B() {
-    {
+    init {
        order = order + "C"
    }
 }

 class D() : B() {
-    {
+    init {
        order = order + "D"
    }
 }

 class E() : A() {
-    {
+    init {
        order = order + "E"
    }
 }

 open class B() : A() {
-    {
+    init {
        order = order + "B"
    }
 }
@@ -27,7 +27,7 @@ open class B() : A() {
 open class A() : G() {

    var order = ""
-    {
+    init {
        order = order + "A"
    }
 }
@@ -3,20 +3,20 @@ package foo
 open class A() {

    var order = ""
-    {
+    init {
        order = order + "A"
    }
 }

 open class B() : A() {
-    {
+    init {
        order = order + "B"
    }

 }

 class C() : B() {
-    {
+    init {
        order = order + "C"
    }
 }
@@ -4,7 +4,7 @@ class B(val name: String)

 class A(val a: Int, var b: B) {
    var copyB: B
-    {
+    init {
        copyB = b
    }
 }
@@ -3,7 +3,7 @@ package foo
 var a = 0

 class A() {
-    {
+    init {
        a++
    }

@@ -9,7 +9,7 @@ class A {

    var aR = 0
    var aaR = 0
-    {
+    init {
        a = 1
        $aa = 2

@@ -27,7 +27,7 @@ class B {

    var aR = 0
    var aaR = 0
-    {
+    init {
        a = 3
        $aa = 4

@@ -9,7 +9,7 @@ trait Holder {
 class BasicHolder : Holder {
    override val element: String

-    {
+    init {
        element = "ok"
    }
 }
@@ -10,7 +10,7 @@ open class BasicHolder : Holder {
    override val element: String
        get() = $element + $element

-    {
+    init {
        element = "1"
    }
 }
@@ -18,7 +18,7 @@ open class BasicHolder : Holder {
 class AdvancedHolder : BasicHolder() {
    override val element: String

-    {
+    init {
        element = super.element + super.element
    }
 }
@@ -9,7 +9,7 @@ trait Holder {
 class BasicHolder : Holder {
    override val element: String

-    {
+    init {
        this.element = "ok"
    }
 }
@@ -9,7 +9,7 @@ trait Holder {
 class BasicHolder : Holder {
    override var element: String = "not ok"

-    {
+    init {
        element = "ok"
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(`if`: String) {
-    {
+    init {
        testRenamed("if", { `if` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(`in`: String) {
-    {
+    init {
        testRenamed("in", { `in` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(with: String) {
-    {
+    init {
        testRenamed("with", { with })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(yield: String) {
-    {
+    init {
        testRenamed("yield", { yield })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(val `do`: String) {
-    {
+    init {
        testNotRenamed("do", { `do` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(val `else`: String) {
-    {
+    init {
        testNotRenamed("else", { `else` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(val switch: String) {
-    {
+    init {
        testNotRenamed("switch", { switch })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(val typeof: String) {
-    {
+    init {
        testNotRenamed("typeof", { typeof })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(var `false`: String) {
-    {
+    init {
        testNotRenamed("false", { `false` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(var `for`: String) {
-    {
+    init {
        testNotRenamed("for", { `for` })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(var undefined: String) {
-    {
+    init {
        testNotRenamed("undefined", { undefined })
    }
 }
@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!

 data class DataClass(var void: String) {
-    {
+    init {
        testNotRenamed("void", { void })
    }
 }
@@ -2,7 +2,7 @@ package foo

 class Test() {
    var a: Int
-    {
+    init {
        $a = 3
    }
 }
@@ -1,25 +1,25 @@
 package foo

 class C() : B() {
-    {
+    init {
        order = order + "C"
    }
 }

 class D() : B() {
-    {
+    init {
        order = order + "D"
    }
 }

 class E() : A() {
-    {
+    init {
        order = order + "E"
    }
 }

 open class B() : A(), F {
-    {
+    init {
        order = order + "B"
    }
 }
@@ -27,7 +27,7 @@ open class B() : A(), F {
 open class A() : F {

    var order = ""
-    {
+    init {
        order = order + "A"
    }
 }
@@ -210,7 +210,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
    var dragOff = Vector()
    val interval = 1000 / 30

-    {
+    init {
        jq(canvas).mousedown {
            valid = false
            selection = null
@@ -295,7 +295,7 @@ class RadialGradientGenerator(val context: CanvasContext) {
        gradients.add(colorStops)
    }

-    {
+    init {
        newColorStops(Pair(0.0, "#F59898"), Pair(0.5, "#F57373"), Pair(1.0, "#DB6B6B"))
        newColorStops(Pair(0.39, "rgb(140,167,209)"), Pair(0.7, "rgb(104,139,209)"), Pair(0.85, "rgb(67,122,217)"))
        newColorStops(Pair(0.0, "rgb(255,222,255)"), Pair(0.5, "rgb(255,185,222)"), Pair(1.0, "rgb(230,154,185)"))
@@ -45,7 +45,7 @@ class HelloKotlin() {

    val message = "Hello, Kotlin!"
    val textHeightInPixels = 20
-    {
+    init {
        context.font = "bold ${textHeightInPixels}px Georgia, serif"
    }
    val textWidthInPixels = context.measureText(message)!!.width
@@ -177,7 +177,7 @@ class TrafficLight(override var pos: Vector, val direction: String, val startCol
    var isForceColorChange = false
    var changeColorForward = (startColor == "red")

-    {
+    init {
        list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "red_color.png"))
        list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "yellow_color.png"))
        list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "green_color.png"))
@@ -378,7 +378,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
        shapes.add(shape)
    }

-    {
+    init {
        jq(canvas).click {
            val mousePos = mousePos(it)
            @shapeLoop for (shape in shapes) {
@@ -17,7 +17,7 @@ class Field(
        init: (Int, Int) -> Boolean
 ) {
    private val live: Array<Array<Boolean>>
-    {
+    init {
        live = Array(height) { i -> Array(width) { j -> init(i, j) } }
    }

@@ -6,7 +6,7 @@ import java.io.File
 import kotlinx.android.synthetic.layout.*

 public class MyActivity : Activity() {
-    {login}
+    init {login}
 }

 // 1 public _\$_findCachedViewById
@@ -5,7 +5,7 @@ import java.io.File
 import kotlinx.android.synthetic.layout.*

 public class MyFragment : Fragment() {
-    {login}
+    init {login}
 }

 // 1 public _\$_findCachedViewById
@@ -5,7 +5,7 @@ import android.app.Activity
 import kotlinx.android.synthetic.layout.view.*

 public class MyActivity : Activity() {
-    { View(this).login }
+    init { View(this).login }
 }

 // 1 public _\$_findCachedViewById