remove dollar usages from the whole project

src/org/jetbrains/jet/j2k/Converter.java

@@ -115,7 +115,8 @@ public class Converter {
   @NotNull
   private static List<Parameter> createParametersFromFields(@NotNull List<? extends Field> fields) {
     List<Parameter> result = new LinkedList<Parameter>();
-    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<Statement> result = new LinkedList<Statement>();
     for (Field f : fields) {
       final String identifierToKotlin = f.getIdentifier().toKotlin();
-      result.add(new DummyStringExpression("$" + identifierToKotlin + " = " + identifierToKotlin));
+      result.add(new DummyStringExpression(identifierToKotlin + " = " + "_" + identifierToKotlin));
     }
     return result;
   }

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();
 }

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();
   }
 }

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 = "?";

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)
+    final String temporaryObject = "__";
-      identifier = new IdentifierImpl(expression.getReferenceName(), hasDollar, isNullable);
+    if (hasReceiver)
-    else {
+      identifier = new CallChainExpression(new IdentifierImpl(temporaryObject, false), new IdentifierImpl(expression.getReferenceName(), isNullable));
-      final String temporaryObject = "__";
+    else if (insideSecondaryConstructor && isThis)
-      if (hasReceiver)
+      identifier = new IdentifierImpl("val " + temporaryObject + " = " + className); // TODO: hack
-        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()),

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 {

testData/ast/constructors/file/allCallsPrimary2.kt

@@ -1,8 +1,8 @@
 open class C(arg1 : Int) {
 {
-$myArg1 = arg1
+myArg1 = arg1
-$myArg2 = 0
+myArg2 = 0
-$myArg3 = 0
+myArg3 = 0
 }
 val myArg1 : Int = 0
 var myArg2 : Int = 0

testData/ast/constructors/file/customerBuilder.kt

@@ -2,8 +2,8 @@ namespace org.test.customer
 open class Customer(first : String?, last : String?) {
 {
 doSmthBefore()
-$_firstName = first
+_firstName = first
-$_lastName = last
+_lastName = last
 doSmthAfter()
 }
 public val _firstName : String? = null

testData/ast/constructors/file/genericIdentifier.kt

@@ -1,7 +1,7 @@
-public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
+public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
 {
-$myName = myName
+myName = _myName
-$myHasDollar = myHasDollar
+myHasDollar = _myHasDollar
 }
 private val myName : T? = null
 private var myHasDollar : Boolean = false

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
+myName = _myName
-$myHasDollar = myHasDollar
+myHasDollar = _myHasDollar
 }
 private val myName : String? = null
 private var myHasDollar : Boolean = false

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
+myName = _myName
-$a = a
+a = _a
-$b = b
+b = _b
-$c = c
+c = _c
-$d = d
+d = _d
-$e = e
+e = _e
-$f = f
+f = _f
-$g = g
+g = _g
 }
 private val myName : String? = null
 private var a : Boolean = false

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)

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)

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 {

testData/ast/identifier/file/finalFieldReference.kt

@@ -4,7 +4,7 @@ open class `$`() {
 }
 open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
 {
-$`$$$` = `$$$$`
+`$$$` = `$$$$`
 }
 val `$$$` : `$$$$$`? = null
 open public fun `$$$$$$`() : `$$$$$`? {

testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt

@@ -2,7 +2,7 @@ open class Base<T>(name : T?) {
 }
 open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
 {
-$mySecond = second
+mySecond = second
 }
 private var mySecond : K? = null
 }

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
 }

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? {

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 {