Merge pull request #45 from xp-framework/feature/property-hooks

Implement property hooks syntax
xp-framework · Jun 15, 2024 · 5003111 · 5003111
2 parents f5cc405 + 6bfe8c0
commit 5003111
Show file tree

Hide file tree

Showing 41 changed files with 234 additions and 75 deletions.
diff --git a/src/main/php/lang/ast/nodes/Annotations.class.php b/src/main/php/lang/ast/nodes/Annotations.class.php
@@ -70,8 +70,8 @@ public function getIterator(): Traversable {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->named as $annotation) {
+  public function &children() {
+    foreach ($this->named as &$annotation) {
       yield $annotation;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/ArrayLiteral.class.php b/src/main/php/lang/ast/nodes/ArrayLiteral.class.php
@@ -17,8 +17,8 @@ public function __construct($values, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->values as $pair) {
+  public function &children() {
+    foreach ($this->values as &$pair) {
       if (null !== $pair[0]) yield $pair[0];
       yield $pair[1];
     }

diff --git a/src/main/php/lang/ast/nodes/Assignment.class.php b/src/main/php/lang/ast/nodes/Assignment.class.php
@@ -14,5 +14,5 @@ public function __construct($variable, $operator, $expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->variable, $this->expression]; }
+  public function children() { return [&$this->variable, &$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/BinaryExpression.class.php b/src/main/php/lang/ast/nodes/BinaryExpression.class.php
@@ -14,6 +14,6 @@ public function __construct($left, $operator, $right, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->left, $this->right]; }
+  public function children() { return [&$this->left, &$this->right]; }
 
 }
diff --git a/src/main/php/lang/ast/nodes/Braced.class.php b/src/main/php/lang/ast/nodes/Braced.class.php
@@ -12,5 +12,5 @@ public function __construct($expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/BreakStatement.class.php b/src/main/php/lang/ast/nodes/BreakStatement.class.php
@@ -12,5 +12,5 @@ public function __construct($expression= null, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return $this->expression ? [$this->expression] : []; }
+  public function children() { return $this->expression ? [&$this->expression] : []; }
 }
diff --git a/src/main/php/lang/ast/nodes/CallableExpression.class.php b/src/main/php/lang/ast/nodes/CallableExpression.class.php
@@ -12,5 +12,5 @@ public function __construct($expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/CallableNewExpression.class.php b/src/main/php/lang/ast/nodes/CallableNewExpression.class.php
@@ -12,5 +12,5 @@ public function __construct($type, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->type]; }
+  public function children() { return [&$this->type]; }
 }
diff --git a/src/main/php/lang/ast/nodes/CaseLabel.class.php b/src/main/php/lang/ast/nodes/CaseLabel.class.php
@@ -18,11 +18,11 @@ public function __construct($expression, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     if (null !== $this->expression) {
       yield $this->expression;
     }
-    foreach ($this->body as $node) {
+    foreach ($this->body as &$node) {
       yield $node;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/CastExpression.class.php b/src/main/php/lang/ast/nodes/CastExpression.class.php
@@ -13,5 +13,5 @@ public function __construct($type, $expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/CatchStatement.class.php b/src/main/php/lang/ast/nodes/CatchStatement.class.php
@@ -18,9 +18,5 @@ public function __construct($types, $variable, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->body as $element) {
-      yield $element;
-    }
-  }
+  public function children() { return $this->body; }
 }
diff --git a/src/main/php/lang/ast/nodes/ContinueStatement.class.php b/src/main/php/lang/ast/nodes/ContinueStatement.class.php
@@ -12,7 +12,5 @@ public function __construct($expression= null, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    return $this->expression ? [$this->expression] : [];
-  }
+  public function children() { return $this->expression ? [&$this->expression] : []; }
 }
diff --git a/src/main/php/lang/ast/nodes/DoLoop.class.php b/src/main/php/lang/ast/nodes/DoLoop.class.php
@@ -13,9 +13,9 @@ public function __construct($expression, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->expression;
-    foreach ($this->body as $element) {
+    foreach ($this->body as &$element) {
       yield $element;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/Expression.class.php b/src/main/php/lang/ast/nodes/Expression.class.php
@@ -12,5 +12,5 @@ public function __construct($inline, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->inline]; }
+  public function children() { return [&$this->inline]; }
 }
diff --git a/src/main/php/lang/ast/nodes/ForLoop.class.php b/src/main/php/lang/ast/nodes/ForLoop.class.php
@@ -15,17 +15,17 @@ public function __construct($initialization, $condition, $loop, $body, $line= -1
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->initialization as $element) {
+  public function &children() {
+    foreach ($this->initialization as &$element) {
       yield $element;
     }
-    foreach ($this->condition as $element) {
+    foreach ($this->condition as &$element) {
       yield $element;
     }
-    foreach ($this->loop as $element) {
+    foreach ($this->loop as &$element) {
       yield $element;
     }
-    foreach ($this->body as $element) {
+    foreach ($this->body as &$element) {
       yield $element;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/ForeachLoop.class.php b/src/main/php/lang/ast/nodes/ForeachLoop.class.php
@@ -15,13 +15,13 @@ public function __construct($expression, $key, $value, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->expression;
     if ($this->key) {
       yield $this->key;
     }
     yield $this->value;
-    foreach ($this->body as $element) {
+    foreach ($this->body as &$element) {
       yield $element;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/Hook.class.php b/src/main/php/lang/ast/nodes/Hook.class.php
@@ -0,0 +1,17 @@
+<?php namespace lang\ast\nodes;
+
+use lang\ast\Node;
+
+class Hook extends Node {
+  public $kind= 'hook';
+  public $modifiers, $type, $expression, $byref, $parameter;
+
+  public function __construct($modifiers, $type, $expression, $byref= false, $parameter= null, $line= -1) {
+    $this->modifiers= $modifiers;
+    $this->type= $type;
+    $this->expression= $expression;
+    $this->byref= $byref;
+    $this->parameter= $parameter;
+    $this->line= $line;
+  }
+}
diff --git a/src/main/php/lang/ast/nodes/IfStatement.class.php b/src/main/php/lang/ast/nodes/IfStatement.class.php
@@ -19,12 +19,12 @@ public function __construct($expression, $body, $otherwise= null, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->expression;
-    foreach ($this->body as $node) {
+    foreach ($this->body as &$node) {
       yield $node;
     }
-    foreach ((array)$this->otherwise as $node) {
+    foreach ((array)$this->otherwise as &$node) {
       yield $node;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/InstanceExpression.class.php b/src/main/php/lang/ast/nodes/InstanceExpression.class.php
@@ -13,7 +13,5 @@ public function __construct($expression, $member, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    return [$this->expression, $this->member];
-  }
+  public function children() { return [&$this->expression, &$this->member]; }
 }
diff --git a/src/main/php/lang/ast/nodes/InstanceOfExpression.class.php b/src/main/php/lang/ast/nodes/InstanceOfExpression.class.php
@@ -13,5 +13,5 @@ public function __construct($expression, $type, $line= 1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/InvokeExpression.class.php b/src/main/php/lang/ast/nodes/InvokeExpression.class.php
@@ -13,9 +13,9 @@ public function __construct($expression, $arguments, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->expression;
-    foreach ($this->arguments as $element) {
+    foreach ($this->arguments as &$element) {
       yield $element;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/LambdaExpression.class.php b/src/main/php/lang/ast/nodes/LambdaExpression.class.php
@@ -13,6 +13,6 @@ public function __construct($signature, $body, $static= false, $line= -1) {
 
   /** @return iterable */
   public function children() {
-    return is_array($this->body) ? $this->body : [$this->body];
+    return is_array($this->body) ? $this->body : [&$this->body];
   }
 }
diff --git a/src/main/php/lang/ast/nodes/MatchCondition.class.php b/src/main/php/lang/ast/nodes/MatchCondition.class.php
@@ -16,8 +16,8 @@ public function __construct($expressions, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->expressions as $expression) {
+  public function &children() {
+    foreach ($this->expressions as &$expression) {
       yield $expression;
     }
     yield $this->body;

diff --git a/src/main/php/lang/ast/nodes/MatchExpression.class.php b/src/main/php/lang/ast/nodes/MatchExpression.class.php
@@ -20,9 +20,9 @@ public function __construct($expression, $cases, $default, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     if (null !== $this->expression) yield $this->expression;
-    foreach ($this->cases as $element) {
+    foreach ($this->cases as &$element) {
       yield $element;
     }
     if (null !== $this->default) yield $this->default;

diff --git a/src/main/php/lang/ast/nodes/OffsetExpression.class.php b/src/main/php/lang/ast/nodes/OffsetExpression.class.php
@@ -14,6 +14,6 @@ public function __construct($expression, $offset, $line= -1) {
 
   /** @return iterable */
   public function children() {
-    return $this->offset ? [$this->expression, $this->offset] : [$this->expression];
+    return $this->offset ? [&$this->expression, &$this->offset] : [&$this->expression];
   }
 }
diff --git a/src/main/php/lang/ast/nodes/Property.class.php b/src/main/php/lang/ast/nodes/Property.class.php
@@ -3,6 +3,7 @@
 class Property extends Annotated implements Member {
   public $kind= 'property';
   public $name, $modifiers, $expression, $type;
+  public $hooks= null;
 
   public function __construct($modifiers, $name, $type, $expression= null, $annotations= null, $comment= null, $line= -1) {
     $this->modifiers= $modifiers;

diff --git a/src/main/php/lang/ast/nodes/ReturnStatement.class.php b/src/main/php/lang/ast/nodes/ReturnStatement.class.php
@@ -17,7 +17,5 @@ public function __construct($expression= null, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    return $this->expression ? [$this->expression] : [];
-  }
+  public function children() { return $this->expression ? [&$this->expression] : []; }
 }
diff --git a/src/main/php/lang/ast/nodes/ScopeExpression.class.php b/src/main/php/lang/ast/nodes/ScopeExpression.class.php
@@ -14,6 +14,6 @@ public function __construct($type, $member, $line= -1) {
 
   /** @return iterable */
   public function children() {
-    return $this->type instanceof parent ? [$this->type, $this->member] : [$this->member];
+    return $this->type instanceof parent ? [&$this->type, &$this->member] : [&$this->member];
   }
 }
diff --git a/src/main/php/lang/ast/nodes/SwitchStatement.class.php b/src/main/php/lang/ast/nodes/SwitchStatement.class.php
@@ -18,9 +18,9 @@ public function __construct($expression, $cases, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->expression;
-    foreach ($this->cases as $element) {
+    foreach ($this->cases as &$element) {
       yield $element;
     }
   }

diff --git a/src/main/php/lang/ast/nodes/TernaryExpression.class.php b/src/main/php/lang/ast/nodes/TernaryExpression.class.php
@@ -14,7 +14,7 @@ public function __construct($condition, $expression, $otherwise, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
+  public function &children() {
     yield $this->condition;
     if ($this->expression) {
       yield $this->expression;

diff --git a/src/main/php/lang/ast/nodes/ThrowExpression.class.php b/src/main/php/lang/ast/nodes/ThrowExpression.class.php
@@ -12,7 +12,5 @@ public function __construct($expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    return [$this->expression];
-  }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/ThrowStatement.class.php b/src/main/php/lang/ast/nodes/ThrowStatement.class.php
@@ -12,7 +12,5 @@ public function __construct($expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    return [$this->expression];
-  }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/TryStatement.class.php b/src/main/php/lang/ast/nodes/TryStatement.class.php
@@ -14,11 +14,11 @@ public function __construct($body, $catches, $finally, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->body as $element) {
+  public function &children() {
+    foreach ($this->body as &$element) {
       yield $element;
     }
-    foreach ($this->catches as $catch) {
+    foreach ($this->catches as &$catch) {
       yield $catch;
     }
     if ($this->finally) {

diff --git a/src/main/php/lang/ast/nodes/UnaryExpression.class.php b/src/main/php/lang/ast/nodes/UnaryExpression.class.php
@@ -13,5 +13,5 @@ public function __construct($kind, $expression, $operator, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/UnpackExpression.class.php b/src/main/php/lang/ast/nodes/UnpackExpression.class.php
@@ -12,5 +12,5 @@ public function __construct($expression, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() { return [$this->expression]; }
+  public function children() { return [&$this->expression]; }
 }
diff --git a/src/main/php/lang/ast/nodes/UsingStatement.class.php b/src/main/php/lang/ast/nodes/UsingStatement.class.php
@@ -13,11 +13,11 @@ public function __construct($arguments, $body, $line= -1) {
   }
 
   /** @return iterable */
-  public function children() {
-    foreach ($this->arguments as $element) {
+  public function &children() {
+    foreach ($this->arguments as &$element) {
       yield $element;
     }
-    foreach ($this->body as $element) {
+    foreach ($this->body as &$element) {
       yield $element;
     }
   }