Updated StatementOrderVisitor

ondrejmirtes · ondrejmirtes · commit 15c068976da5 · 2020-08-19T13:43:12.000+02:00
diff --git a/src/NodeVisitor/StatementOrderVisitor.php b/src/NodeVisitor/StatementOrderVisitor.php
@@ -11,8 +11,13 @@ class StatementOrderVisitor extends NodeVisitorAbstract
 	/** @var int[] */
 	private array $orderStack = [];
 
+	/** @var int[] */
+	private array $expressionOrderStack = [];
+
 	private int $depth = 0;
 
+	private int $expressionDepth = 0;
+
 	/**
 	 * @param Node[] $nodes $nodes
 	 * @return null
@@ -31,18 +36,30 @@ public function beforeTraverse(array $nodes)
 	 */
 	public function enterNode(Node $node)
 	{
-		if (!$node instanceof Node\Stmt) {
-			return null;
-		}
-
 		$order = $this->orderStack[count($this->orderStack) - 1];
 		$node->setAttribute('statementOrder', $order);
 		$node->setAttribute('statementDepth', $this->depth);
 
+		if ($node instanceof Node\Expr && count($this->expressionOrderStack) > 0) {
+			$expressionOrder = $this->expressionOrderStack[count($this->expressionOrderStack) - 1];
+			$node->setAttribute('expressionOrder', $expressionOrder);
+			$node->setAttribute('expressionDepth', $this->expressionDepth);
+			$this->expressionOrderStack[count($this->expressionOrderStack) - 1] = $expressionOrder + 1;
+			$this->expressionOrderStack[] = 0;
+			$this->expressionDepth++;
+		}
+
+		if (!$node instanceof Node\Stmt) {
+			return null;
+		}
+
 		$this->orderStack[count($this->orderStack) - 1] = $order + 1;
 		$this->orderStack[] = 0;
 		$this->depth++;
 
+		$this->expressionOrderStack = [0];
+		$this->expressionDepth = 0;
+
 		return null;
 	}
 
@@ -52,6 +69,10 @@ public function enterNode(Node $node)
 	 */
 	public function leaveNode(Node $node)
 	{
+		if ($node instanceof Node\Expr) {
+			array_pop($this->expressionOrderStack);
+			$this->expressionDepth--;
+		}
 		if (!$node instanceof Node\Stmt) {
 			return null;
 		}
