Adjust to current version of RFC using clone(<expr>, $properties)

Author: thekid

src/main/php/lang/ast/emit/PHP.class.php

@@ -1083,16 +1083,9 @@ protected function emitNewClass($result, $new) {
   }
 
   protected function emitClone($result, $clone) {
-    $result->out->write('clone ');
-    if (empty($clone->with)) {
-      $this->emitOne($result, $clone->expression);
-    } else {
-      $result->out->write('(');
-      $this->emitOne($result, $clone->expression);
-      $result->out->write(',');
-      $this->emitArguments($result, $clone->with);
-      $result->out->write(')');
-    }
+    $result->out->write('clone(');
+    $this->emitArguments($result, $clone->arguments);
+    $result->out->write(')');
   }
 
   protected function emitCallable($result, $callable) {

src/main/php/lang/ast/emit/RewriteCloneWith.class.php

@@ -6,27 +6,28 @@
 trait RewriteCloneWith {
 
   protected function emitClone($result, $clone) {
-    if (empty($clone->with)) return parent::emitClone($result, $clone);
+    $expr= $clone->arguments['object'] ?? $clone->arguments[0] ?? null;
+    $with= $clone->arguments['withProperties'] ?? $clone->arguments[1] ?? null;
 
-    // Wrap clone with, e.g. clone($x, id: 6100), inside an IIFE as follows:
+    // Wrap clone with, e.g. clone($x, ['id' => 6100]), inside an IIFE as follows:
     // `function($args) { $this->id= $args['id']; return $this; }`, then bind
     // this closure to the cloned instance before invoking it with the named
     // arguments so we can access non-public members.
-    $t= $result->temp();
-    $result->out->write('('.$t.'=clone ');
-    $this->emitOne($result, $clone->expression);
+    if ($with) {
+      $c= $result->temp();
+      $a= $result->temp();
 
-    $result->out->write(')?(function($a) {');
-    foreach ($clone->with as $name => $argument) {
-      $result->out->write('$this->'.$name.'=$a["'.$name.'"];');
+      $result->out->write('['.$c.'=clone ');
+      $this->emitOne($result, $expr);
+      $result->out->write(','.$a.'=');
+      $this->emitOne($result, $with);
+      $result->out->write(']?(function($a) { foreach ($a as $p=>$v) { $this->$p= $v; }return $this;})');
+      $result->out->write('->bindTo('.$c.','.$c.')('.$a.'):null');
+    } else if (isset($clone->arguments['object'])) {
+      $result->out->write('clone ');
+      $this->emitOne($result, $expr);
+    } else {
+      return parent::emitClone($result, $clone);
     }
-
-    $result->out->write('return $this;})->bindTo('.$t.','.$t.')([');
-    foreach ($clone->with as $name => $argument) {
-      $result->out->write('"'.$name.'"=>');
-      $this->emitOne($result, $argument);
-      $result->out->write(',');
-    }
-    $result->out->write(']):null');
   }
 }