#343 Closure var dumps, #350 Allow a trailing comma in function calls.

Author: dim-s

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

@@ -1238,7 +1238,7 @@ else if (!additional.isEmpty())
             }
 
             writePushEnv();
-            writePushParameters(function.getParameters(), additional.toArray(new Memory[0]));
+            writePushParameters(function.getParameters(), additional.toArray(Memory.CONST_EMPTY_ARRAY));
             writeSysStaticCall(
                     compileClass.getNativeClass(),
                     methodEntity.getName(),

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

@@ -464,7 +464,11 @@ protected CallExprToken processCall(Token previous, Token current, ListIterator<
                 }
             }
 
-            if (isClosedBrace(nextToken(iterator), SIMPLE)) {
+            Token tk = nextToken(iterator);
+            if (isClosedBrace(tk, SIMPLE)) {
+                break;
+            } else if (param == null && tk instanceof CommaToken) {
+                nextToken(iterator);
                 break;
             }
 

jphp-core/tests/resources/closures/simple.php

@@ -9,7 +9,7 @@
     return $i + $external;
 };
 
-if ($func1(2) !== 3)
+if ($func1(2,) !== 3)
     return 'fail_1';
 
 if ($func2(2) !== 4)

jphp-core/tests/resources/unset/complex.php

@@ -4,7 +4,7 @@
 $y = array('x' => new stdClass());
 $y['x']->prop = 'fail';
 
-unset($x, $y['x']->prop);
+unset($x, $y['x']->prop,);
 
 $foobar = 'foobar';
 unset(${'foobar'});

jphp-core/tests/resources/unset/object_value.php

@@ -5,6 +5,6 @@
 $obj->y = 'fail';
 $obj->z = 'fail';
 
-unset($obj->y, $obj->z);
+unset($obj->y, $obj->z,);
 
 return $obj->x . $obj->y . $obj->z;

jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionMethod.java

@@ -200,7 +200,7 @@ public Memory setAccessible(Environment env, Memory... args){
     public Memory invoke(Environment env, Memory... args) throws Throwable {
         Memory self = args[0];
 
-        Memory[] arguments = args.length == 1 ? new Memory[0] : Arrays.copyOfRange(args, 1, args.length - 1);
+        Memory[] arguments = args.length == 1 ? Memory.CONST_EMPTY_ARRAY : Arrays.copyOfRange(args, 1, args.length - 1);
         Invoker invoker;
 
         if (self.isNull()) {

jphp-runtime/src/php/runtime/lang/Closure.java

@@ -55,7 +55,7 @@ public Closure(Environment env, ClassEntity closure, Memory self, String scope,
     abstract public Memory __invoke(Environment env, Memory... args) throws Throwable;
 
     public Memory[] getUses() {
-        return uses == null ? new Memory[0] : uses;
+        return uses == null ? Memory.CONST_EMPTY_ARRAY : uses;
     }
 
     @Signature({@Arg("prop"), @Arg("value")})
@@ -139,6 +139,10 @@ public Memory bindTo(Environment env, Memory... args) throws CloneNotSupportedEx
     public Memory __debugInfo(Environment env, Memory... args) {
         ArrayMemory r = new ArrayMemory();
 
+        if (uses != null && uses.length > 0) {
+            r.put("uses", ArrayMemory.of(uses));
+        }
+
         if (self.isNotNull()) {
             r.put("this", self.toImmutable());
         }
@@ -177,7 +181,7 @@ public ClosureInvoker(Environment env, ClassEntity clazz) {
         }
 
         public ClosureInvoker(Environment env, Invoker invoker) {
-            super(env, env.fetchClass(ClosureInvoker.class), Memory.NULL, "", new Memory[0]);
+            super(env, env.fetchClass(ClosureInvoker.class), Memory.NULL, "", Memory.CONST_EMPTY_ARRAY);
             this.invoker = invoker;
         }
 

jphp-runtime/src/php/runtime/reflection/FunctionEntity.java

@@ -122,7 +122,7 @@ public Closure getClosure(Environment env) {
         closureEntity1.addMethod(m, null);
         closureEntity1.doneDeclare();
 
-        Closure tmp = new Closure(env, closureEntity1, new ObjectMemory(env.getLateObject()), null, new Memory[0]){
+        Closure tmp = new Closure(env, closureEntity1, new ObjectMemory(env.getLateObject()), null, Memory.CONST_EMPTY_ARRAY){
             @Override
             public Memory __invoke(Environment e, Memory... args) {
                 try {

jphp-runtime/src/php/runtime/reflection/MethodEntity.java

@@ -143,7 +143,7 @@ public Closure getClosure(Environment env, final IObject object) {
         closureEntity1.addMethod(m, null);
         closureEntity1.doneDeclare();
 
-        Closure tmp = new Closure(env, closureEntity1, new ObjectMemory(env.getLateObject()), clazz.getName(), new Memory[0]){
+        Closure tmp = new Closure(env, closureEntity1, new ObjectMemory(env.getLateObject()), clazz.getName(), Memory.CONST_EMPTY_ARRAY){
             @Override
             public Memory __invoke(Environment e, Memory... args) {
                 try {

jphp-runtime/src/php/runtime/reflection/helper/GeneratorEntity.java

@@ -67,13 +67,11 @@ public boolean equals(Object o) {
     public IObject newObjectWithoutConstruct(Environment env) {
         IObject object;
         try {
-            object = (IObject) nativeConstructor.newInstance(env, this, env.getLateObject(), new Memory[0]);
+            object = (IObject) nativeConstructor.newInstance(env, this, env.getLateObject(), Memory.CONST_EMPTY_ARRAY);
         } catch (InvocationTargetException e){
             env.__throwException(e);
             return null;
-        } catch (InstantiationException e) {
-            throw new CriticalException(e);
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             throw new CriticalException(e);
         }
         return object;