Simplify implementation

Author: thekid

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

@@ -9,20 +9,14 @@ protected function 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:
-    // `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.
+    // Wrap clone with, e.g. clone($x, ['id' => 6100]), inside an IIFE which
+    /// iterates over the property-value pairs, assigning them to the clone.
     if ($with) {
-      $c= $result->temp();
-      $a= $result->temp();
-
-      $result->out->write('['.$c.'=clone ');
+      $result->out->write('(function($c, $a) { foreach ($a as $p=>$v) { $c->$p= $v; } return $c;})(clone ');
       $this->emitOne($result, $expr);
-      $result->out->write(','.$a.'=');
+      $result->out->write(',');
       $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');
+      $result->out->write(')');
     } else if (isset($clone->arguments['object'])) {
       $result->out->write('clone ');
       $this->emitOne($result, $expr);

src/test/php/lang/ast/unittest/emit/CloningTest.class.php

@@ -1,6 +1,7 @@
 <?php namespace lang\ast\unittest\emit;
 
-use test\{Assert, Before, Test, Values};
+use lang\Error;
+use test\{Assert, Before, Ignore, Test, Values};
 
 /** @see https://www.php.net/manual/en/language.oop5.cloning.php */
 class CloningTest extends EmittingTest {
@@ -17,8 +18,8 @@ private function arguments() {
   #[Before]
   public function fixture() {
     $this->fixture= new class() {
-      private $id= 1;
-      private $name= 'Test';
+      public $id= 1;
+      public $name= 'Test';
 
       public function toString() {
         return "<id: {$this->id}, name: {$this->name}>";
@@ -97,4 +98,15 @@ public function run($in) {
       [$this->fixture->toString(), $clone->toString()]
     );
   }
+
+  #[Test, Ignore('Could be done with reflection but with significant performance cost')]
+  public function clone_with_respects_visibility() {
+    $base= $this->type('class %T { private $id= 1; }');
+
+    Assert::throws(Error::class, fn() => $this->run('class %T extends '.$base.' {
+      public function run() {
+        clone($this, ["id" => 6100]); // Tries to set private member from base
+      }
+    }'));
+  }
 }