Fix two traits issues, #46 and call private methods from trait methods

src/main/groovy/org/grooscript/convert/Context.groovy

@@ -33,7 +33,7 @@ class Context {
     boolean addClosureSwitchInitialization = false
 
     boolean insideWith = false
-    String actualTraitMethodName
+    MethodNode actualTraitMethod
 
     //Prefix and postfix for variables without clear scope
     String prefixOperator = '', postfixOperator = ''

src/main/groovy/org/grooscript/convert/handlers/InnerClassNodeHandler.groovy

@@ -43,15 +43,15 @@ class InnerClassNodeHandler extends TraitBaseHandler {
             if (methodNode.name == '$static$init$') {
                 initStaticTraitFields(methodNode, innerClassNode)
             } else if (methodNode.code instanceof BlockStatement) {
-                context.actualTraitMethodName = methodNode.parameters[0].name
+                context.actualTraitMethod = methodNode
                 if (!methodNode.code.isEmpty() || methodNode.name == '$init$') {
                     functions.processBasicFunction("${className}.${methodNode.name}", methodNode, false)
                 } else {
                     if (functions.haveAnnotationNative(methodNode.annotations)) {
                         functions.putGsNativeMethod("${className}.${methodNode.name}", innerClassNode, methodNode)
                     }
                 }
-                context.actualTraitMethodName = null
+                context.actualTraitMethod = null
             } else {
                 if (methodNode.name.startsWith('get')) {
                     out.addScript("${className}.${methodNode.name} = function(\$self) {" +

src/main/groovy/org/grooscript/convert/handlers/MethodCallExpressionHandler.groovy

@@ -185,7 +185,16 @@ class MethodCallExpressionHandler extends BaseHandler {
     }
 
     private addParametersWithoutParenthesis(expression) {
-        conversionFactory.visitNode(expression.arguments, false)
+        def arguments = expression.arguments
+        if (context.actualTraitMethod && arguments?.getExpressions()) {
+            //Inside a trait method, we remove $self as first argument
+            def exp = arguments.getExpression(0)
+            if (exp instanceof VariableExpression && exp.variable == '$self' &&
+                    expression.methodAsString in context.actualTraitMethod.declaringClass.methods.collect { it.name }) {
+                arguments = new ArgumentListExpression(arguments.getExpressions().tail())
+            }
+        }
+        conversionFactory.visitNode(arguments, false)
     }
 
     private addParametersAsList(expression) {
@@ -240,8 +249,8 @@ class MethodCallExpressionHandler extends BaseHandler {
             if (conversionFactory.isThis(expression.objectExpression) && context.staticProcessNode) {
                 out.addScript(context.staticProcessNode.nameWithoutPackage)
             } else {
-                if (conversionFactory.isThis(expression.objectExpression) && context.actualTraitMethodName) {
-                    out.addScript(context.actualTraitMethodName)
+                if (conversionFactory.isThis(expression.objectExpression) && context.actualTraitMethod) {
+                    out.addScript(context.actualTraitMethod.parameters[0].name)
                 } else {
                     conversionFactory.visitNode(expression.objectExpression)
                 }
@@ -259,7 +268,7 @@ class MethodCallExpressionHandler extends BaseHandler {
         if (conversionFactory.isThis(expression.objectExpression) && !context.mainContext &&
                 context.insideClass && !context.currentVariableScopingHasMethod(methodName) &&
                 !context.staticProcessNode) {
-            out.addScript(", ${GS_OBJECT}")
+            out.addScript(", ${context.actualTraitMethod ? '$self' : GS_OBJECT}")
         }
         out.addScript(')')
     }

src/test/groovy/org/grooscript/convert/TestTraits.groovy

@@ -99,4 +99,9 @@ class TestTraits extends Specification {
         expect:
         convertAndEvaluate('traits/ObjectProperties')
     }
+
+    def 'using this in trait functions'() {
+        expect:
+        convertAndEvaluate('traits/UsingThis', true)
+    }
 }

src/test/resources/traits/UsingThis.groovy

@@ -0,0 +1,64 @@
+package traits
+
+/**
+ * Created by jorgefrancoleza on 5/6/15.
+ */
+trait Equal {
+
+    int number = 5
+
+    boolean equalProperties() {
+        def props = this.propertyList()
+        if (props.size() == 2) {
+            equalsTwo(*props)
+        } else if (props.size() == 3) {
+            this.equalsThree(*props)
+        } else {
+            throw new Exception()
+        }
+    }
+
+    boolean allNumberFive() {
+        propertyList().every {
+            it == this.number && it == this.getNumber() && it == number
+        }
+    }
+
+    private boolean equalsTwo(a, b) {
+        a == b && b == a
+    }
+
+    private boolean equalsThree(a, b, c) {
+        this.equalsTwo(a, b) && this.equalsTwo(b, c) && equalsTwo(c, a)
+    }
+}
+
+class MyTwoNumbers implements Equal {
+    def a = 5
+    def b = 5
+    def propertyList() {
+        [a, b]
+    }
+}
+
+class MyThreeNumbers implements Equal {
+    def a = 6
+    def b = 6
+    def c = 6
+
+    def propertyList() {
+        [a, b, c]
+    }
+}
+
+def myTwoNumbers = new MyTwoNumbers()
+assert myTwoNumbers.equalProperties()
+assert myTwoNumbers.allNumberFive()
+myTwoNumbers.a = 7
+assert !myTwoNumbers.equalProperties()
+assert !myTwoNumbers.allNumberFive()
+
+def myThreeNumbers = new MyThreeNumbers()
+assert myThreeNumbers.equalProperties()
+myThreeNumbers.c = 8
+assert !myThreeNumbers.equalProperties()