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
@@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() {
super<A>.foo()
}
class object: A() {
default object: A() {
}
}
@@ -12,7 +12,7 @@ Parameter type (10: 16) fun foo(a: A) {
Parameter type (32: 14) fun X.bar(a: A = A()) {
Super type qualifier (20: 15) super<A>.foo()
Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
Supertype (23: 19) class object: A() {
Supertype (23: 21) default object: A() {
Supertype (28: 11) object O: A() {
Target type of 'is' operation (37: 24) return if (this is A) this as A else null
Usage in cast target type (37: 35) return if (this is A) this as A else null
@@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() {
super<A>.foo()
}
class object: A() {
default object: A() {
}
}
@@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() {
super<A>.foo()
}
class object: A() {
default object: A() {
}
}
@@ -3,5 +3,5 @@ Function call (7: 11) A.foos()
New instance creation (2: 20) var next: A? = A()
New instance creation (32: 18) fun X.bar(a: A = A()) {
Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
Supertype (23: 19) class object: A() {
Supertype (23: 21) default object: A() {
Supertype (28: 11) object O: A() {
@@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() {
super<A>.foo()
}
class object: A() {
default object: A() {
}
}
@@ -12,7 +12,7 @@ Parameter type (10: 16) fun foo(a: A) {
Parameter type (32: 14) fun X.bar(a: A = A()) {
Super type qualifier (20: 15) super<A>.foo()
Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
Supertype (23: 19) class object: A() {
Supertype (23: 21) default object: A() {
Supertype (28: 11) object O: A() {
Target type of 'is' operation (37: 24) return if (this is A) this as A else null
Usage in cast target type (37: 35) return if (this is A) this as A else null
@@ -20,7 +20,7 @@ public class X(bar: String? = Outer.A.BAR): Outer.A() {
super<Outer.A>.foo()
}
class object: Outer.A() {
default object: Outer.A() {
}
}
@@ -12,7 +12,7 @@ Parameter type (10: 22) fun foo(a: Outer.A) {
Parameter type (32: 20) fun X.bar(a: Outer.A = Outer.A()) {
Super type qualifier (20: 21) super<Outer.A>.foo()
Supertype (1: 51) public class X(bar: String? = Outer.A.BAR): Outer.A() {
Supertype (23: 25) class object: Outer.A() {
Supertype (23: 27) default object: Outer.A() {
Supertype (28: 17) object O: Outer.A() {
Target type of 'is' operation (37: 30) return if (this is Outer.A) this as Outer.A else null
Usage in cast target type (37: 47) return if (this is Outer.A) this as Outer.A else null
@@ -3,7 +3,7 @@
package server
open class <caret>Server {
class object {
default object {
val NAME = "Server"
}
@@ -3,7 +3,7 @@
package server
open class <caret>Server {
class object {
default object {
val NAME = "Server"
}
@@ -20,7 +20,7 @@ class Client(name: String = Server.NAME): Server() {
println("Client")
}
class object: Server() {
default object: Server() {
}
}
@@ -8,7 +8,7 @@ Nested class/object (7: 16) val name = Server.NAME
Parameter type (32: 19) fun Client.bar(s: Server = Server.NAME) {
Parameter type (9: 16) fun foo(s: Server) {
Super type qualifier (19: 15) super<Server>.work()
Supertype (23: 19) class object: Server() {
Supertype (23: 21) default object: Server() {
Supertype (28: 22) object ClientObject: Server() {
Supertype (5: 43) class Client(name: String = Server.NAME): Server() {
Target type of 'is' operation (41: 24) return if (this is Server) this as Server else null
@@ -3,7 +3,7 @@
package server
open class <caret>Server {
class object {
default object {
val NAME = "Server"
}
@@ -3,7 +3,7 @@
package server
open class <caret>Server {
class object {
default object {
val NAME = "Server"
}
@@ -11,7 +11,7 @@ public open class Outer {
}
class object {
default object {
public var bar: String = "bar";
public open fun foo() {
@@ -24,7 +24,7 @@ public class X(bar: String? = Inner.A.bar): Inner.A() {
super<Inner.A>.foo()
}
class object: Inner.A() {
default object: Inner.A() {
}
}
@@ -13,7 +13,7 @@ New instance creation (6: 32) var next: Inner.A? = Inner.A()
Parameter type (14: 22) fun foo(a: Inner.A) {
Parameter type (36: 20) fun X.bar(a: Inner.A = Inner.A()) {
Super type qualifier (24: 21) super<Inner.A>.foo()
Supertype (27: 25) class object: Inner.A() {
Supertype (27: 27) default object: Inner.A() {
Supertype (32: 17) object O: Inner.A() {
Supertype (5: 51) public class X(bar: String? = Inner.A.bar): Inner.A() {
Target type of 'is' operation (41: 30) return if (this is Inner.A) this as Inner.A else null
@@ -10,7 +10,7 @@ public open class Outer {
}
class object {
default object {
public var bar: String = "bar";
public open fun foo() {
@@ -24,7 +24,7 @@ public class X(bar: String? = Outer.A.bar): Outer.A() {
super<Outer.A>.foo()
}
class object: Outer.A() {
default object: Outer.A() {
}
}
@@ -13,7 +13,7 @@ New instance creation (6: 32) var next: Outer.A? = Outer.A()
Parameter type (14: 22) fun foo(a: Outer.A) {
Parameter type (36: 20) fun X.bar(a: Outer.A = Outer.A()) {
Super type qualifier (24: 21) super<Outer.A>.foo()
Supertype (27: 25) class object: Outer.A() {
Supertype (27: 27) default object: Outer.A() {
Supertype (32: 17) object O: Outer.A() {
Supertype (5: 51) public class X(bar: String? = Outer.A.bar): Outer.A() {
Target type of 'is' operation (41: 30) return if (this is Outer.A) this as Outer.A else null
@@ -3,7 +3,7 @@
package server
class A {
class object {
default object {
var <caret>foo: String = "foo"
}
}
@@ -3,7 +3,7 @@
package server
trait Some {
class object {
default object {
val <caret>XX = 1
}
}
@@ -3,7 +3,7 @@
class Outer {
val x = Outer.t
class object {
default object {
private val <caret>t = 1
}
}
@@ -4,7 +4,7 @@
package server
open class <caret>Server {
class object {
default object {
val NAME = "Server"
}
@@ -20,7 +20,7 @@ class Client(name: String = Server.NAME): Server() {
println("Client")
}
class object: Server() {
default object: Server() {
}
}
@@ -8,7 +8,7 @@ Nested class/object (bar) (32: 28) fun Client.bar(s: Server = Server.NAME) {
Parameter type (Client) (9: 16) fun foo(s: Server) {
Parameter type (bar) (32: 19) fun Client.bar(s: Server = Server.NAME) {
Super type qualifier (Client) (19: 15) super<Server>.work()
Supertype (Client) (23: 19) class object: Server() {
Supertype (Client) (23: 21) default object: Server() {
Supertype (Client) (5: 43) class Client(name: String = Server.NAME): Server() {
Supertype (ClientObject) (28: 22) object ClientObject: Server() {
Target type of 'is' operation (asServer) (41: 24) return if (this is Server) this as Server else null