From bb499697fc18a4d07f8dda8688c18fd3cbc1890b Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Fri, 16 Dec 2011 15:25:29 +0400 Subject: [PATCH] remove dollar usages from the whole project --- src/org/jetbrains/jet/j2k/Converter.java | 5 +++-- src/org/jetbrains/jet/j2k/ast/Identifier.java | 2 ++ .../jetbrains/jet/j2k/ast/IdentifierImpl.java | 15 ++++++--------- src/org/jetbrains/jet/j2k/ast/Node.java | 2 -- .../jet/j2k/visitors/ExpressionVisitor.java | 19 ++++++++----------- .../ast/annotations/file/jetbrainsNotNull.kt | 2 +- .../ast/constructors/file/allCallsPrimary2.kt | 6 +++--- .../ast/constructors/file/customerBuilder.kt | 4 ++-- .../constructors/file/genericIdentifier.kt | 6 +++--- testData/ast/constructors/file/identifier.kt | 6 +++--- .../file/withManyDefaultParams.kt | 18 +++++++++--------- testData/ast/enum/class/colorEnum.kt | 2 +- .../fieldsWithPrimaryPrivateConstructor.kt | 2 +- .../enum/class/primaryPrivateConstructor.kt | 2 +- .../identifier/file/finalFieldReference.kt | 2 +- .../file/classOneExtendsBaseGeneric.kt | 2 +- ...dsBaseWithZeroParamsNonEmptyConstructor.kt | 2 +- testData/ast/issues/file/kt-836.kt | 2 +- testData/ast/issues/file/kt-837.kt | 2 +- 19 files changed, 48 insertions(+), 53 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java index 17159937e0c..e9301575576 100644 --- a/src/org/jetbrains/jet/j2k/Converter.java +++ b/src/org/jetbrains/jet/j2k/Converter.java @@ -115,7 +115,8 @@ public class Converter { @NotNull private static List createParametersFromFields(@NotNull List fields) { List result = new LinkedList(); - for (Field f : fields) result.add(new Parameter(f.getIdentifier(), f.getType())); + for (Field f : fields) + result.add(new Parameter(new IdentifierImpl("_" + f.getIdentifier().getName()), f.getType())); return result; } @@ -124,7 +125,7 @@ public class Converter { List result = new LinkedList(); for (Field f : fields) { final String identifierToKotlin = f.getIdentifier().toKotlin(); - result.add(new DummyStringExpression("$" + identifierToKotlin + " = " + identifierToKotlin)); + result.add(new DummyStringExpression(identifierToKotlin + " = " + "_" + identifierToKotlin)); } return result; } diff --git a/src/org/jetbrains/jet/j2k/ast/Identifier.java b/src/org/jetbrains/jet/j2k/ast/Identifier.java index e1b095fb240..9ddbe91eb56 100644 --- a/src/org/jetbrains/jet/j2k/ast/Identifier.java +++ b/src/org/jetbrains/jet/j2k/ast/Identifier.java @@ -10,4 +10,6 @@ public interface Identifier extends INode { public static Identifier EMPTY_IDENTIFIER = new IdentifierImpl(""); public boolean isEmpty(); + + String getName(); } diff --git a/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java b/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java index 8d01bcdf8a7..6a1b4fbff11 100644 --- a/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java +++ b/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java @@ -7,7 +7,6 @@ import org.jetbrains.annotations.NotNull; */ public class IdentifierImpl extends Expression implements Identifier { private final String myName; - private boolean myHasDollar = false; private boolean myIsNullable = true; private boolean myQuotingNeeded = true; @@ -20,14 +19,9 @@ public class IdentifierImpl extends Expression implements Identifier { myIsNullable = isNullable; } - public IdentifierImpl(String name, boolean hasDollar, boolean isNullable) { + public IdentifierImpl(String name, boolean isNullable, boolean quotingNeeded) { myName = name; - myHasDollar = hasDollar; myIsNullable = isNullable; - } - - public IdentifierImpl(String name, boolean hasDollar, boolean isNullable, boolean quotingNeeded) { - this(name, hasDollar, isNullable); myQuotingNeeded = quotingNeeded; } @@ -36,6 +30,11 @@ public class IdentifierImpl extends Expression implements Identifier { return myName.length() == 0; } + @Override + public String getName() { + return myName; + } + @NotNull private static String quote(String str) { return BACKTICK + str + BACKTICK; @@ -55,8 +54,6 @@ public class IdentifierImpl extends Expression implements Identifier { @NotNull @Override public String toKotlin() { - if (myHasDollar) - return DOLLAR + ifNeedQuote(); return ifNeedQuote(); } } \ No newline at end of file diff --git a/src/org/jetbrains/jet/j2k/ast/Node.java b/src/org/jetbrains/jet/j2k/ast/Node.java index 3d3b934e603..d1df1727e18 100644 --- a/src/org/jetbrains/jet/j2k/ast/Node.java +++ b/src/org/jetbrains/jet/j2k/ast/Node.java @@ -46,8 +46,6 @@ public abstract class Node implements INode { @NotNull static final String AT = "@"; @NotNull - static final String DOLLAR = "$"; - @NotNull static final String BACKTICK = "`"; @NotNull static final String QUEST = "?"; diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index 80ee20ce3c1..d61d6a4791b 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -6,7 +6,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.j2k.ast.*; -import java.util.*; +import java.util.Collections; +import java.util.List; import static org.jetbrains.jet.j2k.Converter.*; @@ -188,7 +189,7 @@ public class ExpressionVisitor extends StatementVisitor { if (canonicalTypeStr.equals("char") || canonicalTypeStr.equals("java.lang.Character")) isQuotingNeeded = false; } - myResult = new LiteralExpression(new IdentifierImpl(text, false, false, isQuotingNeeded)); + myResult = new LiteralExpression(new IdentifierImpl(text, false, isQuotingNeeded)); } @Override @@ -310,15 +311,11 @@ public class ExpressionVisitor extends StatementVisitor { Expression identifier = new IdentifierImpl(expression.getReferenceName(), isNullable); - if (hasDollar) - identifier = new IdentifierImpl(expression.getReferenceName(), hasDollar, isNullable); - else { - final String temporaryObject = "__"; - if (hasReceiver) - identifier = new CallChainExpression(new IdentifierImpl(temporaryObject, false), new IdentifierImpl(expression.getReferenceName(), isNullable)); - else if (insideSecondaryConstructor && isThis) - identifier = new IdentifierImpl("val " + temporaryObject + " = " + className); // TODO: hack - } + final String temporaryObject = "__"; + if (hasReceiver) + identifier = new CallChainExpression(new IdentifierImpl(temporaryObject, false), new IdentifierImpl(expression.getReferenceName(), isNullable)); + else if (insideSecondaryConstructor && isThis) + identifier = new IdentifierImpl("val " + temporaryObject + " = " + className); // TODO: hack myResult = new CallChainExpression( expressionToExpression(expression.getQualifierExpression()), diff --git a/testData/ast/annotations/file/jetbrainsNotNull.kt b/testData/ast/annotations/file/jetbrainsNotNull.kt index bd1969cabda..ebf15859e15 100644 --- a/testData/ast/annotations/file/jetbrainsNotNull.kt +++ b/testData/ast/annotations/file/jetbrainsNotNull.kt @@ -1,7 +1,7 @@ namespace test public open class Test(str : String) { { -$myStr = str +myStr = str } var myStr : String? = "String2" open public fun sout(str : String) : Unit { diff --git a/testData/ast/constructors/file/allCallsPrimary2.kt b/testData/ast/constructors/file/allCallsPrimary2.kt index 26c6110374f..31a0f698398 100644 --- a/testData/ast/constructors/file/allCallsPrimary2.kt +++ b/testData/ast/constructors/file/allCallsPrimary2.kt @@ -1,8 +1,8 @@ open class C(arg1 : Int) { { -$myArg1 = arg1 -$myArg2 = 0 -$myArg3 = 0 +myArg1 = arg1 +myArg2 = 0 +myArg3 = 0 } val myArg1 : Int = 0 var myArg2 : Int = 0 diff --git a/testData/ast/constructors/file/customerBuilder.kt b/testData/ast/constructors/file/customerBuilder.kt index e76788b5cbb..ab1461ed191 100644 --- a/testData/ast/constructors/file/customerBuilder.kt +++ b/testData/ast/constructors/file/customerBuilder.kt @@ -2,8 +2,8 @@ namespace org.test.customer open class Customer(first : String?, last : String?) { { doSmthBefore() -$_firstName = first -$_lastName = last +_firstName = first +_lastName = last doSmthAfter() } public val _firstName : String? = null diff --git a/testData/ast/constructors/file/genericIdentifier.kt b/testData/ast/constructors/file/genericIdentifier.kt index 1808639264c..249ba2f3b56 100644 --- a/testData/ast/constructors/file/genericIdentifier.kt +++ b/testData/ast/constructors/file/genericIdentifier.kt @@ -1,7 +1,7 @@ -public open class Identifier(myName : T?, myHasDollar : Boolean) { +public open class Identifier(_myName : T?, _myHasDollar : Boolean) { { -$myName = myName -$myHasDollar = myHasDollar +myName = _myName +myHasDollar = _myHasDollar } private val myName : T? = null private var myHasDollar : Boolean = false diff --git a/testData/ast/constructors/file/identifier.kt b/testData/ast/constructors/file/identifier.kt index 1abada8ea1a..4c296879705 100644 --- a/testData/ast/constructors/file/identifier.kt +++ b/testData/ast/constructors/file/identifier.kt @@ -1,7 +1,7 @@ -public open class Identifier(myName : String?, myHasDollar : Boolean) { +public open class Identifier(_myName : String?, _myHasDollar : Boolean) { { -$myName = myName -$myHasDollar = myHasDollar +myName = _myName +myHasDollar = _myHasDollar } private val myName : String? = null private var myHasDollar : Boolean = false diff --git a/testData/ast/constructors/file/withManyDefaultParams.kt b/testData/ast/constructors/file/withManyDefaultParams.kt index 60b8812a882..c18bb2aeeaf 100644 --- a/testData/ast/constructors/file/withManyDefaultParams.kt +++ b/testData/ast/constructors/file/withManyDefaultParams.kt @@ -1,13 +1,13 @@ -public open class Test(myName : String?, a : Boolean, b : Double, c : Float, d : Long, e : Int, f : Short, g : Char) { +public open class Test(_myName : String?, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) { { -$myName = myName -$a = a -$b = b -$c = c -$d = d -$e = e -$f = f -$g = g +myName = _myName +a = _a +b = _b +c = _c +d = _d +e = _e +f = _f +g = _g } private val myName : String? = null private var a : Boolean = false diff --git a/testData/ast/enum/class/colorEnum.kt b/testData/ast/enum/class/colorEnum.kt index 15a5f6f6892..694128a9518 100644 --- a/testData/ast/enum/class/colorEnum.kt +++ b/testData/ast/enum/class/colorEnum.kt @@ -1,7 +1,7 @@ namespace demo enum class MyEnum(_color : Int) { { -$color = _color +color = _color } RED : MyEnum(10) BLUE : MyEnum(20) diff --git a/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt index 91a687dd847..1795c0b93c4 100644 --- a/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt +++ b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt @@ -1,6 +1,6 @@ enum class Color(c : Int) { { -$code = c +code = c } WHITE : Color(21) BLACK : Color(22) diff --git a/testData/ast/enum/class/primaryPrivateConstructor.kt b/testData/ast/enum/class/primaryPrivateConstructor.kt index 37889843d8b..d869ad519c1 100644 --- a/testData/ast/enum/class/primaryPrivateConstructor.kt +++ b/testData/ast/enum/class/primaryPrivateConstructor.kt @@ -1,7 +1,7 @@ namespace demo enum class Color(c : Int) { { -$code = c +code = c } private var code : Int = 0 public fun getCode() : Int { diff --git a/testData/ast/identifier/file/finalFieldReference.kt b/testData/ast/identifier/file/finalFieldReference.kt index fca7102759a..1d7011e3e3b 100644 --- a/testData/ast/identifier/file/finalFieldReference.kt +++ b/testData/ast/identifier/file/finalFieldReference.kt @@ -4,7 +4,7 @@ open class `$`() { } open class `$$`(`$$$$` : `$$$$$`?) : `$`() { { -$`$$$` = `$$$$` +`$$$` = `$$$$` } val `$$$` : `$$$$$`? = null open public fun `$$$$$$`() : `$$$$$`? { diff --git a/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt b/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt index 640e5926e8f..51aa2aaea5e 100644 --- a/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt +++ b/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt @@ -2,7 +2,7 @@ open class Base(name : T?) { } open class One(name : T?, second : K?) : Base(name) { { -$mySecond = second +mySecond = second } private var mySecond : K? = null } \ No newline at end of file diff --git a/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index 37882b3a963..34975018246 100644 --- a/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -2,7 +2,7 @@ open class Base(name : String?) { } open class One(name : String?, second : String?) : Base(name) { { -$mySecond = second +mySecond = second } private var mySecond : String? = null } \ No newline at end of file diff --git a/testData/ast/issues/file/kt-836.kt b/testData/ast/issues/file/kt-836.kt index 3a73a7a4d52..e80ed065e8a 100644 --- a/testData/ast/issues/file/kt-836.kt +++ b/testData/ast/issues/file/kt-836.kt @@ -2,7 +2,7 @@ namespace com.voltvoodoo.saplo4j.model import java.io.Serializable public open class Language(code : String?) : Serializable { { -this.$code = code +this.code = code } protected var code : String? = null override public fun toString() : String? { diff --git a/testData/ast/issues/file/kt-837.kt b/testData/ast/issues/file/kt-837.kt index 17e9e95c040..c2040e45d81 100644 --- a/testData/ast/issues/file/kt-837.kt +++ b/testData/ast/issues/file/kt-837.kt @@ -2,7 +2,7 @@ namespace com.voltvoodoo.saplo4j.model import java.io.Serializable public open class Language(code : String?) : Serializable { { -this.$code = code +this.code = code } protected var code : String? = null open public fun equals(other : Language?) : Boolean {