azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt
+2 -2
View File
@@ -1,9 +1,9 @@
class MyClass {
deprecated("") default object {
deprecated("") companion object {
}
}
// TESTED_OBJECT_KIND: class
// TESTED_OBJECTS: MyClass$Default
// TESTED_OBJECTS: MyClass$Companion
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED, ACC_SUPER
compiler/testData/writeFlags/class/visibility/private/innerEnum.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NO_FLAGS because we put enum in default object of foo. When it will be fixed - MyClass should have ACC_PRIVATE flag
// NO_FLAGS because we put enum in companion object of foo. When it will be fixed - MyClass should have ACC_PRIVATE flag
class Foo {
private enum class MyClass() {
compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt
+2 -2
View File
@@ -2,7 +2,7 @@ class Foo {
{Foo.test()}
default object {
companion object {
private fun test() {
}
@@ -10,5 +10,5 @@ class Foo {
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Foo$Default, test
// TESTED_OBJECTS: Foo$Companion, test
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt
+2 -2
View File
@@ -2,11 +2,11 @@ class Foo {
{Foo.test}
default object {
companion object {
private val test = "String"
}
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Foo$Default, getTest
// TESTED_OBJECTS: Foo$Companion, getTest
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt
+2 -2
View File
@@ -2,11 +2,11 @@ class Foo {
{Foo.test}
default object {
companion object {
private var test = "String"
}
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Foo$Default, setTest
// TESTED_OBJECTS: Foo$Companion, setTest
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/function/constructors/classObject.kt
+2 -2
View File
@@ -1,8 +1,8 @@
class Foo {
default object {
companion object {
}
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: Foo$Default, <init>
// TESTED_OBJECTS: Foo$Companion, <init>
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt
+2 -2
View File
@@ -1,9 +1,9 @@
class MyClass() {
default object {
companion object {
deprecated("") fun test() {}
}
}
// TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass$Default, test
// TESTED_OBJECTS: MyClass$Companion, test
// FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL
compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt
+2 -2
View File
@@ -1,8 +1,8 @@
class Foo {
default object {
companion object {
}
}
// TESTED_OBJECT_KIND: innerClass
// TESTED_OBJECTS: Foo, Default
// TESTED_OBJECTS: Foo, Companion
// FLAGS: ACC_FINAL, ACC_PUBLIC, ACC_STATIC
compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt
+2 -2
View File
@@ -1,8 +1,8 @@
class Foo {
private default object {
private companion object {
}
}
// TESTED_OBJECT_KIND: innerClass
// TESTED_OBJECTS: Foo, Default
// TESTED_OBJECTS: Foo, Companion
// FLAGS: ACC_FINAL, ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt
+2 -2
View File
@@ -1,8 +1,8 @@
class Foo {
public default object {
public companion object {
}
}
// TESTED_OBJECT_KIND: innerClass
// TESTED_OBJECTS: Foo, Default
// TESTED_OBJECTS: Foo, Companion
// FLAGS: ACC_FINAL, ACC_PUBLIC, ACC_STATIC
compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt
+3 -3
View File
@@ -10,7 +10,7 @@ class TestDelegate() {
class Test {
default object {
companion object {
protected var prop: Int by TestDelegate()
}
}
@@ -20,11 +20,11 @@ class Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop$delegate
// TESTED_OBJECTS: Test$Companion, prop$delegate
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt
+3 -3
View File
@@ -5,7 +5,7 @@ class TestDelegate() {
}
class Test {
default object {
companion object {
public val prop: Int by TestDelegate()
}
}
@@ -15,11 +15,11 @@ class Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop$delegate
// TESTED_OBJECTS: Test$Companion, prop$delegate
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
compiler/testData/writeFlags/property/classObject/class/internalVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
var prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/internalVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
var prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/noBackingField.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
var prop: Int
get() {
return 10
@@ -15,5 +15,5 @@ class Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/privateVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
private val prop = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/privateVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
private var prop = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/protectedVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
protected val prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
protected var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public val prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public val prop: Int = 0
get() {
return $prop
@@ -12,5 +12,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public var prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public var prop: Int = 0
set(i : Int) {
$prop = i
@@ -12,5 +12,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public var prop: Int = 0
protected set
}
@@ -10,5 +10,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PROTECTED
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public var prop: Int = 0
public set
}
@@ -10,5 +10,5 @@ class Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Test(val prop: String) {
default object {
companion object {
public val prop : String = "CO";
}
compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt
+1 -1
View File
@@ -17,7 +17,7 @@ class Test {
public val prop: Int by TestDelegate({10})
default object {
companion object {
public var prop: Int by TestDelegate({10})
}
}
compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt
+1 -1
View File
@@ -17,7 +17,7 @@ class Test {
public var prop: String = ""
default object {
companion object {
public var prop: Int by TestDelegate({10})
}
}
compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt
+1 -1
View File
@@ -2,7 +2,7 @@ class Test {
public var prop: Int = 0;
default object {
companion object {
public val prop: Int = 0;
}
}
compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt
+3 -3
View File
@@ -9,7 +9,7 @@ class TestDelegate() {
}
trait Test {
default object {
companion object {
protected var prop: Int by TestDelegate()
}
}
@@ -19,11 +19,11 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop$delegate
// TESTED_OBJECTS: Test$Companion, prop$delegate
// FLAGS: ACC_FINAL, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt
+3 -3
View File
@@ -5,7 +5,7 @@ class TestDelegate() {
}
trait Test {
default object {
companion object {
public val prop: Int by TestDelegate()
}
}
@@ -15,11 +15,11 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop$delegate
// TESTED_OBJECTS: Test$Companion, prop$delegate
// FLAGS: ACC_FINAL, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
val prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ trait Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/internalVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
var prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
var prop: Int
get() {
return 10
@@ -15,5 +15,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/trait/privateVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
private val prop = 0;
}
}
@@ -9,5 +9,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/privateVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
private var prop = 0;
}
}
@@ -9,5 +9,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
protected val prop: Int = 0
}
}
@@ -9,5 +9,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
protected var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public val prop: Int = 0;
}
}
@@ -9,5 +9,5 @@ trait Test {
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public val prop: Int = 0
get() {
return $prop
@@ -12,5 +12,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/publicVar.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public var prop: Int = 0
}
}
@@ -9,5 +9,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public var prop: Int = 0
set(i : Int) {
$prop = i
@@ -12,5 +12,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public var prop: Int = 0
private set
}
@@ -10,5 +10,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public var prop: Int = 0
protected set
}
@@ -10,5 +10,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE
compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait Test {
default object {
companion object {
public var prop: Int = 0
public set
}
@@ -10,5 +10,5 @@ trait Test {
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Default, prop
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE