Fixed parsing of "func()[0]"

Author: bjansen

.idea/compiler.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.plopiplop.leekwars</id>
     <name>LeekScript</name>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <vendor>bjansen</vendor>
 
     <description><![CDATA[

gen/com/plopiplop/leekwars/parser/LeekScriptParser.java

@@ -174,10 +174,10 @@ left suffixExpression ::= ('--' | '++')
 
 functionExpression ::= 'function' '(' formalParameterList? ')' block {pin=1}
 
-private leftHandSideExpression ::= methodCall | memberExpression
+private leftHandSideExpression ::= memberExpression
 
 methodCall ::= referenceExpression arguments {methods=[getNbArguments]}
-memberExpression ::= (primaryExpression | functionExpression) ('[' singleExpression ']')*
+private memberExpression ::= (methodCall | primaryExpression | functionExpression) ('[' singleExpression ']')*
 primaryExpression ::= referenceExpression | literal | arrayLiteral | '(' singleExpression ')'
 
 eos ::= ';'

gen/com/plopiplop/leekwars/psi/LSMemberExpression.java

@@ -12,6 +12,10 @@ public void testExpressions() {
         doTest(true);
     }
 
+    public void testMethodCall() {
+        doTest(true);
+    }
+
     @Override
     protected String getTestDataPath() {
         return "testdata/parser";

gen/com/plopiplop/leekwars/psi/LSPrefixExpression.java

@@ -7,35 +7,31 @@ LeekScript Expressions.lks
       LSLogicOrExpressionImpl(LOGIC_OR_EXPRESSION)
         LSCompareExpressionImpl(COMPARE_EXPRESSION)
           LSPrefixExpressionImpl(PREFIX_EXPRESSION)
-            LSMemberExpressionImpl(MEMBER_EXPRESSION)
-              LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
-                LSLiteralImpl(LITERAL)
-                  PsiElement(true)('true')
+            LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
+              LSLiteralImpl(LITERAL)
+                PsiElement(true)('true')
           PsiWhiteSpace(' ')
           PsiElement(==)('==')
           PsiWhiteSpace(' ')
           LSPrefixExpressionImpl(PREFIX_EXPRESSION)
-            LSMemberExpressionImpl(MEMBER_EXPRESSION)
-              LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
-                LSLiteralImpl(LITERAL)
-                  PsiElement(number)('1')
+            LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
+              LSLiteralImpl(LITERAL)
+                PsiElement(number)('1')
         PsiWhiteSpace(' ')
         PsiElement(||)('||')
         PsiWhiteSpace(' ')
         LSCompareExpressionImpl(COMPARE_EXPRESSION)
           LSPrefixExpressionImpl(PREFIX_EXPRESSION)
-            LSMemberExpressionImpl(MEMBER_EXPRESSION)
-              LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
-                LSLiteralImpl(LITERAL)
-                  PsiElement(false)('false')
+            LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
+              LSLiteralImpl(LITERAL)
+                PsiElement(false)('false')
           PsiWhiteSpace(' ')
           PsiElement(==)('==')
           PsiWhiteSpace(' ')
           LSPrefixExpressionImpl(PREFIX_EXPRESSION)
-            LSMemberExpressionImpl(MEMBER_EXPRESSION)
-              LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
-                LSLiteralImpl(LITERAL)
-                  PsiElement(number)('2')
+            LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
+              LSLiteralImpl(LITERAL)
+                PsiElement(number)('2')
     PsiElement())(')')
     PsiWhiteSpace(' ')
     LSThenBlockImpl(THEN_BLOCK)

gen/com/plopiplop/leekwars/psi/LSSuffixExpression.java

@@ -0,0 +1 @@
+var plop = coin()[0];

gen/com/plopiplop/leekwars/psi/LSTypes.java

@@ -0,0 +1,28 @@
+LeekScript MethodCall.lks
+  LSVariableStatementImpl(VARIABLE_STATEMENT)
+    LSModifierImpl(MODIFIER)
+      PsiElement(var)('var')
+    PsiWhiteSpace(' ')
+    LSVariableDeclarationImpl(VARIABLE_DECLARATION)
+      PsiElement(identifier)('plop')
+      PsiWhiteSpace(' ')
+      LSInitialiserImpl(INITIALISER)
+        PsiElement(=)('=')
+        PsiWhiteSpace(' ')
+        LSSingleExpressionImpl(SINGLE_EXPRESSION)
+          LSPrefixExpressionImpl(PREFIX_EXPRESSION)
+            LSMethodCallImpl(METHOD_CALL)
+              LSReferenceExpressionImpl(REFERENCE_EXPRESSION)
+                PsiElement(identifier)('coin')
+              LSArgumentsImpl(ARGUMENTS)
+                PsiElement(()('(')
+                PsiElement())(')')
+            PsiElement([)('[')
+            LSSingleExpressionImpl(SINGLE_EXPRESSION)
+              LSPrefixExpressionImpl(PREFIX_EXPRESSION)
+                LSPrimaryExpressionImpl(PRIMARY_EXPRESSION)
+                  LSLiteralImpl(LITERAL)
+                    PsiElement(number)('0')
+            PsiElement(])(']')
+    LSEosImpl(EOS)
+      PsiElement(;)(';')