Fix #366, Fix #373: Cannot call in some cases. Syntax errors.

Author: dim-s

jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java

@@ -2111,7 +2111,7 @@ public void writeTickTrigger(Token token) {
     }
 
     public void writeTickTrigger(TraceInfo trace) {
-        if (compiler.getScope().isDebugMode() && method.getLocalVariable("~local") != null) {
+        if (/*compiler.getScope().isDebugMode() &&*/ method.getLocalVariable("~local") != null) {
             int line = trace.getStartLine();
 
             if (method.registerTickTrigger(line)) {
@@ -2805,7 +2805,8 @@ Memory writeUnaryOperator(OperatorExprToken operator, boolean returnValue, boole
             stackPush(o);
             writeArrayGet((ArrayGetExprToken) operator, returnValue);
         } else if (operator instanceof CallOperatorToken) {
-            stackPush(o);
+            writePush(o);
+            writePopBoxing();
 
             CallOperatorToken call = (CallOperatorToken) operator;
 

jphp-core/src/org/develnext/jphp/core/syntax/generators/ExprGenerator.java

@@ -2,6 +2,7 @@
 
 import org.develnext.jphp.core.compiler.common.ASMExpression;
 import org.develnext.jphp.core.tokenizer.token.expr.*;
+import org.develnext.jphp.core.tokenizer.token.expr.BraceExprToken.Kind;
 import php.runtime.common.Messages;
 import org.develnext.jphp.core.common.Separator;
 import php.runtime.exceptions.FatalException;
@@ -20,6 +21,7 @@
 import java.util.ListIterator;
 
 import static org.develnext.jphp.core.tokenizer.token.expr.BraceExprToken.Kind.ARRAY;
+import static org.develnext.jphp.core.tokenizer.token.expr.BraceExprToken.Kind.SIMPLE;
 
 public class ExprGenerator extends Generator<ExprStmtToken> {
 
@@ -569,8 +571,12 @@ public void processEcho(EchoStmtToken result, ListIterator<Token> iterator){
     }
 
     protected List<Token> processSimpleExpr(Token current, ListIterator<Token> iterator){
+        Kind closedBraceKind = null;
+        if (isOpenedBrace(current, SIMPLE)) closedBraceKind = SIMPLE;
+        else if (isOpenedBrace(current, ARRAY)) closedBraceKind = ARRAY;
+
         ExprStmtToken token = analyzer.generator(SimpleExprGenerator.class)
-                .getToken(current, iterator, Separator.SEMICOLON, null);
+                .getToken(current, iterator, Separator.SEMICOLON, closedBraceKind);
         return token.getTokens();
     }
 

jphp-core/src/org/develnext/jphp/core/syntax/generators/manually/SimpleExprGenerator.java

@@ -1410,7 +1410,7 @@ public ExprStmtToken getToken(Token current, ListIterator<Token> iterator,
 
             if (isOpenedBrace(current, SIMPLE)){
                 boolean isFunc = false;
-                if (previous instanceof NameToken && previous.getMeta().getWord().equalsIgnoreCase("array")){
+                if (previous instanceof NameToken && "array".equalsIgnoreCase(previous.getMeta().getWord())){
                     iterator.previous();
                     tokens.set(tokens.size() - 1, current = processNewArray(previous, iterator));
                 } else {
@@ -1424,6 +1424,8 @@ else if (previous instanceof StaticAccessExprToken){
                         isFunc = true; // !((StaticAccessExprToken)previous).isGetStaticField(); TODO check it!
                     } else if (previous instanceof DynamicAccessExprToken){
                         isFunc = true;
+                    } else if (isClosedBrace(previous, SIMPLE)) {
+                        isFunc = true;
                     }
 
                     if (isFunc){

jphp-core/tests/org/develnext/jphp/core/compiler/jvm/SyntaxTest.java

@@ -0,0 +1,19 @@
+package org.develnext.jphp.core.compiler.jvm;
+
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.runners.MethodSorters;
+import php.runtime.Memory;
+
+@RunWith(JUnit4.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SyntaxTest extends JvmCompilerCase {
+
+    @Test
+    public void testDynamicCall() {
+        check("syntax/dynamic_call.phpt", true);
+    }
+}

jphp-core/tests/org/develnext/jphp/core/syntax/SyntaxAnalyzerTest.java

@@ -33,4 +33,5 @@ public void testUnexpectedEnd() throws IOException {
         environment.scope.setLangMode(LangMode.DEFAULT);
         new SyntaxAnalyzer(environment, tokenizer);
     }
+
 }

jphp-core/tests/resources/syntax/dynamic_call.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Test dynamic call syntax
+--FILE--
+<?php
+function test($x) {
+    var_dump($x);
+}
+
+('test')("foo");
+
+$v = 'st';
+("te$v")("bar");
+
+(fn() => var_dump(222))();
+(function() { var_dump(333); })();
+([fn() => var_dump(444)][0])();
+
+$b = function ($a) { var_dump($a); };
+($a ?? $b)('magic');
+
+$b = function ($a) { var_dump($a); };
+($a ?? $b)('magic', 'param');
+
+(function () { echo 'a'; })();
+?>
+--EXPECT--
+string(3) "foo"
+string(3) "bar"
+int(222)
+int(333)
+int(444)
+string(5) "magic"
+string(5) "magic"
+a