Added init keyword to testdata

This commit is contained in:
Stanislav Erokhin
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 { class C {
companion object { companion object {
{ init {
global = 1; global = 1;
} }
} }
@@ -1,7 +1,7 @@
class C() { class C() {
public var f: Int public var f: Int
{ init {
$f = 610 $f = 610
} }
} }
@@ -5,7 +5,7 @@ class World() {
public val items: ArrayList<Item> = ArrayList<Item>() public val items: ArrayList<Item> = ArrayList<Item>()
inner class Item() { inner class Item() {
{ init {
items.add(this) items.add(this)
} }
} }
@@ -3,7 +3,7 @@ class A {
val b = 0 val b = 0
val c = b val c = b
{ init {
val d = b val d = b
} }
} }
@@ -1,5 +1,5 @@
class Reluctant() { class Reluctant() {
{ init {
throw Exception("I'm not coming out") throw Exception("I'm not coming out")
} }
} }
@@ -1,7 +1,7 @@
//adopted snippet from kdoc //adopted snippet from kdoc
open class KModel { open class KModel {
val sourcesInfo: String val sourcesInfo: String
;{ init {
fun relativePath(psiFile: String): String { fun relativePath(psiFile: String): String {
return psiFile; return psiFile;
} }
@@ -5,7 +5,7 @@ class A {
class B { class B {
class D { class D {
{ init {
A().bar { A().bar {
this.foo() this.foo()
} }
@@ -1,7 +1,7 @@
class Test { class Test {
val property:Int val property:Int
;{ init {
fun local():Int { fun local():Int {
return 10; return 10;
} }
@@ -1,7 +1,7 @@
class A { class A {
var a: String = "Fail" var a: String = "Fail"
{ init {
a = object { a = object {
override fun toString(): String = "OK" override fun toString(): String = "OK"
}.toString() }.toString()
@@ -1,7 +1,7 @@
class A { class A {
var a: String = "Fail" var a: String = "Fail"
{ init {
open class B() { open class B() {
open fun s() : String = "O" open fun s() : String = "O"
} }
@@ -7,7 +7,7 @@ public object SomeObject {
} }
} }
{ init {
workerThread.start() workerThread.start()
} }
@@ -35,7 +35,7 @@ public class SomeClass() {
} }
} }
{ init {
workerThread.start() workerThread.start()
workerThread.join() workerThread.join()
} }
@@ -2,7 +2,7 @@ fun box() : String {
var a = 1 var a = 1
object { object {
{ init {
a = 2 a = 2
} }
} }
@@ -9,7 +9,7 @@ class Identifier<T>(t : T?, myHasDollar : Boolean) {
return __ return __
} }
} }
{ init {
$myT = t $myT = t
} }
} }
@@ -5,7 +5,7 @@ public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
private var myHasDollar : Boolean private var myHasDollar : Boolean
private var myNullable : Boolean = true private var myNullable : Boolean = true
{ init {
$myName = myName $myName = myName
$myHasDollar = myHasDollar $myHasDollar = myHasDollar
} }
@@ -3,7 +3,7 @@ import java.util.HashMap
object O { object O {
val mmmap = HashMap<String, Int>(); val mmmap = HashMap<String, Int>();
{ init {
fun doStuff() { fun doStuff() {
mmmap.put("two", 2) mmmap.put("two", 2)
} }
@@ -5,7 +5,7 @@ public object RefreshQueue {
} }
}); });
{ init {
workerThread.start() workerThread.start()
} }
} }
@@ -6,7 +6,7 @@ public class Foo
private var bar = 0 private var bar = 0
} }
{ init {
++bar ++bar
} }
@@ -9,7 +9,7 @@ class Foo() {
val c: String val c: String
var d: String var d: String
{ init {
c = bar c = bar
d = Foo.bar d = Foo.bar
boo = "O" boo = "O"
@@ -1,7 +1,7 @@
object Foo { object Foo {
val bar: String val bar: String
{ init {
bar = "OK" bar = "OK"
} }
} }
@@ -2,7 +2,7 @@ class Foo {
companion object { companion object {
val bar: String val bar: String
{ init {
bar = "OK" bar = "OK"
} }
} }
@@ -1,5 +1,5 @@
abstract class WaitFor { abstract class WaitFor {
{ init {
condition() condition()
} }
@@ -2,13 +2,13 @@ package one_extends_base
open class Base<T>(name : T?) { open class Base<T>(name : T?) {
var myName : T? var myName : T?
{ init {
$myName = name $myName = name
} }
} }
open class One<T, K>(name : T?, second : K?) : Base<T?>(name) { open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
var mySecond : K? var mySecond : K?
{ init {
$mySecond = second $mySecond = second
} }
} }
@@ -1,7 +1,7 @@
fun box(): String { fun box(): String {
class A { class A {
var result: String = "Fail"; var result: String = "Fail";
{ init {
result = "OK" result = "OK"
} }
} }
@@ -4,7 +4,7 @@ fun box(): String {
class L : C() { class L : C() {
val a: Any val a: Any
{ init {
a = {} a = {}
} }
} }
@@ -6,7 +6,7 @@ fun box(): String {
val l = object : C { val l = object : C {
override val a: Any override val a: Any
{ init {
a = {} a = {}
} }
} }
@@ -15,7 +15,7 @@ class PrivatePropertyGet {
class PrivatePropertySet { class PrivatePropertySet {
private var x = "a" private var x = "a"
inner class Inner { { x = "b" } } inner class Inner { init { x = "b" } }
} }
class PrivateMethod { class PrivateMethod {
@@ -23,7 +23,7 @@ class Example
private set private set
{ init {
a1 = 1 a1 = 1
a2 = 1 a2 = 1
a3 = 1 a3 = 1
@@ -1,6 +1,6 @@
class Foo { class Foo {
{Foo.test()} init {Foo.test()}
companion object { companion object {
private fun test() { private fun test() {
@@ -1,6 +1,6 @@
class Foo { class Foo {
{Foo.test} init {Foo.test}
companion object { companion object {
private val test = "String" private val test = "String"
@@ -1,6 +1,6 @@
class Foo { class Foo {
{Foo.test} init {Foo.test}
companion object { companion object {
private var test = "String" private var test = "String"
@@ -88,7 +88,7 @@ public class MethodOrderTest: CodegenTestCase() {
} }
inner class Inner() { inner class Inner() {
{ init {
b = b + a b = b + a
c() c()
} }
@@ -388,7 +388,7 @@ public class PackageGenTest extends CodegenTestCase {
} }
public void testPutBooleanAsVoid() throws Exception { 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(); Method main = generateFunction();
main.invoke(null); // must not fail main.invoke(null); // must not fail
} }
@@ -142,7 +142,7 @@ fun box(): String {
suite("dataClass", suite("dataClass",
""" """
data class DataClass($DEFINITION_MARKER: String) { data class DataClass($DEFINITION_MARKER: String) {
{ init {
$TEST_BLOCK_MARKER $TEST_BLOCK_MARKER
} }
} }
@@ -1,7 +1,7 @@
class A { class A {
companion object { companion object {
{ init {
1 + 1 // A 1 + 1 // A
val a = 1 // A val a = 1 // A
fun foo() { fun foo() {
@@ -18,7 +18,7 @@ var aDelegate: Int by Delegates.notNull()
val aLambda = { 1 + 1 } val aLambda = { 1 + 1 }
class A { class A {
{ init {
// EXPRESSION: i // EXPRESSION: i
// RESULT: 1: I // RESULT: 1: I
@@ -7,7 +7,7 @@ fun main(args: Array<String>) {
} }
class A { class A {
{ init {
val a = 1 val a = 1
} }
} }
@@ -7,7 +7,7 @@ fun main(args: Array<String>) {
} }
class A { class A {
{ init {
val a = 1 val a = 1
} }
} }
+1 -1
View File
@@ -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>) { 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> <info textAttributesKey="KOTLIN_PARAMETER">b</info>
} }
@@ -1,7 +1,7 @@
// "Create parameter 'foo'" "true" // "Create parameter 'foo'" "true"
class A(foo: Int) { class A(foo: Int) {
{ init {
val t: Int = foo val t: Int = foo
} }
} }
@@ -1,7 +1,7 @@
// "Create parameter 'foo'" "true" // "Create parameter 'foo'" "true"
class A { class A {
{ init {
val t: Int = <caret>foo val t: Int = <caret>foo
} }
} }
@@ -2,7 +2,7 @@
class A() { class A() {
var a : Int var a : Int
set(v) {} set(v) {}
{ init {
<caret>$a = 1 <caret>$a = 1
} }
} }
@@ -2,7 +2,7 @@
public open class Identifier() { public open class Identifier() {
var field : Boolean var field : Boolean
set(v) {} set(v) {}
{ init {
<caret>this.$field = false; <caret>this.$field = false;
} }
} }
@@ -2,7 +2,7 @@
class A() { class A() {
var a : Int var a : Int
set(v) {} set(v) {}
{ init {
<caret>a = 1 <caret>a = 1
} }
} }
@@ -2,7 +2,7 @@
public open class Identifier() { public open class Identifier() {
var field : Boolean var field : Boolean
set(v) {} set(v) {}
{ init {
<caret>this.field = false; <caret>this.field = false;
} }
} }
@@ -1,5 +1,5 @@
class Bar { class Bar {
{ init {
Foo()() Foo()()
} }
} }
@@ -1,7 +1,7 @@
fun String.inc() = this + "+" fun String.inc() = this + "+"
class Foo { class Foo {
{ init {
var s = "" var s = ""
<selection>s++</selection> <selection>s++</selection>
s.inc() s.inc()
@@ -2,14 +2,14 @@ package foo
class A(val x:Int) { class A(val x:Int) {
var s = "sA" var s = "sA"
{ init {
s += ":init:" + x s += ":init:" + x
} }
} }
class B(val arg1:String, val arg2:String) { class B(val arg1:String, val arg2:String) {
var msg = "" var msg = ""
{ init {
msg = arg1 + arg2 msg = arg1 + arg2
} }
} }
@@ -25,7 +25,7 @@ class Foo() {
val e: String val e: String
val f: String val f: String
{ init {
e = bar e = bar
f = Foo.bar f = Foo.bar
boo = "O" boo = "O"
@@ -3,7 +3,7 @@ package foo
class Foo { class Foo {
val OK = "OK"; val OK = "OK";
var result: String = "" var result: String = ""
{ init {
fun bar(s: String? = null) { fun bar(s: String? = null) {
if (s != null) { if (s != null) {
result = s result = s
@@ -11,7 +11,7 @@ class BaseImpl(val s: String) : Base {
var global = "" var global = ""
open class DerivedBase() { open class DerivedBase() {
{ init {
global += ":DerivedBase" global += ":DerivedBase"
} }
} }
@@ -22,13 +22,13 @@ fun newBase(): Base {
} }
class Derived() : DerivedBase(), Base by newBase() { class Derived() : DerivedBase(), Base by newBase() {
{ init {
global += ":Derived" global += ":Derived"
} }
} }
class Derived1() : Base by newBase(), DerivedBase() { class Derived1() : Base by newBase(), DerivedBase() {
{ init {
global += ":Derived" global += ":Derived"
} }
} }
@@ -19,7 +19,7 @@ class Base2Impl(val s: String) : Base2 {
var global = "" var global = ""
open class DerivedBase() { open class DerivedBase() {
{ init {
global += ":DerivedBase" global += ":DerivedBase"
} }
} }
@@ -35,19 +35,19 @@ fun newBase2(): Base2 {
} }
class Derived() : DerivedBase(), Base by newBase(), Base2 by newBase2() { class Derived() : DerivedBase(), Base by newBase(), Base2 by newBase2() {
{ init {
global += ":Derived" global += ":Derived"
} }
} }
class Derived1() : Base by newBase(), DerivedBase(), Base2 by newBase2() { class Derived1() : Base by newBase(), DerivedBase(), Base2 by newBase2() {
{ init {
global += ":Derived" global += ":Derived"
} }
} }
class Derived2() : Base by newBase(), Base2 by newBase2(), DerivedBase() { class Derived2() : Base by newBase(), Base2 by newBase2(), DerivedBase() {
{ init {
global += ":Derived" global += ":Derived"
} }
} }
@@ -5,7 +5,7 @@ enum class B(open val bar: Int) {
var y = 12; var y = 12;
a : B(0) { a : B(0) {
override val bar = 3 override val bar = 3
{ init {
y = 0 y = 0
} }
} }
@@ -1,7 +1,7 @@
class C() { class C() {
public var f: Int public var f: Int
{ init {
$f = 610 $f = 610
} }
} }
@@ -4,7 +4,7 @@ var c = 0
class A() { class A() {
var p = 0; var p = 0;
{ init {
c++; c++;
} }
} }
@@ -1,5 +1,5 @@
class A(var a: Int) { class A(var a: Int) {
{ init {
$a = 3 $a = 3
} }
} }
@@ -3,7 +3,7 @@ package foo
class A() { class A() {
fun lold() = true fun lold() = true
val p: () -> Boolean val p: () -> Boolean
{ init {
$p = { { lold() }() } $p = { { lold() }() }
} }
} }
@@ -3,7 +3,7 @@ package foo
var x = false var x = false
open class A { open class A {
{ init {
x = (this as B).a != 3 x = (this as B).a != 3
} }
} }
@@ -3,31 +3,31 @@ package foo
open class A() { open class A() {
var order = "" var order = ""
{ init {
order = order + "A" order = order + "A"
} }
} }
open class B() : A() { open class B() : A() {
{ init {
order = order + "B" order = order + "B"
} }
} }
class C() : B() { class C() : B() {
{ init {
order = order + "C" order = order + "C"
} }
} }
class D() : B() { class D() : B() {
{ init {
order = order + "D" order = order + "D"
} }
} }
class E() : A() { class E() : A() {
{ init {
order = order + "E" order = order + "E"
} }
} }
@@ -1,25 +1,25 @@
package foo package foo
class C() : B() { class C() : B() {
{ init {
order = order + "C" order = order + "C"
} }
} }
class D() : B() { class D() : B() {
{ init {
order = order + "D" order = order + "D"
} }
} }
class E() : A() { class E() : A() {
{ init {
order = order + "E" order = order + "E"
} }
} }
open class B() : A() { open class B() : A() {
{ init {
order = order + "B" order = order + "B"
} }
} }
@@ -27,7 +27,7 @@ open class B() : A() {
open class A() : G() { open class A() : G() {
var order = "" var order = ""
{ init {
order = order + "A" order = order + "A"
} }
} }
@@ -3,20 +3,20 @@ package foo
open class A() { open class A() {
var order = "" var order = ""
{ init {
order = order + "A" order = order + "A"
} }
} }
open class B() : A() { open class B() : A() {
{ init {
order = order + "B" order = order + "B"
} }
} }
class C() : B() { class C() : B() {
{ init {
order = order + "C" order = order + "C"
} }
} }
@@ -4,7 +4,7 @@ class B(val name: String)
class A(val a: Int, var b: B) { class A(val a: Int, var b: B) {
var copyB: B var copyB: B
{ init {
copyB = b copyB = b
} }
} }
@@ -3,7 +3,7 @@ package foo
var a = 0 var a = 0
class A() { class A() {
{ init {
a++ a++
} }
@@ -9,7 +9,7 @@ class A {
var aR = 0 var aR = 0
var aaR = 0 var aaR = 0
{ init {
a = 1 a = 1
$aa = 2 $aa = 2
@@ -27,7 +27,7 @@ class B {
var aR = 0 var aR = 0
var aaR = 0 var aaR = 0
{ init {
a = 3 a = 3
$aa = 4 $aa = 4
@@ -9,7 +9,7 @@ trait Holder {
class BasicHolder : Holder { class BasicHolder : Holder {
override val element: String override val element: String
{ init {
element = "ok" element = "ok"
} }
} }
@@ -10,7 +10,7 @@ open class BasicHolder : Holder {
override val element: String override val element: String
get() = $element + $element get() = $element + $element
{ init {
element = "1" element = "1"
} }
} }
@@ -18,7 +18,7 @@ open class BasicHolder : Holder {
class AdvancedHolder : BasicHolder() { class AdvancedHolder : BasicHolder() {
override val element: String override val element: String
{ init {
element = super.element + super.element element = super.element + super.element
} }
} }
@@ -9,7 +9,7 @@ trait Holder {
class BasicHolder : Holder { class BasicHolder : Holder {
override val element: String override val element: String
{ init {
this.element = "ok" this.element = "ok"
} }
} }
@@ -9,7 +9,7 @@ trait Holder {
class BasicHolder : Holder { class BasicHolder : Holder {
override var element: String = "not ok" override var element: String = "not ok"
{ init {
element = "ok" element = "ok"
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(`if`: String) { data class DataClass(`if`: String) {
{ init {
testRenamed("if", { `if` }) testRenamed("if", { `if` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(`in`: String) { data class DataClass(`in`: String) {
{ init {
testRenamed("in", { `in` }) testRenamed("in", { `in` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(with: String) { data class DataClass(with: String) {
{ init {
testRenamed("with", { with }) testRenamed("with", { with })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(yield: String) { data class DataClass(yield: String) {
{ init {
testRenamed("yield", { yield }) testRenamed("yield", { yield })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(val `do`: String) { data class DataClass(val `do`: String) {
{ init {
testNotRenamed("do", { `do` }) testNotRenamed("do", { `do` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(val `else`: String) { data class DataClass(val `else`: String) {
{ init {
testNotRenamed("else", { `else` }) testNotRenamed("else", { `else` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(val switch: String) { data class DataClass(val switch: String) {
{ init {
testNotRenamed("switch", { switch }) testNotRenamed("switch", { switch })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(val typeof: String) { data class DataClass(val typeof: String) {
{ init {
testNotRenamed("typeof", { typeof }) testNotRenamed("typeof", { typeof })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(var `false`: String) { data class DataClass(var `false`: String) {
{ init {
testNotRenamed("false", { `false` }) testNotRenamed("false", { `false` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(var `for`: String) { data class DataClass(var `for`: String) {
{ init {
testNotRenamed("for", { `for` }) testNotRenamed("for", { `for` })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(var undefined: String) { data class DataClass(var undefined: String) {
{ init {
testNotRenamed("undefined", { undefined }) testNotRenamed("undefined", { undefined })
} }
} }
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
data class DataClass(var void: String) { data class DataClass(var void: String) {
{ init {
testNotRenamed("void", { void }) testNotRenamed("void", { void })
} }
} }
@@ -2,7 +2,7 @@ package foo
class Test() { class Test() {
var a: Int var a: Int
{ init {
$a = 3 $a = 3
} }
} }
@@ -1,25 +1,25 @@
package foo package foo
class C() : B() { class C() : B() {
{ init {
order = order + "C" order = order + "C"
} }
} }
class D() : B() { class D() : B() {
{ init {
order = order + "D" order = order + "D"
} }
} }
class E() : A() { class E() : A() {
{ init {
order = order + "E" order = order + "E"
} }
} }
open class B() : A(), F { open class B() : A(), F {
{ init {
order = order + "B" order = order + "B"
} }
} }
@@ -27,7 +27,7 @@ open class B() : A(), F {
open class A() : F { open class A() : F {
var order = "" var order = ""
{ init {
order = order + "A" order = order + "A"
} }
} }
@@ -210,7 +210,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
var dragOff = Vector() var dragOff = Vector()
val interval = 1000 / 30 val interval = 1000 / 30
{ init {
jq(canvas).mousedown { jq(canvas).mousedown {
valid = false valid = false
selection = null selection = null
@@ -295,7 +295,7 @@ class RadialGradientGenerator(val context: CanvasContext) {
gradients.add(colorStops) gradients.add(colorStops)
} }
{ init {
newColorStops(Pair(0.0, "#F59898"), Pair(0.5, "#F57373"), Pair(1.0, "#DB6B6B")) 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.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)")) 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 message = "Hello, Kotlin!"
val textHeightInPixels = 20 val textHeightInPixels = 20
{ init {
context.font = "bold ${textHeightInPixels}px Georgia, serif" context.font = "bold ${textHeightInPixels}px Georgia, serif"
} }
val textWidthInPixels = context.measureText(message)!!.width 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 isForceColorChange = false
var changeColorForward = (startColor == "red") 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 + "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 + "yellow_color.png"))
list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "green_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) shapes.add(shape)
} }
{ init {
jq(canvas).click { jq(canvas).click {
val mousePos = mousePos(it) val mousePos = mousePos(it)
@shapeLoop for (shape in shapes) { @shapeLoop for (shape in shapes) {
@@ -17,7 +17,7 @@ class Field(
init: (Int, Int) -> Boolean init: (Int, Int) -> Boolean
) { ) {
private val live: Array<Array<Boolean>> private val live: Array<Array<Boolean>>
{ init {
live = Array(height) { i -> Array(width) { j -> init(i, j) } } live = Array(height) { i -> Array(width) { j -> init(i, j) } }
} }
@@ -6,7 +6,7 @@ import java.io.File
import kotlinx.android.synthetic.layout.* import kotlinx.android.synthetic.layout.*
public class MyActivity : Activity() { public class MyActivity : Activity() {
{login} init {login}
} }
// 1 public _\$_findCachedViewById // 1 public _\$_findCachedViewById
@@ -5,7 +5,7 @@ import java.io.File
import kotlinx.android.synthetic.layout.* import kotlinx.android.synthetic.layout.*
public class MyFragment : Fragment() { public class MyFragment : Fragment() {
{login} init {login}
} }
// 1 public _\$_findCachedViewById // 1 public _\$_findCachedViewById
@@ -5,7 +5,7 @@ import android.app.Activity
import kotlinx.android.synthetic.layout.view.* import kotlinx.android.synthetic.layout.view.*
public class MyActivity : Activity() { public class MyActivity : Activity() {
{ View(this).login } init { View(this).login }
} }
// 1 public _\$_findCachedViewById // 1 public _\$_findCachedViewById