From 8d3999eb1fc3db7ab160c1f06b5ad35e5861bd6a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 10 Mar 2015 17:06:26 +0100 Subject: class object -> default object --- test/data/classes/classWithDefaultObject.kt | 2 +- test/data/classes/defaultObjectExtension.kt | 2 +- test/data/format/classWithDefaultObject.kt | 2 +- test/data/format/defaultObjectExtension.kt | 2 +- test/src/markdown/MarkdownTestRunner.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithDefaultObject.kt index 459efad6..92e1a695 100644 --- a/test/data/classes/classWithDefaultObject.kt +++ b/test/data/classes/classWithDefaultObject.kt @@ -1,5 +1,5 @@ class Klass() { - class object { + default object { val x = 1 fun foo() {} diff --git a/test/data/classes/defaultObjectExtension.kt b/test/data/classes/defaultObjectExtension.kt index 0bef8a49..58d2e86a 100644 --- a/test/data/classes/defaultObjectExtension.kt +++ b/test/data/classes/defaultObjectExtension.kt @@ -1,5 +1,5 @@ class Foo { - class object Default { + default object Default { } } diff --git a/test/data/format/classWithDefaultObject.kt b/test/data/format/classWithDefaultObject.kt index 459efad6..92e1a695 100644 --- a/test/data/format/classWithDefaultObject.kt +++ b/test/data/format/classWithDefaultObject.kt @@ -1,5 +1,5 @@ class Klass() { - class object { + default object { val x = 1 fun foo() {} diff --git a/test/data/format/defaultObjectExtension.kt b/test/data/format/defaultObjectExtension.kt index e367aa41..78df38c5 100644 --- a/test/data/format/defaultObjectExtension.kt +++ b/test/data/format/defaultObjectExtension.kt @@ -1,5 +1,5 @@ class Foo { - class object Default { + default object Default { } } diff --git a/test/src/markdown/MarkdownTestRunner.kt b/test/src/markdown/MarkdownTestRunner.kt index 4ba9675e..7dc2e82e 100644 --- a/test/src/markdown/MarkdownTestRunner.kt +++ b/test/src/markdown/MarkdownTestRunner.kt @@ -9,7 +9,7 @@ import kotlin.properties.Delegates import org.junit.ComparisonFailure data class MarkdownTestUniqueId(val id: Int) : Serializable { - class object { + default object { var id = 0 fun next() = MarkdownTestUniqueId(id++) } -- cgit