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

Fixed issue with final variables and overloading

Browse Source
This commit is contained in:
Aleksi Majander
2013-02-05 16:55:11 +02:00
committed by Pavel V. Talanov
parent de21670851
commit 1fe978e216
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/ast/Field.kt
+1 -1
View File
@@ -33,7 +33,7 @@ public open class Field(val identifier : Identifier,
val declaration : String = docComments.toKotlin("\n", "", "\n") + val declaration : String = docComments.toKotlin("\n", "", "\n") +
modifiersToKotlin() + identifier.toKotlin() + " : " + `type`.toKotlin() modifiersToKotlin() + identifier.toKotlin() + " : " + `type`.toKotlin()
if (initializer.isEmpty()) { if (initializer.isEmpty()) {
return declaration + ((if (isVal() && !isStatic() && writingAccesses == 1) return declaration + ((if (isVal() && !isStatic() && writingAccesses != 0)
"" ""
else else
" = " + Converter.getDefaultInitializer(this))) " = " + Converter.getDefaultInitializer(this)))
tests/testData/ast/constructors/file/genericIdentifier.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) { public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
private val myName : T? = null private val myName : T?
private var myHasDollar : Boolean = false private var myHasDollar : Boolean = false
private var myNullable : Boolean = true private var myNullable : Boolean = true
public open fun getName() : T? { public open fun getName() : T? {
tests/testData/ast/constructors/file/identifier.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public open class Identifier(_myName : String?, _myHasDollar : Boolean) { public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
private val myName : String? = null private val myName : String?
private var myHasDollar : Boolean = false private var myHasDollar : Boolean = false
private var myNullable : Boolean = true private var myNullable : Boolean = true
public open fun getName() : String? { public open fun getName() : String? {
tests/testData/ast/issues/file/kt-638.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) { public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
private val myName : T? = null private val myName : T?
private var myHasDollar : Boolean = false private var myHasDollar : Boolean = false
private var myNullable : Boolean = true private var myNullable : Boolean = true
public open fun getName() : T? { public open fun getName() : T? {