#343: Arrow Functions, add static and return refs.

dim-s · dim-s · commit fd10dd76cc51 · 2020-02-24T14:06:40.000+03:00
diff --git a/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/expr/value/ClosureValueCompiler.java b/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/expr/value/ClosureValueCompiler.java
@@ -86,6 +86,11 @@ public void write(ClosureStmtToken closure, boolean returnValue) {
         if (returnValue){
             ClosureEntity entity = compiler.getModule().findClosure( closure.getId() );
             boolean thisExists = closure.getFunction().isThisExists();
+
+            if (closure.isStatic()) {
+                thisExists = false;
+            }
+
             boolean staticExists = closure.getFunction().isStaticExists();
 
             if (closure.getFunction().getUses().isEmpty() && !thisExists && !staticExists
diff --git a/jphp-core/src/org/develnext/jphp/core/syntax/generators/LambdaGenerator.java b/jphp-core/src/org/develnext/jphp/core/syntax/generators/LambdaGenerator.java
@@ -6,6 +6,7 @@
 import org.develnext.jphp.core.syntax.generators.manually.SimpleExprGenerator;
 import org.develnext.jphp.core.tokenizer.token.Token;
 import org.develnext.jphp.core.tokenizer.token.expr.BraceExprToken;
+import org.develnext.jphp.core.tokenizer.token.expr.operator.AmpersandRefToken;
 import org.develnext.jphp.core.tokenizer.token.expr.operator.KeyValueExprToken;
 import org.develnext.jphp.core.tokenizer.token.expr.value.VariableExprToken;
 import org.develnext.jphp.core.tokenizer.token.stmt.*;
@@ -72,6 +73,13 @@ public LambdaStmtToken getToken(Token current, ListIterator<Token> iterator, Sep
 
             nextToken(iterator);
 
+            Token tk = nextToken(iterator);
+            if (tk instanceof AmpersandRefToken) {
+                func.setReturnReference(true);
+            } else {
+                prevToken(iterator);
+            }
+
             processArguments(func, iterator);
             nextAndExpected(iterator, KeyValueExprToken.class);
             processBody(func, iterator, separator, braceKind);
diff --git a/jphp-core/src/org/develnext/jphp/core/syntax/generators/manually/SimpleExprGenerator.java b/jphp-core/src/org/develnext/jphp/core/syntax/generators/manually/SimpleExprGenerator.java
@@ -62,13 +62,14 @@ public boolean isSingleton() {
         return false;
     }
 
-    protected Token processLambda(Token current, ListIterator<Token> iterator, Separator separator, BraceExprToken.Kind braceKind) {
+    protected Token processLambda(Token current, ListIterator<Token> iterator, Separator separator, BraceExprToken.Kind braceKind, boolean isStatic) {
         LambdaStmtToken token = analyzer.generator(LambdaGenerator.class).getToken(current, iterator, separator, braceKind);
 
         ClosureStmtToken closureStmtToken = new ClosureStmtToken(current.getMeta());
         closureStmtToken.setFunction(token.getFunction());
         closureStmtToken.setOwnerClass(analyzer.getClazz());
         closureStmtToken.setParentFunction(token.getParentFunction());
+        closureStmtToken.setStatic(isStatic);
         analyzer.registerClosure(closureStmtToken);
 
         return closureStmtToken;
@@ -1488,8 +1489,12 @@ else if (previous instanceof StaticAccessExprToken){
             } else if (current instanceof FunctionStmtToken) {
                 current = processClosure(current, next, iterator);
                 tokens.add(current);
+            } else if (current instanceof StaticExprToken && nextTokenAndPrev(iterator) instanceof LambdaStmtToken) {
+                current = nextToken(iterator);
+                current = processLambda(current, iterator, separator, closedBraceKind, true);
+                tokens.add(current);
             } else if (current instanceof LambdaStmtToken) {
-                current = processLambda(current, iterator, separator, closedBraceKind);
+                current = processLambda(current, iterator, separator, closedBraceKind, false);
                 tokens.add(current);
             } else if (current instanceof ListExprToken && isOpenedBrace(next, SIMPLE)){
                 current = processList(current, iterator, null, closedBraceKind, braceOpened);
diff --git a/jphp-core/src/org/develnext/jphp/core/tokenizer/token/expr/value/ClosureStmtToken.java b/jphp-core/src/org/develnext/jphp/core/tokenizer/token/expr/value/ClosureStmtToken.java
@@ -11,6 +11,7 @@ public class ClosureStmtToken extends ValueExprToken {
     protected FunctionStmtToken parentFunction;
     protected ClassStmtToken ownerClass;
     protected int id;
+    protected boolean _static;
 
     public ClosureStmtToken(TokenMeta meta) {
         super(meta, TokenType.T_J_CUSTOM);
@@ -32,6 +33,14 @@ public void setId(int id) {
         this.id = id;
     }
 
+    public boolean isStatic() {
+        return _static;
+    }
+
+    public void setStatic(boolean _static) {
+        this._static = _static;
+    }
+
     public ClassStmtToken getOwnerClass() {
         return ownerClass;
     }
diff --git a/jphp-core/tests/resources/lambdas/lambda_this_001.php b/jphp-core/tests/resources/lambdas/lambda_this_001.php
@@ -1,7 +1,7 @@
 <?php
+$GLOBALS['x'] = 20;
 
 class Test {
-
     function make(): Closure
     {
         return fn() => $this;
@@ -11,6 +11,16 @@ function make2(): Closure
     {
         return fn() => fn() => $this;
     }
+
+    function make3(): Closure
+    {
+        return static fn() => $this;
+    }
+
+    function make4(): Closure
+    {
+        return fn&() => $GLOBALS['x'];
+    }
 }
 
 $test = new Test();
@@ -27,4 +37,17 @@ function make2(): Closure
     return "fail_2";
 }
 
+$lambda = $test->make3();
+if ($lambda() !== null) {
+    return "fail_3";
+}
+
+$lambda = $test->make4();
+$x = $lambda();
+$x = 40;
+if ($GLOBALS['x'] !== 40) {
+    return "fail_4";
+}
+
+
 return "success";
diff --git a/jphp-runtime/src/php/runtime/lang/Closure.java b/jphp-runtime/src/php/runtime/lang/Closure.java
@@ -135,6 +135,17 @@ public Memory bindTo(Environment env, Memory... args) throws CloneNotSupportedEx
         return new ObjectMemory(newClosure);
     }
 
+    @Signature
+    public Memory __debugInfo(Environment env, Memory... args) {
+        ArrayMemory r = new ArrayMemory();
+
+        if (self.isNotNull()) {
+            r.put("this", self.toImmutable());
+        }
+
+        return r;
+    }
+
     @Signature({
             @Arg(value = "closure", typeClass = "Closure"),
             @Arg(value = "newThis"),
diff --git a/jphp-runtime/src/php/runtime/memory/output/PrintR.java b/jphp-runtime/src/php/runtime/memory/output/PrintR.java
@@ -113,28 +113,6 @@ protected void writeObjectHeader(String name){
         printer.write(" Object\n");
     }
 
-    @Override
-    protected void printClosure(Closure closure, int level, Set<Integer> used) {
-        ClassEntity classEntity = closure.getReflection();
-
-        writeObjectHeader(Closure.class.getSimpleName());
-        if (used.contains(closure.getPointer())){
-            printer.write(" *RECURSION*");
-        } else {
-            printer.write(StringUtils.repeat(' ', level));
-            writeOpen();
-            level += PRINT_INDENT;
-
-            used.add(closure.getPointer());
-
-            level -= PRINT_INDENT;
-            printer.write(StringUtils.repeat(' ', level));
-            writeClose();
-
-            used.remove(closure.getPointer());
-        }
-    }
-
     @Override
     protected void printObject(ObjectMemory value, int level, Set<Integer> used) {
         ClassEntity classEntity = value.getReflection();
diff --git a/jphp-runtime/src/php/runtime/memory/output/Printer.java b/jphp-runtime/src/php/runtime/memory/output/Printer.java
@@ -33,7 +33,6 @@ public boolean isRecursionExists() {
     abstract protected void printString(StringMemory value);
     abstract protected void printArray(ArrayMemory value, int level, Set<Integer> used);
     abstract protected void printObject(ObjectMemory value, int level, Set<Integer> used);
-    abstract protected void printClosure(Closure value, int level, Set<Integer> used);
 
     protected void printReference(ReferenceMemory reference, int level, Set<Integer> used){
         Memory value = reference.toValue();
@@ -64,11 +63,7 @@ protected void print(Memory value, int level, Set<Integer> used){
                 printArray((ArrayMemory) value, level, used);
                 break;
             case OBJECT:
-                ObjectMemory tmp = (ObjectMemory)value;
-                if (tmp.value instanceof Closure)
-                    printClosure((Closure)tmp.value, level, used);
-                else
-                    printObject((ObjectMemory) value, level, used);
+                printObject((ObjectMemory) value, level, used);
                 break;
             case REFERENCE: printReference((ReferenceMemory)value, level, used); break;
             default:
diff --git a/jphp-runtime/src/php/runtime/memory/output/VarDump.java b/jphp-runtime/src/php/runtime/memory/output/VarDump.java
@@ -116,30 +116,6 @@ protected void printArray(ArrayMemory value, int level, Set<Integer> used) {
         }
     }
 
-    @Override
-    protected void printClosure(Closure closure, int level, Set<Integer> used) {
-        ClassEntity classEntity = closure.getReflection();
-
-        if (used.contains(closure.getPointer())){
-            printer.write("*RECURSION*\n");
-        } else {
-            printer.write("object(");
-            printer.write(Closure.class.getSimpleName());
-            printer.write(")#" + closure.getPointer());
-            printer.write(" (" + closure.getUses().length + ") {\n");
-
-            level += PRINT_INDENT;
-
-            used.add(closure.getPointer());
-
-            level -= PRINT_INDENT;
-            printer.write(StringUtils.repeat(' ', level));
-            printer.write("}\n");
-
-            used.remove(closure.getPointer());
-        }
-    }
-
     @Override
     protected void printObject(ObjectMemory value, int level, Set<Integer> used) {
         ClassEntity classEntity = value.getReflection();
diff --git a/jphp-runtime/src/php/runtime/memory/output/VarExport.java b/jphp-runtime/src/php/runtime/memory/output/VarExport.java
@@ -139,9 +139,4 @@ protected void printObject(ObjectMemory value, int level, Set<Integer> used) {
             used.remove(value.getPointer());
         }
     }
-
-    @Override
-    protected void printClosure(Closure value, int level, Set<Integer> used) {
-        printObject(new ObjectMemory(value), level, used);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,4 @@ protected void printObject(ObjectMemory value, int level, Set<Integer> used) {`
`139`	`139`	`used.remove(value.getPointer());`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-`
`143`		`- @Override`
`144`		`- protected void printClosure(Closure value, int level, Set<Integer> used) {`
`145`		`- printObject(new ObjectMemory(value), level, used);`
`146`		`- }`
`147`	`142`	`}`