Replace 'class object' with 'default object' in renderers and test data

Includes changes to decompiled text
Old syntax is used in builtins and project code for now
This commit is contained in:
Pavel V. Talanov
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 deletions
@@ -1,5 +1,5 @@
class A {
class object {
default object {
var xi = 0
var xin : Int? = 0
var xinn : Int? = null
@@ -1,5 +1,5 @@
class C() {
class object {
default object {
fun create() = C()
}
}
@@ -1,7 +1,7 @@
fun Any.foo() = 1
class A {
class object
default object
}
fun box() = if (A.foo() == 1) "OK" else "fail"
@@ -1,7 +1,7 @@
var global = 0;
class C {
class object {
default object {
{
global = 1;
}
@@ -1,5 +1,5 @@
class A() {
class object {
default object {
val value = 10
}
}
@@ -1,7 +1,7 @@
// EA-38323 - Illegal field modifiers in class: classObject field in C must be static and final
trait C {
class object {
default object {
public val FOO: String = "OK"
}
}
@@ -1,5 +1,5 @@
class A {
class object {
default object {
fun values() = "O"
fun valueOf() = "K"
}
@@ -1,4 +1,4 @@
class SomeClass { class object }
class SomeClass { default object }
fun box() =
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+"))
@@ -1,5 +1,5 @@
class C() {
class object {
default object {
private fun <T> create() = C()
}
@@ -1,5 +1,5 @@
open class Test {
class object {
default object {
fun testStatic(ic: InnerClass): NotInnerClass = NotInnerClass(ic.value)
}
@@ -1,5 +1,5 @@
class C() {
class object Foo
default object Foo
}
fun C.Foo.create() = 3
@@ -4,7 +4,7 @@ public class StockMarketTableModel() {
return COLUMN_TITLES?.size()!!
}
class object {
default object {
private val COLUMN_TITLES : Array<Int?> = arrayOfNulls<Int>(10)
}
}
@@ -1,5 +1,5 @@
class A {
class object {
default object {
val b = 0
val c = b
@@ -1,7 +1,7 @@
package x
class Outer() {
class object {
default object {
class Inner() {
}
}
@@ -1,7 +1,7 @@
open class Factory(p: Int)
class A {
class object : Factory(1)
default object : Factory(1)
}
fun box() : String {
@@ -2,7 +2,7 @@ package mult_constructors_3_bug
public open class Identifier() {
private var myNullable : Boolean = true
class object {
default object {
open public fun init(isNullable : Boolean) : Identifier {
val __ = Identifier()
__.myNullable = isNullable
@@ -1,5 +1,5 @@
class C() {
class object Foo {
default object Foo {
fun create() = 3
}
}
@@ -1,5 +1,5 @@
class Foo private(val param: String = "OK") {
class object {
default object {
val s = Foo()
}
}
@@ -1,5 +1,5 @@
class A {
class object {
default object {
fun Int.foo(a: Int = 1): Int {
return a
}
@@ -5,14 +5,14 @@ class Delegate<T>(var inner: T) {
class Foo (val f: Int) {
class object {
default object {
val A: Foo by Delegate(Foo(11))
var B: Foo by Delegate(Foo(11))
}
}
trait FooTrait {
class object {
default object {
val A: Foo by Delegate(Foo(11))
var B: Foo by Delegate(Foo(11))
}
@@ -3,7 +3,7 @@ import java.util.IdentityHashMap
class A {
var foo: Int by IntHandler
class object {
default object {
var bar: Any? by AnyHandler
}
}
@@ -1,5 +1,5 @@
class A {
class object {
default object {
fun invoke(i: Int) = i
}
}
@@ -8,7 +8,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -3,7 +3,7 @@ trait B
fun B.invoke(i: Int) = i
class A {
class object: B {
default object: B {
}
}
@@ -9,7 +9,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : B {
internal default object Default : B {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,6 +1,6 @@
class A {
class Nested {
class object {
default object {
fun invoke(i: Int) = i
}
}
@@ -14,7 +14,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -2,7 +2,7 @@ import A.Nested
class A {
class Nested {
class object {
default object {
fun invoke(i: Int) = i
}
}
@@ -14,7 +14,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -3,7 +3,7 @@ enum class Game {
PAPER
SCISSORS
class object {
default object {
fun foo() = ROCK
val bar = PAPER
}
@@ -2,7 +2,7 @@ fun box() = if(Context.operatingSystemType == Context.Default.OsType.OTHER) "OK"
public class Context
{
class object
default object
{
public enum class OsType {
LINUX;
@@ -1,5 +1,5 @@
class A {
class object {}
default object {}
enum class E {
OK
}
@@ -1,5 +1,5 @@
class A {
class object
default object
}
val foo: Any.() -> Unit = {}
@@ -1,6 +1,6 @@
class Test(val prop: String) {
class object {
default object {
public val prop : String = "CO";
}
@@ -1,7 +1,7 @@
package someTest
public class Some private(val v: String) {
class object {
default object {
public fun init(v: String): Some {
return Some(v)
}
@@ -1,6 +1,6 @@
class Outer {
class Nested {
class object {
default object {
val O = "O"
val K = "K"
}
@@ -3,7 +3,7 @@ public abstract class FList<T>() {
public abstract val tail: FList<T>
public abstract val empty: Boolean
class object {
default object {
val emptyFList = object: FList<Any>() {
public override val head: Any
get() = throw UnsupportedOperationException();
@@ -2,7 +2,7 @@ public open class Test() {
open public fun test() : Unit {
System.out?.println(hello)
}
class object {
default object {
private val hello : String? = "Hello"
}
}
@@ -1,5 +1,5 @@
class Clazz {
class object {
default object {
val a = object {
fun run(x: String) = x
}
@@ -3,7 +3,7 @@ class Identifier<T>(t : T?, myHasDollar : Boolean) {
public fun getName() : T? { return myT }
class object {
default object {
open public fun init<T>(name : T?) : Identifier<T> {
val __ = Identifier<T>(name, false)
return __
@@ -4,7 +4,7 @@ import java.io.*
open class AllEvenNum() {
class object {
default object {
open public fun main(args : Array<String?>?) : Unit {
var i : Int = 1
while ((i <= 100)) {
@@ -14,7 +14,7 @@ public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
return myName
}
class object {
default object {
open public fun init<T>(name : T?) : Identifier<T> {
val __ = Identifier<T>(name, false)
return __
@@ -1,6 +1,6 @@
class Test {
class object {
default object {
public val prop1 : Int = 10
@@ -1,7 +1,7 @@
abstract class ClassValAbstract {
abstract var a: Int
class object {
default object {
val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods()!!
}
}
@@ -8,7 +8,7 @@ class Identifier() {
return myNullable
}
class object {
default object {
fun init(isNullable : Boolean) : Identifier {
val id = Identifier()
id.myNullable = isNullable
@@ -1,6 +1,6 @@
class TestObject()
{
class object {
default object {
var prop: Int = 1
get() = $prop++
}
@@ -2,7 +2,7 @@ class CallbackBlock {}
public class Foo
{
class object {
default object {
private var bar = 0
}
@@ -1,5 +1,5 @@
class Foo() {
class object {
default object {
val bar = "OK";
var boo = "FAIL";
}
@@ -1,5 +1,5 @@
class Foo {
class object {
default object {
val bar: String
{
@@ -1,6 +1,6 @@
class A {
class object {
default object {
private var r: Int = 1;
fun test(): Int {
@@ -1,6 +1,6 @@
open class Bar<T>(val prop: String)
class Foo {
class object : Bar<Foo>("OK") {
default object : Bar<Foo>("OK") {
val p = Foo.prop
val p2 = prop
val p3 = this.prop