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

reordered modifiers order: visibility first in j2k converter

Browse Source
This commit is contained in:
Svetlana Isakova
2012-03-30 14:37:15 +04:00
parent 83426659f1
commit 8b45b26785
31 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/ast/Class.java
+3 -3
View File
@@ -192,12 +192,12 @@ public class Class extends Member {
String modifiersToKotlin() {
List<String> modifierList = new LinkedList<String>();
modifierList.add(accessModifier());
if (needAbstractModifier()) {
modifierList.add(Modifier.ABSTRACT);
}
modifierList.add(accessModifier());
if (needOpenModifier()) {
modifierList.add(Modifier.OPEN);
}
@@ -210,7 +210,7 @@ public class Class extends Member {
}
boolean needOpenModifier() {
return !myModifiers.contains(Modifier.FINAL);
return !myModifiers.contains(Modifier.FINAL) && !myModifiers.contains(Modifier.ABSTRACT);
}
boolean needAbstractModifier() {
j2k/src/org/jetbrains/jet/j2k/ast/Function.java
+6 -6
View File
@@ -88,6 +88,11 @@ public class Function extends Member {
String modifiersToKotlin() {
List<String> modifierList = new LinkedList<String>();
String accessModifier = accessModifier();
if (!accessModifier.isEmpty()) {
modifierList.add(accessModifier);
}
if (isAbstract()) {
modifierList.add(Modifier.ABSTRACT);
}
@@ -96,7 +101,7 @@ public class Function extends Member {
modifierList.add(Modifier.OVERRIDE);
}
if (!myModifiers.contains(Modifier.OVERRIDE) && !myModifiers.contains(Modifier.FINAL)) {
if (!myModifiers.contains(Modifier.ABSTRACT) && !myModifiers.contains(Modifier.OVERRIDE) && !myModifiers.contains(Modifier.FINAL)) {
modifierList.add(Modifier.OPEN);
}
@@ -104,11 +109,6 @@ public class Function extends Member {
modifierList.remove(Modifier.OPEN);
}
String accessModifier = accessModifier();
if (!accessModifier.isEmpty()) {
modifierList.add(accessModifier);
}
if (modifierList.size() > 0) {
return AstUtil.join(modifierList, SPACE) + SPACE;
}
j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public open class Test(str : String) {
var myStr : String? = "String2"
open public fun sout(str : String) : Unit {
public open fun sout(str : String) : Unit {
System.out?.println(str)
}
open public fun dummy(str : String) : String {
public open fun dummy(str : String) : String {
return str
}
open public fun test() : Unit {
public open fun test() : Unit {
sout("String")
var test : String = "String2"
sout(test)
j2k/tests/testData/ast/class/class/abstractClass.kt
+2 -2
View File
@@ -1,5 +1,5 @@
abstract open class A() {
abstract open fun callme() : Unit
abstract class A() {
abstract fun callme() : Unit
open fun callmetoo() : Unit {
print("This is a concrete method.")
}
j2k/tests/testData/ast/class/class/abstractClassShape.jav
+1 -1
View File
@@ -8,5 +8,5 @@ abstract class Shape {
public String getColor() {
return color;
}
abstract public double area();
public abstract double area();
}
j2k/tests/testData/ast/class/class/abstractClassShape.kt
+4 -4
View File
@@ -1,10 +1,10 @@
abstract open class Shape() {
abstract class Shape() {
public var color : String? = null
open public fun setColor(c : String?) : Unit {
public open fun setColor(c : String?) : Unit {
color = c
}
open public fun getColor() : String? {
public open fun getColor() : String? {
return color
}
abstract open public fun area() : Double
public abstract fun area() : Double
}
j2k/tests/testData/ast/class/file/privateInit.kt
+1 -1
View File
@@ -1,4 +1,4 @@
public open class MyClass() {
open private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
private open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
}
}
j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt
+1 -1
View File
@@ -12,7 +12,7 @@ return __
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var c1 : C? = C(100, 100, 100)
var c2 : C? = C.init(100, 100)
var c3 : C? = C.init(100)
j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt
+1 -1
View File
@@ -24,7 +24,7 @@ return __
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var c1 : C? = C.init(100, 100, 100)
var c2 : C? = C.init(100, 100)
var c3 : C? = C(100)
j2k/tests/testData/ast/constructors/file/customerBuilder.kt
+8 -8
View File
@@ -2,15 +2,15 @@ package org.test.customer
open class Customer(first : String?, last : String?) {
public val _firstName : String?
public val _lastName : String?
open public fun getFirstName() : String? {
public open fun getFirstName() : String? {
return _firstName
}
open public fun getLastName() : String? {
public open fun getLastName() : String? {
return _lastName
}
open private fun doSmthBefore() : Unit {
private open fun doSmthBefore() : Unit {
}
open private fun doSmthAfter() : Unit {
private open fun doSmthAfter() : Unit {
}
{
doSmthBefore()
@@ -22,21 +22,21 @@ doSmthAfter()
open class CustomerBuilder() {
public var _firstName : String? = "Homer"
public var _lastName : String? = "Simpson"
open public fun WithFirstName(firstName : String?) : CustomerBuilder? {
public open fun WithFirstName(firstName : String?) : CustomerBuilder? {
_firstName = firstName
return this
}
open public fun WithLastName(lastName : String?) : CustomerBuilder? {
public open fun WithLastName(lastName : String?) : CustomerBuilder? {
_lastName = lastName
return this
}
open public fun Build() : Customer? {
public open fun Build() : Customer? {
return Customer(_firstName, _lastName)
}
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var customer : Customer? = CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
System.out?.println(customer?.getFirstName())
System.out?.println(customer?.getLastName())
j2k/tests/testData/ast/constructors/file/genericIdentifier.kt
+5 -5
View File
@@ -2,7 +2,7 @@ public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
private val myName : T? = null
private var myHasDollar : Boolean = false
private var myNullable : Boolean = true
open public fun getName() : T? {
public open fun getName() : T? {
return myName
}
{
@@ -10,16 +10,16 @@ myName = _myName
myHasDollar = _myHasDollar
}
class object {
open public fun init<T>(name : T?) : Identifier<T> {
public open fun init<T>(name : T?) : Identifier<T> {
val __ = Identifier(name, false)
return __
}
open public fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
public open fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
val __ = Identifier(name, false)
__.myNullable = isNullable
return __
}
open public fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
public open fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
val __ = Identifier(name, hasDollar)
__.myNullable = isNullable
return __
@@ -28,7 +28,7 @@ return __
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
j2k/tests/testData/ast/constructors/file/identifier.kt
+5 -5
View File
@@ -2,7 +2,7 @@ public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
private val myName : String? = null
private var myHasDollar : Boolean = false
private var myNullable : Boolean = true
open public fun getName() : String? {
public open fun getName() : String? {
return myName
}
{
@@ -10,16 +10,16 @@ myName = _myName
myHasDollar = _myHasDollar
}
class object {
open public fun init(name : String?) : Identifier {
public open fun init(name : String?) : Identifier {
val __ = Identifier(name, false)
return __
}
open public fun init(name : String?, isNullable : Boolean) : Identifier {
public open fun init(name : String?, isNullable : Boolean) : Identifier {
val __ = Identifier(name, false)
__.myNullable = isNullable
return __
}
open public fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier {
public open fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier {
val __ = Identifier(name, hasDollar)
__.myNullable = isNullable
return __
@@ -28,7 +28,7 @@ return __
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var i1 : Identifier? = Identifier.init("name", false, true)
var i2 : Identifier? = Identifier.init("name", false)
var i3 : Identifier? = Identifier.init("name")
j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt
+3 -3
View File
@@ -18,11 +18,11 @@ f = _f
g = _g
}
class object {
open public fun init() : Test {
public open fun init() : Test {
val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
return __
}
open public fun init(name : String?) : Test {
public open fun init(name : String?) : Test {
val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
return __
}
@@ -33,7 +33,7 @@ return ""
}
public open class User() {
class object {
open public fun main() : Unit {
public open fun main() : Unit {
var t : Test? = Test.init("name")
}
}
j2k/tests/testData/ast/enum/class/runnableImplementation.kt
+1 -1
View File
@@ -4,7 +4,7 @@ BLACK
RED
YELLOW
BLUE
override public fun run() : Unit {
public override fun run() : Unit {
System.out?.println("name()=" + name() + ", toString()=" + toString())
}
public fun name() : String { return "" }
j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
+10 -10
View File
@@ -1,35 +1,35 @@
package test
open class Test() : Base() {
override public fun hashCode() : Int {
public override fun hashCode() : Int {
return super.hashCode()
}
override public fun equals(o : Any?) : Boolean {
public override fun equals(o : Any?) : Boolean {
return super.equals(o)
}
override protected fun clone() : Any? {
protected override fun clone() : Any? {
return super.clone()
}
override public fun toString() : String? {
public override fun toString() : String? {
return super.toString()
}
override protected fun finalize() : Unit {
protected override fun finalize() : Unit {
super.finalize()
}
}
open class Base() {
open public fun hashCode() : Int {
public open fun hashCode() : Int {
return System.identityHashCode(this)
}
open public fun equals(o : Any?) : Boolean {
public open fun equals(o : Any?) : Boolean {
return this.identityEquals(o)
}
open protected fun clone() : Any? {
protected open fun clone() : Any? {
return super.clone()
}
open public fun toString() : String? {
public open fun toString() : String? {
return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
}
open protected fun finalize() : Unit {
protected open fun finalize() : Unit {
super.finalize()
}
}
j2k/tests/testData/ast/function/file/overrideObject.kt
+5 -5
View File
@@ -1,18 +1,18 @@
package test
open class Test() {
open public fun hashCode() : Int {
public open fun hashCode() : Int {
return System.identityHashCode(this)
}
open public fun equals(o : Any?) : Boolean {
public open fun equals(o : Any?) : Boolean {
return this.identityEquals(o)
}
open protected fun clone() : Any? {
protected open fun clone() : Any? {
return super.clone()
}
open public fun toString() : String? {
public open fun toString() : String? {
return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
}
open protected fun finalize() : Unit {
protected open fun finalize() : Unit {
super.finalize()
}
}
j2k/tests/testData/ast/identifier/file/finalFieldReference.kt
+1 -1
View File
@@ -4,7 +4,7 @@ open class `$`() {
}
open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
val `$$$` : `$$$$$`?
open public fun `$$$$$$`() : `$$$$$`? {
public open fun `$$$$$$`() : `$$$$$`? {
return `$$$`
}
{
j2k/tests/testData/ast/issues/file/kt-638.kt
+5 -5
View File
@@ -2,7 +2,7 @@ public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
private val myName : T? = null
private var myHasDollar : Boolean = false
private var myNullable : Boolean = true
open public fun getName() : T? {
public open fun getName() : T? {
return myName
}
{
@@ -10,16 +10,16 @@ myName = _myName
myHasDollar = _myHasDollar
}
class object {
open public fun init<T>(name : T?) : Identifier<T> {
public open fun init<T>(name : T?) : Identifier<T> {
val __ = Identifier(name, false)
return __
}
open public fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
public open fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
val __ = Identifier(name, false)
__.myNullable = isNullable
return __
}
open public fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
public open fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
val __ = Identifier(name, hasDollar)
__.myNullable = isNullable
return __
@@ -28,7 +28,7 @@ return __
}
public open class User() {
class object {
open public fun main(args : Array<String?>?) : Unit {
public open fun main(args : Array<String?>?) : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
j2k/tests/testData/ast/issues/file/kt-696.kt
+6 -6
View File
@@ -1,23 +1,23 @@
package test
open class Base() {
open public fun hashCode() : Int {
public open fun hashCode() : Int {
return System.identityHashCode(this)
}
open public fun equals(o : Any?) : Boolean {
public open fun equals(o : Any?) : Boolean {
return this.identityEquals(o)
}
open public fun toString() : String? {
public open fun toString() : String? {
return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
}
}
open class Child() : Base() {
override public fun hashCode() : Int {
public override fun hashCode() : Int {
return super.hashCode()
}
override public fun equals(o : Any?) : Boolean {
public override fun equals(o : Any?) : Boolean {
return super.equals(o)
}
override public fun toString() : String? {
public override fun toString() : String? {
return super.toString()
}
}
j2k/tests/testData/ast/issues/file/kt-820-string.kt
+1 -1
View File
@@ -1,6 +1,6 @@
open class Test() {
class object {
open public fun toFileSystemSafeName(name : String?) : String? {
public open fun toFileSystemSafeName(name : String?) : String? {
var size : Int = name?.length().sure()
return name
}
j2k/tests/testData/ast/issues/file/kt-824-isDir.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
import java.io.File
public open class Test() {
class object {
open public fun isDir(parent : File?) : Boolean {
public open fun isDir(parent : File?) : Boolean {
if (parent == null || !parent?.exists())
{
return false
j2k/tests/testData/ast/issues/file/kt-836.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model
import java.io.Serializable
public open class Language(code : String?) : Serializable {
protected var code : String? = null
override public fun toString() : String? {
public override fun toString() : String? {
return this.code
}
{
j2k/tests/testData/ast/issues/file/kt-837.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model
import java.io.Serializable
public open class Language(code : String?) : Serializable {
protected var code : String? = null
open public fun equals(other : Language?) : Boolean {
public open fun equals(other : Language?) : Boolean {
return other?.toString()?.equals(this.toString()).sure()
}
{
j2k/tests/testData/ast/issues/file/kt-871.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package demo
open class Program() {
class object {
open public fun main(args : Array<String?>?) : Unit {
public open fun main(args : Array<String?>?) : Unit {
System.out?.println("Halo!")
}
}
j2k/tests/testData/ast/issues/file/kt-879.kt
+1 -1
View File
@@ -1,6 +1,6 @@
open class Test() {
class object {
open public fun getInt(i : Int) : Int {
public open fun getInt(i : Int) : Int {
when (i) {
0 -> {
return 0
j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
+4 -4
View File
@@ -1,19 +1,19 @@
package demo
import java.util.Iterator
open class Test() : java.lang.Iterable<String?> {
override public fun iterator() : java.util.Iterator<String?>? {
public override fun iterator() : java.util.Iterator<String?>? {
return null
}
open public fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
public open fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
var j : java.util.Iterator<String?>? = i
return j
}
}
open class FullTest() : java.lang.Iterable<String?> {
override public fun iterator() : java.util.Iterator<String?>? {
public override fun iterator() : java.util.Iterator<String?>? {
return null
}
open public fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
public open fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
var j : java.util.Iterator<String?>? = i
return j
}
j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
+1 -1
View File
@@ -1,5 +1,5 @@
object : Runnable() {
override public fun run() : Unit {
public override fun run() : Unit {
System.out?.println("Run")
}
}
j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt
+3 -3
View File
@@ -1,17 +1,17 @@
package demo
open class WindowAdapter() {
open public fun windowClosing() : Unit {
public open fun windowClosing() : Unit {
}
}
public class Client() : Frame() {
{
var a : WindowAdapter? = object : WindowAdapter() {
override public fun windowClosing() : Unit {
public override fun windowClosing() : Unit {
}
}
addWindowListener(a)
addWindowListener(object : WindowAdapter() {
override public fun windowClosing() : Unit {
public override fun windowClosing() : Unit {
}
})
}
j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt
+3 -3
View File
@@ -1,10 +1,10 @@
package demo
public open class SwitchDemo() {
class object {
open public fun print(o : Any?) : Unit {
public open fun print(o : Any?) : Unit {
System.out?.println(o)
}
open public fun test(i : Int) : Unit {
public open fun test(i : Int) : Unit {
var monthString : String? = "<empty>"
when (i) {
1 -> {
@@ -80,7 +80,7 @@ monthString = "Invalid month"
}
System.out?.println(monthString)
}
open public fun main(args : Array<String?>?) : Unit {
public open fun main(args : Array<String?>?) : Unit {
for (i in 1..12) test(i)
}
}
j2k/tests/testData/ast/switch/file/fallDown.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package switch_demo
public open class SwitchDemo() {
class object {
open public fun main(args : Array<String?>?) : Unit {
public open fun main(args : Array<String?>?) : Unit {
var month : Int = 8
var monthString : String?
when (month) {
j2k/tests/testData/ast/switch/file/kt-539.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package switch_demo
public open class SwitchDemo() {
class object {
open public fun main(args : Array<String?>?) : Unit {
public open fun main(args : Array<String?>?) : Unit {
var month : Int = 8
var monthString : String?
when (month) {