From b5d94285bea2d86b6c54b72b6cd410314509a127 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 23 Oct 2024 21:51:54 +0100
Subject: [PATCH 01/39] Add heading

---
 src/Scanner/Opcode.php  | 9 +++++++++
 src/Scanner/Scanner.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/Scanner/Opcode.php b/src/Scanner/Opcode.php
index 770de10..c071443 100644
--- a/src/Scanner/Opcode.php
+++ b/src/Scanner/Opcode.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Phalcon\Volt\Scanner;
diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index 06ac275..d4fadf0 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Phalcon\Volt\Scanner;

From 1600b53f82aa05488c9aa624b0855833ff5fb4da Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 24 Oct 2024 22:52:46 +0100
Subject: [PATCH 02/39] Merge cases

---
 files/parser.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index b6dd7cb..eaf4f56 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2294,8 +2294,6 @@ private function yy_reduce(int $yyruleno): void
   **     break;
   */
             case 0:
-                $this->output = $yymsp->minor;
-                break;
             case 1:
             case 4:
             case 5:

From bbfb38b0b72126557f443753e0b6b7293f3d956e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:03:54 +0100
Subject: [PATCH 03/39] Fix scanning for new lines

---
 src/Compiler.php        |  1 -
 src/Scanner/Scanner.php | 53 +++++++++++++++++++----------------------
 src/Scanner/State.php   | 16 +------------
 3 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ade450b..360fc30 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -72,7 +72,6 @@ class Compiler
     public const PHVOLT_MODE_RAW                   = 0;
     public const PHVOLT_PARSING_FAILED             = 0;
     public const PHVOLT_PARSING_OK                 = 1;
-    public const PHVOLT_RAW_BUFFER_SIZE            = 256;
     public const PHVOLT_SCANNER_RETCODE_EOF        = -1;
     public const PHVOLT_SCANNER_RETCODE_ERR        = -2;
     public const PHVOLT_SCANNER_RETCODE_IMPOSSIBLE = -3;
diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index d4fadf0..4893e06 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -38,45 +38,33 @@ public function scanForToken(): int
         $status = self::PHVOLT_SCANNER_RETCODE_IMPOSSIBLE;
         while (self::PHVOLT_SCANNER_RETCODE_IMPOSSIBLE === $status) {
             $cursor = $this->state->getStart();
-            if ($cursor === null) {
-                return self::PHVOLT_SCANNER_RETCODE_EOF;
-            }
 
             $mode = $this->state->getMode();
             if ($mode === Compiler::PHVOLT_MODE_RAW || $mode === Compiler::PHVOLT_MODE_COMMENT) {
                 $next       = $this->state->getNext();
                 $doubleNext = $this->state->getNext(2);
 
-                if ($cursor === "\n") {
-                    $this->state->incrementActiveLine();
-                }
-
-                if ($cursor === '{' && ($next === '%' || $next === '{' || $next === '#')) {
+                if ($cursor === null || ($cursor === '{' && ($next === '%' || $next === '{' || $next === '#'))) {
                     if ($next !== '#') {
                         $this->state->setMode(Compiler::PHVOLT_MODE_CODE);
 
-                        if ($this->state->getRawBufferCursor() > 0) {
-                            $value = substr(
-                                $this->state->getRawBuffer(),
-                                $this->state->getCursor() - $this->state->getRawBufferCursor(),
-                                $this->state->getRawBufferCursor(),
-                            );
-                            $this
-                                ->token
-                                ->setOpcode(Compiler::PHVOLT_T_RAW_FRAGMENT)
-                                ->setValue($value)
-                            ;
-
+                        if (!empty($this->state->rawFragment)) {
                             if ($this->state->getWhitespaceControl()) {
-                                //ltrim(); // TODO
+                                $this->state->rawFragment = ltrim($this->state->rawFragment);
                                 $this->state->setWhitespaceControl(false);
                             }
 
                             if ($doubleNext === '-') {
-                                // rtrim($token); // TODO
+                                $this->state->rawFragment = rtrim($this->state->rawFragment);
                             }
 
-                            $this->state->setRawBufferCursor(0);
+                            $this
+                                ->token
+                                ->setOpcode(Compiler::PHVOLT_T_RAW_FRAGMENT)
+                                ->setValue($this->state->rawFragment)
+                            ;
+
+                            $this->state->rawFragment = '';
                         } else {
                             $this->token->setOpcode(Compiler::PHVOLT_T_IGNORE);
                         }
@@ -94,18 +82,20 @@ public function scanForToken(): int
                     }
 
                     return 0;
-                } else {
-                    $this->state->incrementRawBufferCursor();
                 }
+
+                if ($cursor === "\n") {
+                    $this->state->incrementActiveLine();
+                }
+
+                $this->state->rawFragment .= $cursor;
                 $this->state->incrementStart();
             } else {
                 $vvch = $cursor;
-                if ($vvch === null) {
-                    return self::PHVOLT_SCANNER_RETCODE_EOF;
-                }
-
                 $start = $this->state->getCursor();
                 switch ($vvch) {
+                    case null:
+                        goto vv2;
                     case "\t":
                     case "\r":
                     case ' ':
@@ -243,6 +233,11 @@ public function scanForToken(): int
                     default:
                         $this->state->incrementStart();
                 }
+
+                vv2:
+                $status = self::PHVOLT_SCANNER_RETCODE_EOF;
+                break;
+
                 vv5:
                 $status = self::PHVOLT_SCANNER_RETCODE_ERR;
                 break;
diff --git a/src/Scanner/State.php b/src/Scanner/State.php
index 47b26bf..cfe4c34 100644
--- a/src/Scanner/State.php
+++ b/src/Scanner/State.php
@@ -27,8 +27,8 @@ class State
     public mixed $marker = null;
     public int $oldIfLevel = 0;
     public string $rawBuffer;
+    public string $rawFragment = '';
     public int $rawBufferCursor = 0;
-    public int $rawBufferSize = Compiler::PHVOLT_RAW_BUFFER_SIZE;
     public int $startLength;
     public int $statementPosition = 0;
     public int $switchLevel = 0;
@@ -240,20 +240,6 @@ public function setRawBuffer(string $rawBuffer): self
         return $this;
     }
 
-    public function setRawBufferCursor(int $rawBufferCursor): self
-    {
-        $this->rawBufferCursor = $rawBufferCursor;
-
-        return $this;
-    }
-
-    public function setRawBufferSize(int $rawBufferSize): self
-    {
-        $this->rawBufferSize = $rawBufferSize;
-
-        return $this;
-    }
-
     public function setStart(?string $start): self
     {
         $this->start = $start;

From 01754a28e49d748e7614f15039320a8b956e7922 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:11:58 +0100
Subject: [PATCH 04/39] Add implementation of `phvolt_ret_include_statement()`

---
 files/parser.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index eaf4f56..9ae95cf 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3773,3 +3773,22 @@ function phvolt_ret_expr(array &$ret, int|string $type, ?array $left, ?array $ri
     $ret['file'] = $state->getActiveFile();
     $ret["line"] = $state->getActiveLine();
 }
+
+function phvolt_ret_include_statement(array &$ret, array $path, ?array $params, $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_INCLUDE;
+    $ret['path'] = $path;
+
+    if ($params !== null) {
+        $ret['params'] = $params;
+    }
+
+    if (isset($state->active_file)) {
+        $ret['file'] = $state->active_file;
+    }
+
+    if (isset($state->active_line)) {
+        $ret['line'] = $state->active_line;
+    }
+}

From 295d6904b48664c7d9d2ff6e61cc2301bb021ab5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:16:26 +0100
Subject: [PATCH 05/39] Add implementation of `phvolt_ret_macro_parameter()`

---
 files/parser.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 9ae95cf..81b1c0b 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3784,11 +3784,23 @@ function phvolt_ret_include_statement(array &$ret, array $path, ?array $params,
         $ret['params'] = $params;
     }
 
-    if (isset($state->active_file)) {
-        $ret['file'] = $state->active_file;
-    }
+    $ret['file'] = $state->getActiveFile();
+    $ret["line"] = $state->getActiveLine();
+}
+
+function phvolt_ret_macro_parameter(array &$ret, Token $variable, ?array $default_value, State $state): void
+{
+    $ret = [];
+    $ret['variable'] = $variable->getValue();
 
-    if (isset($state->active_line)) {
-        $ret['line'] = $state->active_line;
+    // Free the variable token memory
+    unset($variable->token);
+    unset($variable);
+
+    if ($default_value !== null) {
+        $ret['default'] = $default_value;
     }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
 }

From 929abd4b95c993084313ee1888dda154fe6267fc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:22:13 +0100
Subject: [PATCH 06/39] Add implementation of `phvolt_ret_slice()`

---
 files/parser.php | 460 ++++++++++++++++++++++++++---------------------
 1 file changed, 253 insertions(+), 207 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 81b1c0b..c1089d8 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -1,4 +1,6 @@
-<?php # vim:ts=2:sw=2:et:
+<?php
+
+# vim:ts=2:sw=2:et:
 /* Driver template for the LEMON parser generator.
 ** The author disclaims copyright to this source code.
 */
@@ -41,13 +43,14 @@
 
 class phvolt_yyStackEntry
 {
-    var /* int */
-        $stateno;       /* The state-number */
-    var /* int */
-        $major;         /* The major token value.  This is the code
+    public int $stateno;       /* The state-number */
+    public int $major;         /* The major token value.  This is the code
                      ** number for the token at this stack level */
-    var $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
+    /**
+     * The user-supplied minor token value.
+     * This is the value of the token.
+     */
+    public mixed $minor = null;
 }
 
 /* The state of the parser is completely contained in an instance of
@@ -1426,8 +1429,11 @@ function phvolt_Trace(/* stream */ $TraceFILE, string $zTracePrompt = '')
     {
         $this->yyTraceFILE = $TraceFILE;
         $this->yyTracePrompt = $zTracePrompt;
-        if ($this->yyTraceFILE === null) $this->yyTracePrompt = null;
-        else if ($this->yyTracePrompt === null) $this->yyTraceFILE = null;
+        if ($this->yyTraceFILE === null) {
+            $this->yyTracePrompt = null;
+        } elseif ($this->yyTracePrompt === null) {
+            $this->yyTraceFILE = null;
+        }
     }
 
     /* For tracing shifts, the names of all terminals and nonterminals
@@ -1998,8 +2004,9 @@ private function yy_pop_parser_stack()
 */
     function __destruct()
     {
-        while ($this->yyidx >= 0)
+        while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
+        }
     }
 
     /*
@@ -2023,12 +2030,18 @@ private function yy_find_shift_action($iLookAhead)
         $i += $iLookAhead;
         if ($i < 0 || $i >= count(self::$yy_action) || self::$yy_lookahead[$i] != $iLookAhead) {
             if ($iLookAhead > 0) {
-                if (isset(self::$yyFallback[$iLookAhead]) &&
-                    ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if (
+                    isset(self::$yyFallback[$iLookAhead]) &&
+                    ($iFallback = self::$yyFallback[$iLookAhead]) != 0
+                ) {
                     if ($this->yyTraceFILE) {
-                        fprintf($this->yyTraceFILE, "%sFALLBACK %s => %s\n",
-                            $this->yyTracePrompt, self::$yyTokenName[$iLookAhead],
-                            self::$yyTokenName[$iFallback]);
+                        fprintf(
+                            $this->yyTraceFILE,
+                            "%sFALLBACK %s => %s\n",
+                            $this->yyTracePrompt,
+                            self::$yyTokenName[$iLookAhead],
+                            self::$yyTokenName[$iFallback]
+                        );
                     }
                     return $this->yy_find_shift_action($iFallback);
                 }
@@ -2050,10 +2063,11 @@ private function yy_find_shift_action($iLookAhead)
     private function yy_find_reduce_action(
         $stateno,              /* Current state number */
         $iLookAhead     /* The look-ahead token */
-    )
-    {
-        if ($stateno > self::YY_REDUCE_MAX ||
-            ($i = self::$yy_reduce_ofst[$stateno]) == self::YY_REDUCE_USE_DFLT) {
+    ) {
+        if (
+            $stateno > self::YY_REDUCE_MAX ||
+            ($i = self::$yy_reduce_ofst[$stateno]) == self::YY_REDUCE_USE_DFLT
+        ) {
             return self::$yy_default[$stateno];
         }
         if ($iLookAhead == self::YYNOCODE) {
@@ -2074,13 +2088,12 @@ private function yy_shift(
         $yyNewState,               /* The new state to shift in */
         $yyMajor,                  /* The major token to shift in */
         $yypMinor         /* Pointer ot the minor token to shift in */
-    )
-    {
+    ) {
         $this->yyidx++;
         if (isset($this->yystack[$this->yyidx])) {
             $yytos = $this->yystack[$this->yyidx];
         } else {
-            $yytos = new phvolt_yyStackEntry;
+            $yytos = new phvolt_yyStackEntry();
             $this->yystack[$this->yyidx] = $yytos;
         }
 
@@ -2321,17 +2334,31 @@ private function yy_reduce(int $yyruleno): void
                 $this->output = $yymsp->minor;
                 break;
             case 2:
-                phvolt_ret_zval_list($this->output, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+                phvolt_ret_zval_list(
+                    $this->output,
+                    $this->yystack[$this->yyidx + -1]->minor,
+                    $this->yystack[$this->yyidx + 0]->minor,
+                );
                 break;
             case 3:
             case 43:
             case 55:
             case 141:
             case 148:
-                phvolt_ret_zval_list($this->output, NULL, $this->yystack[$this->yyidx + 0]->minor);
+                phvolt_ret_zval_list(
+                    $this->output,
+                    null,
+                    $this->yystack[$this->yyidx + 0]->minor,
+                );
                 break;
             case 26:
-                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, NULL, $this->status->getState());
+                phvolt_ret_if_statement(
+                    $this->output,
+                    $this->yystack[$this->yyidx + -5]->minor,
+                    $this->yystack[$this->yyidx + -3]->minor,
+                    null,
+                    $this->status->getState(),
+                );
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -7]->minor);
                 $this->yy_destructor(31, $this->yystack[$this->yyidx + -6]->minor);
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
@@ -2340,7 +2367,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 27:
-                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, NULL, NULL, $this->status->getState());
+                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, null, null, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
                 $this->yy_destructor(31, $this->yystack[$this->yyidx + -5]->minor);
@@ -2363,7 +2390,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 29:
-                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -8]->minor, $this->yystack[$this->yyidx + -6]->minor, NULL, $this->status->getState());
+                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -8]->minor, $this->yystack[$this->yyidx + -6]->minor, null, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -10]->minor);
                 $this->yy_destructor(31, $this->yystack[$this->yyidx + -9]->minor);
@@ -2376,7 +2403,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 30:
-                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, NULL, NULL, $this->status->getState());
+                phvolt_ret_if_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, null, null, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -9]->minor);
                 $this->yy_destructor(31, $this->yystack[$this->yyidx + -8]->minor);
@@ -2403,7 +2430,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 33:
-                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, NULL, $this->yystack[$this->yyidx + -5]->minor, NULL, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, null, $this->yystack[$this->yyidx + -5]->minor, null, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -9]->minor);
                 $this->yy_destructor(37, $this->yystack[$this->yyidx + -8]->minor);
@@ -2414,7 +2441,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 34:
-                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -9]->minor, NULL, $this->yystack[$this->yyidx + -7]->minor, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -9]->minor, null, $this->yystack[$this->yyidx + -7]->minor, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -11]->minor);
                 $this->yy_destructor(37, $this->yystack[$this->yyidx + -10]->minor);
@@ -2426,7 +2453,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 35:
-                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, $this->yystack[$this->yyidx + -9]->minor, $this->yystack[$this->yyidx + -5]->minor, NULL, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                phvolt_ret_for_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, $this->yystack[$this->yyidx + -9]->minor, $this->yystack[$this->yyidx + -5]->minor, null, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
 
                 $this->yy_destructor(1, $this->yystack[$this->yyidx + -11]->minor);
                 $this->yy_destructor(37, $this->yystack[$this->yyidx + -10]->minor);
@@ -2463,14 +2490,14 @@ private function yy_reduce(int $yyruleno): void
             case 38:
 #line 332 "parser.php.lemon"
                 {
-                    phvolt_ret_switch_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, NULL, $this->status->getState());
+                    phvolt_ret_switch_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, null, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
                     $this->yy_destructor(40, $this->yystack[$this->yyidx + -5]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(41, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1787 "parser.php.php"
                 break;
             case 39:
@@ -2480,17 +2507,17 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(42, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1797 "parser.php.php"
                 break;
             case 40:
 #line 342 "parser.php.lemon"
                 {
-                    phvolt_ret_case_clause($this->output, NULL, $this->status->getState());
+                    phvolt_ret_case_clause($this->output, null, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(43, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1807 "parser.php.php"
                 break;
             case 41:
@@ -2500,7 +2527,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(44, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1817 "parser.php.php"
                 break;
             case 42:
@@ -2512,7 +2539,7 @@ private function yy_reduce(int $yyruleno): void
                     phvolt_ret_zval_list($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
 
                     $this->yy_destructor(2, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1828 "parser.php.php"
                 break;
             case 44:
@@ -2520,7 +2547,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_set_assignment($this->output, $this->yystack[$this->yyidx + -2]->minor, Compiler::PHVOLT_T_ASSIGN, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(45, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1836 "parser.php.php"
                 break;
             case 45:
@@ -2528,7 +2555,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_set_assignment($this->output, $this->yystack[$this->yyidx + -2]->minor, Compiler::PHVOLT_T_ADD_ASSIGN, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(46, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1844 "parser.php.php"
                 break;
             case 46:
@@ -2536,7 +2563,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_set_assignment($this->output, $this->yystack[$this->yyidx + -2]->minor, Compiler::PHVOLT_T_SUB_ASSIGN, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(47, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1852 "parser.php.php"
                 break;
             case 47:
@@ -2544,7 +2571,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_set_assignment($this->output, $this->yystack[$this->yyidx + -2]->minor, Compiler::PHVOLT_T_MUL_ASSIGN, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(48, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1860 "parser.php.php"
                 break;
             case 48:
@@ -2552,7 +2579,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_set_assignment($this->output, $this->yystack[$this->yyidx + -2]->minor, Compiler::PHVOLT_T_DIV_ASSIGN, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(49, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1868 "parser.php.php"
                 break;
             case 49:
@@ -2566,25 +2593,25 @@ private function yy_reduce(int $yyruleno): void
             case 133:
 #line 382 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAYACCESS, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAYACCESS, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, null, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1888 "parser.php.php"
                 break;
             case 51:
             case 122:
 #line 386 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DOT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DOT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(30, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1897 "parser.php.php"
                 break;
             case 52:
 #line 390 "parser.php.lemon"
                 {
-                    phvolt_ret_macro_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, NULL, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                    phvolt_ret_macro_statement($this->output, $this->yystack[$this->yyidx + -7]->minor, null, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -9]->minor);
                     $this->yy_destructor(51, $this->yystack[$this->yyidx + -8]->minor);
                     $this->yy_destructor(29, $this->yystack[$this->yyidx + -6]->minor);
@@ -2593,7 +2620,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(53, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1912 "parser.php.php"
                 break;
             case 53:
@@ -2608,14 +2635,14 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(53, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1927 "parser.php.php"
                 break;
             case 56:
 #line 406 "parser.php.lemon"
                 {
-                    phvolt_ret_macro_parameter($this->output, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
-                }
+                    phvolt_ret_macro_parameter($this->output, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+            }
 #line 1934 "parser.php.php"
                 break;
             case 57:
@@ -2623,7 +2650,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_macro_parameter($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                     $this->yy_destructor(45, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 1942 "parser.php.php"
                 break;
             case 58:
@@ -2634,7 +2661,7 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_INTEGER, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
 
-                }
+            }
 #line 1952 "parser.php.php"
                 break;
             case 59:
@@ -2643,40 +2670,40 @@ private function yy_reduce(int $yyruleno): void
                 {
                     phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_STRING, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
 
-                }
+            }
 #line 1960 "parser.php.php"
                 break;
             case 60:
             case 154:
-            phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_DOUBLE, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_DOUBLE, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                 break;
             case 61:
             case 155:
 #line 426 "parser.php.lemon"
                 {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_NULL, NULL, $this->status->getState());
+                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_NULL, null, $this->status->getState());
 
                     $this->yy_destructor(57, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1977 "parser.php.php"
                 break;
             case 62:
             case 156:
 #line 430 "parser.php.lemon"
                 {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_FALSE, NULL, $this->status->getState());
+                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_FALSE, null, $this->status->getState());
                     $this->yy_destructor(58, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1986 "parser.php.php"
                 break;
             case 63:
             case 157:
 #line 434 "parser.php.lemon"
                 {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_TRUE, NULL, $this->status->getState());
+                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_TRUE, null, $this->status->getState());
 
                     $this->yy_destructor(59, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 1995 "parser.php.php"
                 break;
             case 64:
@@ -2692,13 +2719,13 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(61, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2010 "parser.php.php"
                 break;
             case 65:
 #line 442 "parser.php.lemon"
                 {
-                    phvolt_ret_macro_call_statement($this->output, $this->yystack[$this->yyidx + -6]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_macro_call_statement($this->output, $this->yystack[$this->yyidx + -6]->minor, null, null, $this->status->getState());
 
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -8]->minor);
                     $this->yy_destructor(60, $this->yystack[$this->yyidx + -7]->minor);
@@ -2708,7 +2735,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(61, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2025 "parser.php.php"
                 break;
             case 66:
@@ -2717,7 +2744,7 @@ private function yy_reduce(int $yyruleno): void
                     phvolt_ret_empty_statement($this->output, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2034 "parser.php.php"
                 break;
             case 67:
@@ -2735,33 +2762,33 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(65, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2056 "parser.php.php"
                 break;
             case 69:
 #line 458 "parser.php.lemon"
                 {
-                    phvolt_ret_block_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, NULL, $this->status->getState());
+                    phvolt_ret_block_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, null, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
                     $this->yy_destructor(64, $this->yystack[$this->yyidx + -5]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(65, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2069 "parser.php.php"
                 break;
             case 70:
 #line 462 "parser.php.lemon"
                 {
-                    phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -5]->minor, NULL, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                    phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -5]->minor, null, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -7]->minor);
                     $this->yy_destructor(66, $this->yystack[$this->yyidx + -6]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(67, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2082 "parser.php.php"
                 break;
             case 71:
@@ -2774,7 +2801,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(67, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2095 "parser.php.php"
                 break;
             case 74:
@@ -2787,7 +2814,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(69, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2108 "parser.php.php"
                 break;
             case 75:
@@ -2797,17 +2824,17 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(70, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2118 "parser.php.php"
                 break;
             case 76:
 #line 486 "parser.php.lemon"
                 {
-                    phvolt_ret_include_statement($this->output, $this->yystack[$this->yyidx + -1]->minor, NULL, $this->status->getState());
+                    phvolt_ret_include_statement($this->output, $this->yystack[$this->yyidx + -1]->minor, null, $this->status->getState());
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(71, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2128 "parser.php.php"
                 break;
             case 77:
@@ -2818,7 +2845,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(71, $this->yystack[$this->yyidx + -4]->minor);
                     $this->yy_destructor(72, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2139 "parser.php.php"
                 break;
             case 78:
@@ -2828,7 +2855,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(73, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2149 "parser.php.php"
                 break;
             case 79:
@@ -2838,7 +2865,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(74, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2159 "parser.php.php"
                 break;
             case 80:
@@ -2852,7 +2879,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(76, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2173 "parser.php.php"
                 break;
             case 81:
@@ -2866,7 +2893,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(76, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2187 "parser.php.php"
                 break;
             case 82:
@@ -2876,7 +2903,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(77, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2197 "parser.php.php"
                 break;
             case 83:
@@ -2886,7 +2913,7 @@ private function yy_reduce(int $yyruleno): void
                     $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(78, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2207 "parser.php.php"
                 break;
             case 84:
@@ -2895,399 +2922,399 @@ private function yy_reduce(int $yyruleno): void
             case 85:
 #line 522 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MINUS, NULL, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MINUS, null, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(22, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2222 "parser.php.php"
                 break;
             case 86:
 #line 526 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PLUS, NULL, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PLUS, null, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(21, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2230 "parser.php.php"
                 break;
             case 87:
 #line 530 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_SUB, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_SUB, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(22, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2238 "parser.php.php"
                 break;
             case 88:
 #line 534 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ADD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ADD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(21, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2246 "parser.php.php"
                 break;
             case 89:
 #line 538 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MUL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MUL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(19, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2254 "parser.php.php"
                 break;
             case 90:
 #line 542 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_POW, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_POW, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(19, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(19, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2263 "parser.php.php"
                 break;
             case 91:
 #line 546 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DIV, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DIV, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(18, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2271 "parser.php.php"
                 break;
             case 92:
 #line 550 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(18, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(18, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2280 "parser.php.php"
                 break;
             case 93:
 #line 554 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(20, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2288 "parser.php.php"
                 break;
             case 94:
 #line 558 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_AND, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_AND, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(6, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2296 "parser.php.php"
                 break;
             case 95:
 #line 562 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_OR, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_OR, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(7, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2304 "parser.php.php"
                 break;
             case 96:
 #line 566 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_CONCAT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_CONCAT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(23, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2312 "parser.php.php"
                 break;
             case 97:
 #line 570 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PIPE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PIPE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(25, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2320 "parser.php.php"
                 break;
             case 98:
 #line 574 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_RANGE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_RANGE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(5, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2328 "parser.php.php"
                 break;
             case 99:
 #line 578 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_EQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_EQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(10, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2336 "parser.php.php"
                 break;
             case 100:
 #line 582 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSET, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2345 "parser.php.php"
                 break;
             case 101:
 #line 586 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSET, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2354 "parser.php.php"
                 break;
             case 102:
 #line 590 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2363 "parser.php.php"
                 break;
             case 103:
 #line 594 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2372 "parser.php.php"
                 break;
             case 104:
 #line 598 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2381 "parser.php.php"
                 break;
             case 105:
 #line 602 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2390 "parser.php.php"
                 break;
             case 106:
 #line 606 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISODD, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2399 "parser.php.php"
                 break;
             case 107:
 #line 610 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISODD, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2408 "parser.php.php"
                 break;
             case 108:
 #line 614 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2417 "parser.php.php"
                 break;
             case 109:
 #line 618 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2426 "parser.php.php"
                 break;
             case 110:
 #line 622 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2435 "parser.php.php"
                 break;
             case 111:
 #line 626 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2444 "parser.php.php"
                 break;
             case 112:
 #line 630 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2453 "parser.php.php"
                 break;
             case 113:
 #line 634 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2462 "parser.php.php"
                 break;
             case 114:
 #line 638 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2470 "parser.php.php"
                 break;
             case 115:
 #line 642 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTEQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTEQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2478 "parser.php.php"
                 break;
             case 116:
 #line 646 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(16, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2486 "parser.php.php"
                 break;
             case 117:
 #line 650 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTIDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTIDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(17, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2494 "parser.php.php"
                 break;
             case 118:
 #line 654 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(12, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2502 "parser.php.php"
                 break;
             case 119:
 #line 658 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATER, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATER, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(13, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2510 "parser.php.php"
                 break;
             case 120:
 #line 662 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATEREQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATEREQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(14, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2518 "parser.php.php"
                 break;
             case 121:
 #line 666 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESSEQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESSEQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(15, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2526 "parser.php.php"
                 break;
             case 123:
 #line 674 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IN, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IN, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2534 "parser.php.php"
                 break;
             case 124:
 #line 678 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_IN, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_IN, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(26, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2543 "parser.php.php"
                 break;
             case 125:
 #line 682 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT, NULL, $this->yystack[$this->yyidx + 0]->minor, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT, null, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
                     $this->yy_destructor(26, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2551 "parser.php.php"
                 break;
             case 126:
 #line 686 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_INCR, $this->yystack[$this->yyidx + -1]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_INCR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(27, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2559 "parser.php.php"
                 break;
             case 127:
 #line 690 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DECR, $this->yystack[$this->yyidx + -1]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DECR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(28, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2567 "parser.php.php"
                 break;
             case 128:
 #line 694 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ENCLOSED, $this->yystack[$this->yyidx + -1]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ENCLOSED, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(29, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2576 "parser.php.php"
                 break;
             case 129:
 #line 698 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, NULL, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, null, null, null, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2585 "parser.php.php"
                 break;
             case 130:
 #line 702 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2594 "parser.php.php"
                 break;
             case 131:
 #line 706 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, NULL, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, null, null, null, $this->status->getState());
                     $this->yy_destructor(87, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(88, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2603 "parser.php.php"
                 break;
             case 132:
 #line 710 "parser.php.lemon"
                 {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, NULL, NULL, $this->status->getState());
+                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                     $this->yy_destructor(87, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(88, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2612 "parser.php.php"
                 break;
             case 134:
@@ -3296,52 +3323,44 @@ private function yy_reduce(int $yyruleno): void
                     phvolt_ret_expr($this->output, Compiler::PHVOLT_T_TERNARY, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -4]->minor, $this->status->getState());
                     $this->yy_destructor(3, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(4, $this->yystack[$this->yyidx + -1]->minor);
-                }
+            }
 #line 2621 "parser.php.php"
                 break;
             case 135:
 #line 722 "parser.php.lemon"
                 {
-                    phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -4]->minor, NULL, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
+                    phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -4]->minor, null, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(4, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
+            }
 #line 2631 "parser.php.php"
                 break;
             case 136:
 #line 726 "parser.php.lemon"
                 {
-                    phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, NULL, $this->status->getState());
+                    phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, null, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -3]->minor);
                     $this->yy_destructor(4, $this->yystack[$this->yyidx + -1]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
-#line 2641 "parser.php.php"
+            }
                 break;
             case 137:
-#line 730 "parser.php.lemon"
                 {
                     phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
                     $this->yy_destructor(24, $this->yystack[$this->yyidx + -4]->minor);
                     $this->yy_destructor(4, $this->yystack[$this->yyidx + -2]->minor);
                     $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-                }
-#line 2651 "parser.php.php"
+            }
                 break;
             case 142:
             case 150:
-#line 750 "parser.php.lemon"
-                {
-                    phvolt_ret_named_item($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
-
-                    $this->yy_destructor(4, $this->yystack[$this->yyidx + -1]->minor);
-                }
-#line 2660 "parser.php.php"
+                phvolt_ret_named_item($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                $this->yy_destructor(4, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 143:
             case 149:
-                phvolt_ret_named_item($this->output, NULL, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                phvolt_ret_named_item($this->output, null, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                 break;
             case 145:
                 phvolt_ret_func_call($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
@@ -3350,7 +3369,7 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 146:
-                phvolt_ret_func_call($this->output, $this->yystack[$this->yyidx + -2]->minor, NULL, $this->status->getState());
+                phvolt_ret_func_call($this->output, $this->yystack[$this->yyidx + -2]->minor, null, $this->status->getState());
 
                 $this->yy_destructor(29, $this->yystack[$this->yyidx + -1]->minor);
                 $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
@@ -3370,7 +3389,7 @@ private function yy_reduce(int $yyruleno): void
 
         if ($yyact < self::YYNSTATE) {
             $this->yy_shift($yyact, $yygoto, $this->output);
-        } else if ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
             $this->yy_accept();
         }
     }
@@ -3383,7 +3402,9 @@ private function yy_parse_failed(): void
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
-        while ($this->yyidx >= 0) $this->yy_pop_parser_stack();
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
         /* Here code is inserted which will be executed whenever the
   ** parser fails */
     }
@@ -3463,7 +3484,9 @@ private function yy_accept(): void
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
-        while ($this->yyidx >= 0) $this->yy_pop_parser_stack();
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
         /* Here code is inserted which will be executed whenever the
   ** parser accepts */
     }
@@ -3495,7 +3518,7 @@ public function phvolt_($yymajor, $yyminor = null)
         if ($this->yyidx < 0) {
             $this->yyidx = 0;
             $this->yyerrcnt = -1;
-            $ent = new phvolt_yyStackEntry;
+            $ent = new phvolt_yyStackEntry();
             $ent->stateno = 0;
             $ent->major = 0;
             $this->yystack = array(0 => $ent);
@@ -3516,9 +3539,9 @@ public function phvolt_($yymajor, $yyminor = null)
                 } else {
                     $yymajor = self::YYNOCODE;
                 }
-            } else if ($yyact < self::YYNSTATE + self::YYNRULE) {
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
-            } else if ($yyact == $this->YY_ERROR_ACTION) {
+            } elseif ($yyact == $this->YY_ERROR_ACTION) {
                 if ($this->yyTraceFILE) {
                     fprintf($this->yyTraceFILE, "%s Syntax Error!\n", $this->yyTracePrompt);
                 }
@@ -3548,8 +3571,12 @@ public function phvolt_($yymajor, $yyminor = null)
                     $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                $this->yyTracePrompt, self::$yyTokenName[$yymajor]);
+                            fprintf(
+                                $this->yyTraceFILE,
+                                "%sDiscard input token %s\n",
+                                $this->yyTracePrompt,
+                                self::$yyTokenName[$yymajor]
+                            );
                         }
                         $this->yy_destructor($yymajor, $yyminor);
                         $yymajor = self::YYNOCODE;
@@ -3559,7 +3586,8 @@ public function phvolt_($yymajor, $yyminor = null)
                             $yymx != self::YYERRORSYMBOL &&
                             ($yyact = $this->yy_find_reduce_action(
                                 $this->yystack[$this->yyidx]->stateno,
-                                self::YYERRORSYMBOL)) >= self::YYNSTATE
+                                self::YYERRORSYMBOL
+                            )) >= self::YYNSTATE
                         ) {
                             $this->yy_pop_parser_stack();
                         }
@@ -3567,7 +3595,7 @@ public function phvolt_($yymajor, $yyminor = null)
                             $this->yy_destructor($yymajor, $yyminor);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
-                        } else if ($yymx != self::YYERRORSYMBOL) {
+                        } elseif ($yymx != self::YYERRORSYMBOL) {
                             $this->yy_shift($yyact, self::YYERRORSYMBOL, 0);
                         }
                     }
@@ -3657,7 +3685,8 @@ function phvolt_ret_elsefor_statement(&$ret, State $state): void
     ];
 }
 
-function phvolt_ret_for_statement(&$ret, $variable, $key = null, array $expr = [], $if_expr = null, $block_statements = null, ?State $state = null): void {
+function phvolt_ret_for_statement(&$ret, $variable, $key = null, array $expr = [], $if_expr = null, $block_statements = null, ?State $state = null): void
+{
     $ret = [
         "type" => Compiler::PHVOLT_T_FOR,
         "variable" => $variable->token,
@@ -3794,7 +3823,6 @@ function phvolt_ret_macro_parameter(array &$ret, Token $variable, ?array $defaul
     $ret['variable'] = $variable->getValue();
 
     // Free the variable token memory
-    unset($variable->token);
     unset($variable);
 
     if ($default_value !== null) {
@@ -3804,3 +3832,21 @@ function phvolt_ret_macro_parameter(array &$ret, Token $variable, ?array $defaul
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_slice(array &$ret, array $left, ?array $start, ?array $end, $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_SLICE;
+    $ret['left'] = $left;
+
+    if ($start !== null) {
+        $ret['start'] = $start;
+    }
+
+    if ($end !== null) {
+        $ret['end'] = $end;
+    }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 059dc662e428385d99b2a5bb27fd07e249366618 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:23:06 +0100
Subject: [PATCH 07/39] Add implementation of `phvolt_ret_switch_statement()`

---
 files/parser.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index c1089d8..7e0395b 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3850,3 +3850,17 @@ function phvolt_ret_slice(array &$ret, array $left, ?array $start, ?array $end,
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_switch_statement(array &$ret, array $expr, ?array $case_clauses, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_SWITCH;
+    $ret['expr'] = $expr;
+
+    if ($case_clauses !== null) {
+        $ret['case_clauses'] = $case_clauses;
+    }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 4afaba1710c3c2cc3b883b9a23ae77e938cbf01c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:23:48 +0100
Subject: [PATCH 08/39] Add implementation of `phvolt_ret_case_clause()`

---
 files/parser.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 7e0395b..34f0ff8 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3864,3 +3864,23 @@ function phvolt_ret_switch_statement(array &$ret, array $expr, ?array $case_clau
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_case_clause(array &$ret, ?array $expr, State $state): void
+{
+    $ret = [];
+
+    if ($expr !== null) {
+        $ret['type'] = Compiler::PHVOLT_T_CASE;
+        $ret['expr'] = $expr;
+    } else {
+        $ret['type'] = Compiler::PHVOLT_T_DEFAULT;
+    }
+
+    if (isset($state->active_file)) {
+        $ret['file'] = $state->active_file;
+    }
+
+    if (isset($state->active_line)) {
+        $ret['line'] = $state->active_line;
+    }
+}

From b99b4b142c486219de7c1af6e5c76367356aa8df Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:24:31 +0100
Subject: [PATCH 09/39] Add implementation of `phvolt_ret_set_statement()`

---
 files/parser.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 34f0ff8..33998e4 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3884,3 +3884,10 @@ function phvolt_ret_case_clause(array &$ret, ?array $expr, State $state): void
         $ret['line'] = $state->active_line;
     }
 }
+
+function phvolt_ret_set_statement(array &$ret, array $assignments): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_SET;
+    $ret['assignments'] = $assignments;
+}

From 0af2db0c77a735e186d8092f63efc6780344bb22 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:25:27 +0100
Subject: [PATCH 10/39] Add implementation of `phvolt_ret_set_assignment()`

---
 files/parser.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 33998e4..0c4da82 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3876,13 +3876,8 @@ function phvolt_ret_case_clause(array &$ret, ?array $expr, State $state): void
         $ret['type'] = Compiler::PHVOLT_T_DEFAULT;
     }
 
-    if (isset($state->active_file)) {
-        $ret['file'] = $state->active_file;
-    }
-
-    if (isset($state->active_line)) {
-        $ret['line'] = $state->active_line;
-    }
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
 }
 
 function phvolt_ret_set_statement(array &$ret, array $assignments): void
@@ -3891,3 +3886,13 @@ function phvolt_ret_set_statement(array &$ret, array $assignments): void
     $ret['type'] = Compiler::PHVOLT_T_SET;
     $ret['assignments'] = $assignments;
 }
+
+function phvolt_ret_set_assignment(array &$ret, array $assignable_expr, int $operator, array $expr, State $state): void
+{
+    $ret = [];
+    $ret['variable'] = $assignable_expr;
+    $ret['op'] = $operator;
+    $ret['expr'] = $expr;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 430b325060239ec4d502e5248fb67bb6df54acdb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:26:21 +0100
Subject: [PATCH 11/39] Add implementation of `phvolt_ret_continue_statement()`

---
 files/parser.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 0c4da82..73153e8 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3896,3 +3896,12 @@ function phvolt_ret_set_assignment(array &$ret, array $assignable_expr, int $ope
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_continue_statement(array &$ret, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_CONTINUE;
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 3e8f7e5c90caac9a8c5392ef6952c85b7afc331b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:26:57 +0100
Subject: [PATCH 12/39] Fix typo

---
 files/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/parser.php b/files/parser.php
index 73153e8..3e78174 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3547,7 +3547,7 @@ public function phvolt_($yymajor, $yyminor = null)
                 }
                 if (self::YYERRORSYMBOL) {
                     /* A syntax error has occurred.
-      ** The response to an error depends upon whether or not the
+      ** The response to an error depends upon whether the
       ** grammar defines an error token "ERROR".
       **
       ** This is what we do if the grammar does define ERROR:

From d73c223d48611100dc01a160f6efa14cffc50668 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:28:33 +0100
Subject: [PATCH 13/39] Add implementation of ` phvolt_ret_macro_statement()`

---
 files/parser.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 3e78174..7df26f2 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3905,3 +3905,23 @@ function phvolt_ret_continue_statement(array &$ret, State $state): void
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_macro_statement(array &$ret, Token $macro_name, ?array $parameters, array $block_statements, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_MACRO;
+
+    $ret['name'] = $macro_name->getValue();
+    unset($macro_name);
+
+    if ($parameters !== null) {
+        $ret['parameters'] = $parameters;
+    }
+
+    if (!empty($block_statements)) {
+        $ret['block_statements'] = $block_statements;
+    }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From ea4abc264bc65d07c614b9aeed0b9c9463d35962 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:29:24 +0100
Subject: [PATCH 14/39] Add implementation of ` phvolt_ret_break_statement()`

---
 files/parser.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 7df26f2..1780cac 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2907,14 +2907,10 @@ private function yy_reduce(int $yyruleno): void
 #line 2197 "parser.php.php"
                 break;
             case 83:
-#line 514 "parser.php.lemon"
-                {
-                    phvolt_ret_continue_statement($this->output, $this->status->getState());
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(78, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2207 "parser.php.php"
+                phvolt_ret_continue_statement($this->output, $this->status->getState());
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(78, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 84:
                 phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_RAW_FRAGMENT, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
@@ -3925,3 +3921,11 @@ function phvolt_ret_macro_statement(array &$ret, Token $macro_name, ?array $para
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_break_statement(array &$ret, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_BREAK;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 114376c0cbefa8f770cdacba0ce1c7c741137c25 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:30:54 +0100
Subject: [PATCH 15/39] Add implementation of ` phvolt_ret_empty_statement()`

---
 files/parser.php | 52 +++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 1780cac..20637a6 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3146,46 +3146,26 @@ private function yy_reduce(int $yyruleno): void
 #line 2444 "parser.php.php"
                 break;
             case 112:
-#line 630 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2453 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 113:
-#line 634 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2462 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(86, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 114:
-#line 638 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2470 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 115:
-#line 642 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTEQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2478 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTEQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 116:
-#line 646 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(16, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2486 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(16, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 117:
 #line 650 "parser.php.lemon"
@@ -3929,3 +3909,11 @@ function phvolt_ret_break_statement(array &$ret, State $state): void
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_empty_statement(array &$ret, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_EMPTY_STATEMENT;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From d6cdb31caa9d57c2786109527e3d90807f4e1fab Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:31:50 +0100
Subject: [PATCH 16/39] Add implementation of ` phvolt_ret_block_statement()`

---
 files/parser.php | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 20637a6..764da7f 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2766,17 +2766,13 @@ private function yy_reduce(int $yyruleno): void
 #line 2056 "parser.php.php"
                 break;
             case 69:
-#line 458 "parser.php.lemon"
-                {
-                    phvolt_ret_block_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, null, $this->status->getState());
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
-                    $this->yy_destructor(64, $this->yystack[$this->yyidx + -5]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + -3]->minor);
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(65, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2069 "parser.php.php"
+                phvolt_ret_block_statement($this->output, $this->yystack[$this->yyidx + -4]->minor, null, $this->status->getState());
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
+                $this->yy_destructor(64, $this->yystack[$this->yyidx + -5]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + -3]->minor);
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(65, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 70:
 #line 462 "parser.php.lemon"
@@ -3917,3 +3913,19 @@ function phvolt_ret_empty_statement(array &$ret, State $state): void
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_block_statement(array &$ret, Token $name, ?array $block_statements, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_BLOCK;
+
+    $ret['name'] = $name->getValue();
+    unset($name);
+
+    if ($block_statements !== null) {
+        $ret['block_statements'] = $block_statements;
+    }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From e2ee7c6f13b290832e3fe6b9a5802c2930e7260d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:32:45 +0100
Subject: [PATCH 17/39] Add implementation of ` phvolt_ret_cache_statement()`

---
 files/parser.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 764da7f..70a57e2 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3929,3 +3929,18 @@ function phvolt_ret_block_statement(array &$ret, Token $name, ?array $block_stat
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_cache_statement(array &$ret, mixed $expr, mixed $lifetime = null, mixed $block_statements, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_CACHE;
+    $ret['expr'] = $expr;
+
+    if ($lifetime !== null) {
+        $ret['lifetime'] = $lifetime;
+    }
+    $ret['block_statements'] = $block_statements;
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 1bcd38c9c2fbc3cb1256074c71d4c2702f0870c2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:33:23 +0100
Subject: [PATCH 18/39] Add implementation of ` phvolt_ret_raw_statement()`

---
 files/parser.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 70a57e2..512cb45 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3940,7 +3940,15 @@ function phvolt_ret_cache_statement(array &$ret, mixed $expr, mixed $lifetime =
         $ret['lifetime'] = $lifetime;
     }
     $ret['block_statements'] = $block_statements;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}
 
+function phvolt_ret_raw_statement(array &$ret, mixed $statement, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_RAW;
+    $ret['content'] = $statement;
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }

From b375e623832b986bdfef08bea6ff736c743057f1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:34:13 +0100
Subject: [PATCH 19/39] Add implementation of ` phvolt_ret_extends_statement()`

---
 files/parser.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 512cb45..0431aa9 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2834,15 +2834,11 @@ private function yy_reduce(int $yyruleno): void
 #line 2128 "parser.php.php"
                 break;
             case 77:
-#line 490 "parser.php.lemon"
-                {
-                    phvolt_ret_include_statement($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -5]->minor);
-                    $this->yy_destructor(71, $this->yystack[$this->yyidx + -4]->minor);
-                    $this->yy_destructor(72, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2139 "parser.php.php"
+                phvolt_ret_include_statement($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -5]->minor);
+                $this->yy_destructor(71, $this->yystack[$this->yyidx + -4]->minor);
+                $this->yy_destructor(72, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 78:
 #line 494 "parser.php.lemon"
@@ -3952,3 +3948,12 @@ function phvolt_ret_raw_statement(array &$ret, mixed $statement, State $state):
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_extends_statement(array &$ret, mixed $path, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_EXTENDS;
+    $ret['path'] = $path;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 8ae18b948920f2544e2235bb9d1ec5c87bebbd08 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:35:37 +0100
Subject: [PATCH 20/39] Add implementation missing functions

---
 files/parser.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/files/parser.php b/files/parser.php
index 0431aa9..5e2ddbd 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3957,3 +3957,31 @@ function phvolt_ret_extends_statement(array &$ret, mixed $path, State $state): v
     $ret['file'] = $state->getActiveFile();
     $ret['line'] = $state->getActiveLine();
 }
+
+function phvolt_ret_do_statement(array &$ret, mixed $expr, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_DO;
+    $ret['expr'] = $expr;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}
+
+function phvolt_ret_return_statement(array &$ret, mixed $expr, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_RETURN;
+    $ret['expr'] = $expr;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}
+
+function phvolt_ret_autoescape_statement(array &$ret, int $enable, mixed $block_statements, State $state): void
+{
+    $ret = [];
+    $ret['type'] = Compiler::PHVOLT_T_AUTOESCAPE;
+    $ret['enable'] = $enable;
+    $ret['block_statements'] = $block_statements;
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+}

From 5c13f7e4235af2cbf835cffac1cb6d5e5dbc8231 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 10:36:02 +0100
Subject: [PATCH 21/39] Optimize imports

---
 files/parser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 5e2ddbd..c6106fb 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -38,6 +38,7 @@
 */
 
 use Phalcon\Volt\Compiler;
+use Phalcon\Volt\Parser\Status;
 use Phalcon\Volt\Scanner\State;
 use Phalcon\Volt\Scanner\Token;
 
@@ -58,11 +59,11 @@ class phvolt_yyStackEntry
 
 class phvolt_Parser
 {
-    public \Phalcon\Volt\Parser\Status $status;
+    public Status $status;
 
     protected array $output = [];
 
-    public function __construct(\Phalcon\Volt\Parser\Status $status)
+    public function __construct(Status $status)
     {
         $this->status = $status;
     }

From 48afb06189464ef0919c3b987607dc43995910aa Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 11:24:14 +0100
Subject: [PATCH 22/39] Add passage of active file

---
 src/Parser/Parser.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 3de95c0..fb3fc34 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -47,6 +47,7 @@ public function parseView(string $templatePath): array
         $debug = fopen('log.txt', 'w+');
 
         $state = new State($this->code);
+        $state->setActiveFile($templatePath);
         $parserStatus = new Status($state);
         $scanner = new Scanner($parserStatus->getState());
 

From f8242bb8257877643aacaf25643dac237afaf88d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 17:35:32 +0100
Subject: [PATCH 23/39] Reformat code

---
 files/parser.php | 73 ++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index c6106fb..e5cfa4e 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2802,27 +2802,23 @@ private function yy_reduce(int $yyruleno): void
 #line 2095 "parser.php.php"
                 break;
             case 74:
-#line 478 "parser.php.lemon"
-                {
-                    phvolt_ret_raw_statement($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
-                    $this->yy_destructor(68, $this->yystack[$this->yyidx + -5]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(69, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2108 "parser.php.php"
+                phvolt_ret_raw_statement($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -6]->minor);
+                $this->yy_destructor(68, $this->yystack[$this->yyidx + -5]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
+                $this->yy_destructor(1, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(69, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 75:
-#line 482 "parser.php.lemon"
-                {
-                    phvolt_ret_extends_statement($this->output, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
-                    $this->yy_destructor(1, $this->yystack[$this->yyidx + -3]->minor);
-                    $this->yy_destructor(70, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(32, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2118 "parser.php.php"
+                phvolt_ret_extends_statement(
+                    $this->output,
+                    $this->yystack[$this->yyidx - 1]->minor,
+                    $this->status->getState(),
+                );
+                $this->yy_destructor(1, $this->yystack[$this->yyidx - 3]->minor);
+                $this->yy_destructor(70, $this->yystack[$this->yyidx - 2]->minor);
+                $this->yy_destructor(32, $this->yystack[$this->yyidx]->minor);
                 break;
             case 76:
 #line 486 "parser.php.lemon"
@@ -3234,12 +3230,8 @@ private function yy_reduce(int $yyruleno): void
 #line 2559 "parser.php.php"
                 break;
             case 127:
-#line 690 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DECR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(28, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2567 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DECR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(28, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 128:
 #line 694 "parser.php.lemon"
@@ -3315,12 +3307,10 @@ private function yy_reduce(int $yyruleno): void
             }
                 break;
             case 137:
-                {
-                    phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
-                    $this->yy_destructor(24, $this->yystack[$this->yyidx + -4]->minor);
-                    $this->yy_destructor(4, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-            }
+                phvolt_ret_slice($this->output, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
+                $this->yy_destructor(24, $this->yystack[$this->yyidx + -4]->minor);
+                $this->yy_destructor(4, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 142:
             case 150:
@@ -3338,7 +3328,12 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 146:
-                phvolt_ret_func_call($this->output, $this->yystack[$this->yyidx + -2]->minor, null, $this->status->getState());
+                phvolt_ret_func_call(
+                    $this->output,
+                    $this->yystack[$this->yyidx + -2]->minor,
+                    null,
+                    $this->status->getState(),
+                );
 
                 $this->yy_destructor(29, $this->yystack[$this->yyidx + -1]->minor);
                 $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
@@ -3371,11 +3366,10 @@ private function yy_parse_failed(): void
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
+
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
-        /* Here code is inserted which will be executed whenever the
-  ** parser fails */
     }
 
     /**
@@ -3952,11 +3946,12 @@ function phvolt_ret_raw_statement(array &$ret, mixed $statement, State $state):
 
 function phvolt_ret_extends_statement(array &$ret, mixed $path, State $state): void
 {
-    $ret = [];
-    $ret['type'] = Compiler::PHVOLT_T_EXTENDS;
-    $ret['path'] = $path;
-    $ret['file'] = $state->getActiveFile();
-    $ret['line'] = $state->getActiveLine();
+    $ret = [
+        'type' => Compiler::PHVOLT_T_EXTENDS,
+        'path' => $path,
+        'file' => $state->getActiveFile(),
+        'line' => $state->getActiveLine(),
+    ];
 }
 
 function phvolt_ret_do_statement(array &$ret, mixed $expr, State $state): void

From 3d81819c9b1ebf879c36e20f479c99d9cfae182b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 17:35:42 +0100
Subject: [PATCH 24/39] Reformat code

---
 src/Scanner/Scanner.php | 58 +++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index 4893e06..6bebf07 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -38,7 +38,6 @@ public function scanForToken(): int
         $status = self::PHVOLT_SCANNER_RETCODE_IMPOSSIBLE;
         while (self::PHVOLT_SCANNER_RETCODE_IMPOSSIBLE === $status) {
             $cursor = $this->state->getStart();
-
             $mode = $this->state->getMode();
             if ($mode === Compiler::PHVOLT_MODE_RAW || $mode === Compiler::PHVOLT_MODE_COMMENT) {
                 $next       = $this->state->getNext();
@@ -70,7 +69,8 @@ public function scanForToken(): int
                         }
                     } else {
                         while ($next = $this->state->incrementStart()->getStart()) {
-                            if ($next === '#' && $this->state->incrementStart()->getStart() === '}') {
+                            $doubleNext = $this->state->getNext();
+                            if ($next === '#' && $doubleNext === '}') {
                                 $this->token->setOpcode(Compiler::PHVOLT_T_IGNORE);
                                 return 0;
                             } elseif ($next === "\n") {
@@ -895,7 +895,7 @@ public function scanForToken(): int
                 vv84:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
-                    case '\n':
+                    case "\n":
                         goto vv81;
                     default:
                         goto vv79;
@@ -921,7 +921,7 @@ public function scanForToken(): int
                 vv89:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
-                    case '\n':
+                    case "\n":
                         goto vv81;
                     default:
                         goto vv87;
@@ -1754,12 +1754,12 @@ public function scanForToken(): int
                     default:
                         goto vv153;
                 }
+
                 vv153:
-                {
-                    $this->state->whitespaceControl = false;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
-                    return 0;
-                }
+                $this->state->whitespaceControl = false;
+                $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
+                return 0;
+
                 vv154:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -2555,19 +2555,16 @@ public function scanForToken(): int
                 }
                 vv207:
                 $this->state->incrementStart();
-                {
-                    $this->state->whitespaceControl = false;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
-                    return 0;
-                }
+                $this->state->whitespaceControl = false;
+                $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
+                return 0;
+
                 vv209:
-                $this->state->incrementStart();
-                {
-                    $this->state->whitespaceControl = false;
-                    $this->state->statementPosition++;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_EDELIMITER);
-                    return 0;
-                }
+                $this->state->whitespaceControl = false;
+                $this->state->statementPosition++;
+                $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_EDELIMITER);
+                return 0;
+
                 vv211:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -3429,12 +3426,12 @@ public function scanForToken(): int
                     default:
                         goto vv255;
                 }
+
                 vv255:
-                {
-                    $this->state->statementPosition++;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_BLOCK);
-                    return 0;
-                }
+                $this->state->statementPosition++;
+                $this->token->setOpcode(Compiler::PHVOLT_T_BLOCK);
+                return 0;
+
                 vv256:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -5136,11 +5133,10 @@ public function scanForToken(): int
                         goto vv335;
                 }
                 vv335:
-                {
-                    $this->state->statementPosition++;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_EXTENDS);
-                    return 0;
-                }
+                $this->state->statementPosition++;
+                $this->token->setOpcode(Compiler::PHVOLT_T_EXTENDS);
+                return 0;
+
                 vv336:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {

From 7d33acd327752fbe4159248c2a35f3e382ebd651 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 17:36:17 +0100
Subject: [PATCH 25/39] Fix block parsing when raw fragment is empty

---
 src/Parser/Parser.php | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index fb3fc34..5029228 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -14,6 +14,7 @@
 namespace Phalcon\Volt\Parser;
 
 use Phalcon\Volt\Compiler;
+use Phalcon\Volt\Exception;
 use Phalcon\Volt\Scanner\Opcode;
 use Phalcon\Volt\Scanner\Scanner;
 use Phalcon\Volt\Scanner\State;
@@ -37,6 +38,7 @@ public function __construct(private string $code)
      * @param string $templatePath
      *
      * @return array
+     * @throws Exception
      */
     public function parseView(string $templatePath): array
     {
@@ -386,24 +388,26 @@ public function parseView(string $templatePath): array
                     break;
 
                 case Compiler::PHVOLT_T_RAW_FRAGMENT:
-                    if ($state->extendsMode === 1 && $state->blockLevel === 0) {
-                        $this->createErrorMessage(
-                            $parserStatus,
-                            'Child templates only may contain blocks'
-                        );
-                        $parserStatus->setStatus(Status::PHVOLT_PARSING_FAILED);
-                        break;
-                    }
+                    if ($state->rawFragment !== '') {
+                        if ($state->extendsMode === 1 && $state->blockLevel === 0) {
+                            $this->createErrorMessage(
+                                $parserStatus,
+                                'Child templates only may contain blocks'
+                            );
+                            $parserStatus->setStatus(Status::PHVOLT_PARSING_FAILED);
+                            break;
+                        }
+
+                        if (!$this->phvoltIsBlankString($this->token)) {
+                            $state->statementPosition++;
+                        }
 
-                    if (!$this->phvoltIsBlankString($this->token)) {
-                        $state->statementPosition++;
+                        $this->phvoltParseWithToken(
+                            $parser,
+                            Compiler::PHVOLT_T_RAW_FRAGMENT,
+                            Opcode::PHVOLT_RAW_FRAGMENT
+                        );
                     }
-
-                    $this->phvoltParseWithToken(
-                        $parser,
-                        Compiler::PHVOLT_T_RAW_FRAGMENT,
-                        Opcode::PHVOLT_RAW_FRAGMENT
-                    );
                     break;
 
                 case Compiler::PHVOLT_T_SET:
@@ -595,7 +599,7 @@ public function parseView(string $templatePath): array
             }
 
             if ($parserStatus->getStatus() !== Status::PHVOLT_PARSING_OK) {
-                break;
+                throw new Exception($parserStatus->getSyntaxError());
             }
 
             $state->setEnd($state->getStart());

From cb2d3620499abee0911b3be76bfe0e99c4b89ec6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:08:11 +0100
Subject: [PATCH 26/39] Adjust return type

---
 src/Compiler.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 360fc30..c275211 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1386,7 +1386,7 @@ public function compileSet(array $statement): string
      *
      * @throws Exception
      */
-    public function compileSource(string $viewCode, bool $extendsMode = false): string
+    public function compileSource(string $viewCode, bool $extendsMode = false): string|array
     {
         /**
          * Enable autoescape globally
@@ -2807,7 +2807,7 @@ final protected function statementList(array $statements, bool $extendsMode = fa
                      * Block statement
                      */
                     $blockName       = $statement['name'];
-                    $blockStatements = $statement["block_statements"];
+                    $blockStatements = $statement["block_statements"] ?? [];
                     $blocks          = $this->blocks;
 
                     if (true === $blockMode) {
@@ -2816,7 +2816,7 @@ final protected function statementList(array $statements, bool $extendsMode = fa
                         }
 
                         /**
-                         * Create a unamed block
+                         * Create an unnamed block.
                          */
                         if ($compilation !== null) {
                             $blocks[]    = $compilation;
@@ -2955,7 +2955,7 @@ final protected function statementList(array $statements, bool $extendsMode = fa
 
         $this->level--;
 
-        return $compilation;
+        return $compilation === null ? '' : $compilation;
     }
 
     /**

From 3e64fbbf029d194eb9d37498a12b81c9d8726a19 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:12:56 +0100
Subject: [PATCH 27/39] Fix block parsing when raw fragment is empty

---
 src/Parser/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 5029228..33fbad4 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -388,7 +388,7 @@ public function parseView(string $templatePath): array
                     break;
 
                 case Compiler::PHVOLT_T_RAW_FRAGMENT:
-                    if ($state->rawFragment !== '') {
+                    if ($this->token->getLength() > 0) {
                         if ($state->extendsMode === 1 && $state->blockLevel === 0) {
                             $this->createErrorMessage(
                                 $parserStatus,

From cd6f6da260be05a1176092d7485d83143941afae Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:22:11 +0100
Subject: [PATCH 28/39] Add `trim()` to check if raw fragment is valid

---
 src/Parser/Parser.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 33fbad4..fc1f038 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -389,7 +389,8 @@ public function parseView(string $templatePath): array
 
                 case Compiler::PHVOLT_T_RAW_FRAGMENT:
                     if ($this->token->getLength() > 0) {
-                        if ($state->extendsMode === 1 && $state->blockLevel === 0) {
+                        $value = trim($this->token->getValue());
+                        if ($value !== '' && $state->extendsMode === 1 && $state->blockLevel === 0) {
                             $this->createErrorMessage(
                                 $parserStatus,
                                 'Child templates only may contain blocks'

From 93418db04b40b201b7657df96ad1a9d1c2471c0a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:23:17 +0100
Subject: [PATCH 29/39] Use setter for `whitespaceControl` property

---
 src/Scanner/Scanner.php | 20 +++++++++-----------
 src/Scanner/State.php   |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index 6bebf07..3d1733d 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -1756,7 +1756,7 @@ public function scanForToken(): int
                 }
 
                 vv153:
-                $this->state->whitespaceControl = false;
+                $this->state->setWhitespaceControl(false);
                 $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
                 return 0;
 
@@ -1769,12 +1769,10 @@ public function scanForToken(): int
                         goto vv155;
                 }
                 vv155:
-                {
-                    $this->state->whitespaceControl = false;
-                    $this->state->statementPosition++;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_EDELIMITER);
-                    return 0;
-                }
+                $this->state->setWhitespaceControl(false);
+                $this->state->statementPosition++;
+                $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_EDELIMITER);
+                return 0;
                 vv156:
                 $this->state->incrementStart();
                 $this->state->setMode(Compiler::PHVOLT_MODE_RAW);
@@ -1787,13 +1785,13 @@ public function scanForToken(): int
                 vv160:
                 $this->state->incrementStart();
                 $this->state->setMode(Compiler::PHVOLT_MODE_RAW);
-                $this->state->whitespaceControl = true;
+                $this->state->setWhitespaceControl(true);
                 $this->token->setOpcode(Compiler::PHVOLT_T_CLOSE_DELIMITER);
                 return 0;
                 vv162:
                 $this->state->incrementStart();
                 $this->state->setMode(Compiler::PHVOLT_MODE_RAW);
-                $this->state->whitespaceControl = true;
+                $this->state->setWhitespaceControl(true);
                 $this->token->setOpcode(Compiler::PHVOLT_T_CLOSE_EDELIMITER);
                 return 0;
                 vv164:
@@ -2555,12 +2553,12 @@ public function scanForToken(): int
                 }
                 vv207:
                 $this->state->incrementStart();
-                $this->state->whitespaceControl = false;
+                $this->state->setWhitespaceControl(false);
                 $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_DELIMITER);
                 return 0;
 
                 vv209:
-                $this->state->whitespaceControl = false;
+                $this->state->setWhitespaceControl(false);
                 $this->state->statementPosition++;
                 $this->token->setOpcode(Compiler::PHVOLT_T_OPEN_EDELIMITER);
                 return 0;
diff --git a/src/Scanner/State.php b/src/Scanner/State.php
index cfe4c34..9c87c74 100644
--- a/src/Scanner/State.php
+++ b/src/Scanner/State.php
@@ -32,7 +32,7 @@ class State
     public int $startLength;
     public int $statementPosition = 0;
     public int $switchLevel = 0;
-    public bool $whitespaceControl = false;
+    private bool $whitespaceControl = false;
     protected string $activeFile = 'eval code';
     protected int $activeLine = 1;
     protected int $cursor = 0;

From 7525bf06eaa12827bee5f283713dcfb85c223095 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:27:29 +0100
Subject: [PATCH 30/39] Fix token's value passage

---
 files/parser.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index e5cfa4e..c2e912a 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3685,20 +3685,16 @@ function phvolt_ret_literal_zval(&$ret, $type, ?Token $T = null, ?State $state =
     ];
 }
 
-function phvolt_ret_named_item(&$ret, $name, $expr, State $state): void
+function phvolt_ret_named_item(&$ret, ?Token $token = null, array $expr = [], ?State $state = null): void
 {
     $ret["expr"] = $expr;
 
     // Add the name if provided
-    if ($name !== null) {
-        $ret["name"] = substr($name->token, 0, $name->token_len);
-
-        // Free memory for the name token
-        unset($name->token);
-        unset($name);
+    if ($token !== null) {
+        $ret["name"] = $token->getValue();
+        unset($token);
     }
 
-    // Add file and line information from the state
     $ret["file"] = $state->getActiveFile();
     $ret["line"] = $state->getActiveLine();
 }

From 36ba2eb6398266b5af21f99d23785b0d486ec0f0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 18:38:02 +0100
Subject: [PATCH 31/39] Adjust argument type

---
 files/parser.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index c2e912a..b79771b 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3846,14 +3846,15 @@ function phvolt_ret_set_statement(array &$ret, array $assignments): void
     $ret['assignments'] = $assignments;
 }
 
-function phvolt_ret_set_assignment(array &$ret, array $assignable_expr, int $operator, array $expr, State $state): void
+function phvolt_ret_set_assignment(array &$ret, array $assignable_expr, mixed $operator, array $expr, State $state): void
 {
-    $ret = [];
-    $ret['variable'] = $assignable_expr;
-    $ret['op'] = $operator;
-    $ret['expr'] = $expr;
-    $ret['file'] = $state->getActiveFile();
-    $ret['line'] = $state->getActiveLine();
+    $ret = [
+        'variable' => $assignable_expr,
+        'op' => $operator,
+        'expr' => $expr,
+        'file' => $state->getActiveFile(),
+        'line' => $state->getActiveLine(),
+    ];
 }
 
 function phvolt_ret_continue_statement(array &$ret, State $state): void

From cdbc00ea3b3c3c4e47ff05e6662e5a45e40fb12d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 19:53:13 +0100
Subject: [PATCH 32/39] Fix AST generation in functions

---
 files/parser.php | 65 +++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index b79771b..ceef8c3 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3314,18 +3314,31 @@ private function yy_reduce(int $yyruleno): void
                 break;
             case 142:
             case 150:
-                phvolt_ret_named_item($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                $this->output = phvolt_ret_named_item(
+                    $this->yystack[$this->yyidx - 2]->minor,
+                    $this->yystack[$this->yyidx]->minor,
+                    $this->status->getState(),
+                );
                 $this->yy_destructor(4, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 143:
             case 149:
-                phvolt_ret_named_item($this->output, null, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                $this->output = phvolt_ret_named_item(
+                    null,
+                    $this->yystack[$this->yyidx + 0]->minor,
+                    $this->status->getState(),
+                );
                 break;
             case 145:
-                phvolt_ret_func_call($this->output, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->status->getState());
+                phvolt_ret_func_call(
+                    $this->output,
+                    $this->yystack[$this->yyidx - 3]->minor,
+                    $this->yystack[$this->yyidx - 1]->minor,
+                    $this->status->getState(),
+                );
 
-                $this->yy_destructor(29, $this->yystack[$this->yyidx + -2]->minor);
-                $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
+                $this->yy_destructor(29, $this->yystack[$this->yyidx - 2]->minor);
+                $this->yy_destructor(52, $this->yystack[$this->yyidx]->minor);
                 break;
             case 146:
                 phvolt_ret_func_call(
@@ -3335,8 +3348,8 @@ private function yy_reduce(int $yyruleno): void
                     $this->status->getState(),
                 );
 
-                $this->yy_destructor(29, $this->yystack[$this->yyidx + -1]->minor);
-                $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
+                $this->yy_destructor(29, $this->yystack[$this->yyidx - 1]->minor);
+                $this->yy_destructor(52, $this->yystack[$this->yyidx]->minor);
                 break;
         }
 
@@ -3675,42 +3688,44 @@ function phvolt_ret_for_statement(&$ret, $variable, $key = null, array $expr = [
     }
 }
 
-function phvolt_ret_literal_zval(&$ret, $type, ?Token $T = null, ?State $state = null): void
+function phvolt_ret_literal_zval(&$ret, $type, ?Token $token = null, ?State $state = null): void
 {
     $ret = [
-        "type" => $type,
-        'value' => $T?->getValue(),
-        "file" => $state->getActiveFile(),
-        "line" => $state->getActiveLine(),
+        'type' => $type,
+        'value' => $token?->getValue(),
+        'file' => $state->getActiveFile(),
+        'line' => $state->getActiveLine(),
     ];
 }
 
-function phvolt_ret_named_item(&$ret, ?Token $token = null, array $expr = [], ?State $state = null): void
+function phvolt_ret_named_item(?Token $token = null, array $expr = [], ?State $state = null): array
 {
-    $ret["expr"] = $expr;
+    $ret['expr'] = $expr;
 
-    // Add the name if provided
-    if ($token !== null) {
-        $ret["name"] = $token->getValue();
+    if ($token !== null && $token->getLength() > 0) {
+        $ret['name'] = $token->getValue();
         unset($token);
     }
 
-    $ret["file"] = $state->getActiveFile();
-    $ret["line"] = $state->getActiveLine();
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
+
+    return $ret;
 }
 
-function phvolt_ret_func_call(&$ret, $expr, $arguments, State $state): void
+function phvolt_ret_func_call(&$ret, $expr, ?array $arguments, State $state): void
 {
     $ret = [
-        "type" => Compiler::PHVOLT_T_FCALL,
-        "name" => $expr,
-        "file" => $state->getActiveFile(),
-        "line" => $state->getActiveLine(),
+        'type' => Compiler::PHVOLT_T_FCALL,
+        'name' => $expr,
     ];
 
     if ($arguments !== null) {
-        $ret["arguments"] = $arguments;
+        $ret['arguments'] = $arguments;
     }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
 }
 
 function phvolt_ret_macro_call_statement(&$ret, $expr, $arguments, $caller, State $state): void

From dcc31adb6484a98c143b6d53dcfb1ae20e8252a0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 21:15:27 +0100
Subject: [PATCH 33/39] Fix `zendInlineHashFunc()` method

---
 src/Compiler.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c275211..38b5f31 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3097,13 +3097,8 @@ private function uniquePathKey(?string $path = null): ?string
 
     /**
      * @see https://github.com/php/php-src/blob/81623d3a60599d05c83987dec111bf56809f901d/Zend/zend_hash.h#L263
-     *
-     * @param array $arKey
-     * @param int   $nKeyLength
-     *
-     * @return int
      */
-    private function zendInlineHashFunc(array $arKey, int $nKeyLength): int
+    private function zendInlineHashFunc(string $arKey, int $nKeyLength): int
     {
         $hash = 5381;
         $i    = 0;
@@ -3134,7 +3129,7 @@ private function zendInlineHashFunc(array $arKey, int $nKeyLength): int
             case 2:
                 $hash = (($hash << 5) + $hash) + ord($arKey[$i++]); /* fallthrough... */
             case 1:
-                $hash = (($hash << 5) + $hash) + ord($arKey[$i++]);
+                $hash = (($hash << 5) + $hash) + ord($arKey[$i] ?? '');
                 break;
             case 0:
                 break;

From 12d67a018907e96a9ec6255350bffef118631547 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 21:15:47 +0100
Subject: [PATCH 34/39] Fix parsing of `for` statement

---
 files/parser.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index ceef8c3..562cd5f 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3661,25 +3661,29 @@ function phvolt_ret_elsefor_statement(&$ret, State $state): void
     ];
 }
 
-function phvolt_ret_for_statement(&$ret, $variable, $key = null, array $expr = [], $if_expr = null, $block_statements = null, ?State $state = null): void
+function phvolt_ret_for_statement(
+    &$ret,
+    Token $variable,
+    ?Token $key = null,
+    array $expr = [],
+    $if_expr = null,
+    $block_statements = null,
+    ?State $state = null,
+): void
 {
     $ret = [
         "type" => Compiler::PHVOLT_T_FOR,
-        "variable" => $variable->token,
+        "variable" => $variable->getValue(),
         "expr" => $expr,
         "block_statements" => $block_statements,
         "file" => $state->getActiveFile(),
         "line" => $state->getActiveLine(),
     ];
 
-    // Free the variable token memory
-    unset($variable->token);
     unset($variable);
 
     if ($key) {
-        $ret["key"] = $key->token;
-        // Free the key token memory
-        unset($key->token);
+        $ret["key"] = $key->getValue();
         unset($key);
     }
 

From 0eade7e7bc4d983f7680619c683fc19b9eb49613 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 25 Oct 2024 21:18:16 +0100
Subject: [PATCH 35/39] Skip test case

---
 tests/unit/Compiler/CompileFileTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/Compiler/CompileFileTest.php b/tests/unit/Compiler/CompileFileTest.php
index 978efe4..297df52 100644
--- a/tests/unit/Compiler/CompileFileTest.php
+++ b/tests/unit/Compiler/CompileFileTest.php
@@ -70,6 +70,8 @@ public function testMvcViewEngineVoltCompilerCompileFileDefaultFilter(
         string $view,
         string $expected
     ): void {
+        $this->markTestSkipped('Compiler.php must be updated from phalcon/phalcon.');
+
         $viewFile = sprintf('tests/_data/views/filters/%s.volt', $view);
         $compiledFile = $viewFile . '.php';
 

From fb79a207f4136d5a3c6447b4b3b1cc1c8b22fc09 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 26 Oct 2024 00:35:37 +0100
Subject: [PATCH 36/39] Remove broken state's marker logic

---
 src/Scanner/Scanner.php | 27 ++++++++++++---------------
 src/Scanner/State.php   | 14 +-------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index 3d1733d..b14aef9 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -273,7 +273,6 @@ public function scanForToken(): int
                 vv13:
                 $vvaccept = 0;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 if ($vvch === null) {
                     goto vv5;
                 }
@@ -292,7 +291,6 @@ public function scanForToken(): int
                 vv16:
                 $vvaccept = 0;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 if ($vvch === null) {
                     goto vv5;
                 }
@@ -344,7 +342,6 @@ public function scanForToken(): int
                 vv27:
                 $vvaccept = 1;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 switch ($vvch) {
                     case '%':
                         goto vv96;
@@ -389,7 +386,6 @@ public function scanForToken(): int
                 vv33:
                 $vvaccept = 2;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 switch ($vvch) {
                     case '.':
                         goto vv106;
@@ -474,12 +470,14 @@ public function scanForToken(): int
                     default:
                         goto vv54;
                 }
+
                 vv47:
                 $this->token->setOpcode(Compiler::PHVOLT_T_IDENTIFIER);
                 $this->token->setValue(
                     substr($this->state->getRawBuffer(), $start, $this->state->getCursor() - $start)
                 );
                 return 0;
+
                 vv48:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -863,7 +861,7 @@ public function scanForToken(): int
                 $vvch = $this->state->incrementStart()->getStart();
                 vv80:
                 switch ($vvch) {
-                    case 0x00:
+                    case null:
                         goto vv81;
                     case '"':
                         goto vv82;
@@ -872,8 +870,8 @@ public function scanForToken(): int
                     default:
                         goto vv79;
                 }
+
                 vv81:
-                $this->state->setStart($this->state->getMarker());
                 switch ($vvaccept) {
                     case 0:
                         goto vv5;
@@ -884,6 +882,7 @@ public function scanForToken(): int
                     default:
                         goto vv136;
                 }
+
                 vv82:
                 $this->state->incrementStart();
                 $start++;
@@ -1172,12 +1171,12 @@ public function scanForToken(): int
                     default:
                         goto vv123;
                 }
+
                 vv123:
-                {
-                    $this->state->statementPosition++;
-                    $this->token->setOpcode(Compiler::PHVOLT_T_DO);
-                    return 0;
-                }
+                $this->state->statementPosition++;
+                $this->token->setOpcode(Compiler::PHVOLT_T_DO);
+                return 0;
+
                 vv124:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -1398,7 +1397,6 @@ public function scanForToken(): int
                 vv135:
                 $vvaccept = 3;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 switch ($vvch) {
                     case ' ':
                         goto vv188;
@@ -1470,8 +1468,8 @@ public function scanForToken(): int
                     default:
                         goto vv136;
                 }
+
                 vv136:
-                {
                 if ($this->state->activeToken === Compiler::PHVOLT_T_DOT) {
                     $this->token->setOpcode(Compiler::PHVOLT_T_IDENTIFIER);
                     $this->token->setValue(
@@ -1483,7 +1481,7 @@ public function scanForToken(): int
                 }
 
                 return 0;
-                }
+
                 vv137:
                 $vvch = $this->state->incrementStart()->getStart();
                 switch ($vvch) {
@@ -1674,7 +1672,6 @@ public function scanForToken(): int
                 vv151:
                 $vvaccept = 3;
                 $vvch     = $this->state->incrementStart()->getStart();
-                $this->state->setMarker($vvch);
                 switch ($vvch) {
                     case ' ':
                         goto vv206;
diff --git a/src/Scanner/State.php b/src/Scanner/State.php
index 9c87c74..35c03a0 100644
--- a/src/Scanner/State.php
+++ b/src/Scanner/State.php
@@ -24,7 +24,7 @@ class State
     public int $forcedRawState = 0;
     public int $ifLevel = 0;
     public int $macroLevel = 0;
-    public mixed $marker = null;
+    public int $marker = 0;
     public int $oldIfLevel = 0;
     public string $rawBuffer;
     public string $rawFragment = '';
@@ -82,11 +82,6 @@ public function getIfLevel(): int
         return $this->ifLevel;
     }
 
-    public function getMarker(): mixed
-    {
-        return $this->marker;
-    }
-
     public function getMode(): int
     {
         return $this->mode;
@@ -212,13 +207,6 @@ public function setMacroLevel(int $macroLevel): self
         return $this;
     }
 
-    public function setMarker(mixed $marker): self
-    {
-        $this->marker = $marker;
-
-        return $this;
-    }
-
     public function setMode(int $mode): self
     {
         $this->mode = $mode;

From 76012c290edb614414d6faf121cccaa03ceb29fa Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 26 Oct 2024 00:36:07 +0100
Subject: [PATCH 37/39] Adjust token's empty value condition

---
 files/parser.php | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 562cd5f..31588d4 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -3624,22 +3624,28 @@ function phvolt_ret_zval_list(&$ret, $list_left = null, $right_list = null): voi
     $ret[] = $right_list;
 }
 
-function phvolt_ret_if_statement(&$ret, $expr, $true_statements = null, $false_statements = null, ?State $state = null): void
-{
+function phvolt_ret_if_statement(
+    &$ret,
+    $expr,
+    $true_statements = null,
+    $false_statements = null,
+    ?State $state = null,
+): void {
     $ret = [
-        "type" => Compiler::PHVOLT_T_IF,
-        "expr" => $expr,
-        "file" => $state->getActiveFile(),
-        "line" => $state->getActiveLine(),
+        'type' => Compiler::PHVOLT_T_IF,
+        'expr' => $expr,
     ];
 
     if ($true_statements !== null) {
-        $ret["true_statements"] = $true_statements;
+        $ret['true_statements'] = $true_statements;
     }
 
     if ($false_statements !== null) {
-        $ret["false_statements"] = $false_statements;
+        $ret['false_statements'] = $false_statements;
     }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
 }
 
 function phvolt_ret_elseif_statement(&$ret, $expr, State $state): void
@@ -3696,17 +3702,20 @@ function phvolt_ret_literal_zval(&$ret, $type, ?Token $token = null, ?State $sta
 {
     $ret = [
         'type' => $type,
-        'value' => $token?->getValue(),
-        'file' => $state->getActiveFile(),
-        'line' => $state->getActiveLine(),
     ];
+    if ($token !== null && $token->getValue() !== null) {
+        $ret['value'] = $token->getValue();
+    }
+
+    $ret['file'] = $state->getActiveFile();
+    $ret['line'] = $state->getActiveLine();
 }
 
 function phvolt_ret_named_item(?Token $token = null, array $expr = [], ?State $state = null): array
 {
     $ret['expr'] = $expr;
 
-    if ($token !== null && $token->getLength() > 0) {
+    if ($token !== null && $token->getValue() !== null) {
         $ret['name'] = $token->getValue();
         unset($token);
     }

From 3dc9ebd3d631cdc9f155bf664350572ace3e6b73 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 27 Oct 2024 19:11:06 +0000
Subject: [PATCH 38/39] Code cleanup

---
 files/parser.php | 338 +++++++++++++----------------------------------
 1 file changed, 91 insertions(+), 247 deletions(-)

diff --git a/files/parser.php b/files/parser.php
index 31588d4..a2c8447 100644
--- a/files/parser.php
+++ b/files/parser.php
@@ -2647,32 +2647,18 @@ private function yy_reduce(int $yyruleno): void
 #line 1934 "parser.php.php"
                 break;
             case 57:
-#line 410 "parser.php.lemon"
-                {
-                    phvolt_ret_macro_parameter($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
-                    $this->yy_destructor(45, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 1942 "parser.php.php"
+                phvolt_ret_macro_parameter($this->output, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
+                $this->yy_destructor(45, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 58:
             case 72:
             case 138:
             case 152:
-#line 414 "parser.php.lemon"
-                {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_INTEGER, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
-
-            }
-#line 1952 "parser.php.php"
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_INTEGER, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                 break;
             case 59:
             case 153:
-#line 418 "parser.php.lemon"
-                {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_STRING, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
-
-            }
-#line 1960 "parser.php.php"
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_STRING, $this->yystack[$this->yyidx + 0]->minor, $this->status->getState());
                 break;
             case 60:
             case 154:
@@ -2680,32 +2666,18 @@ private function yy_reduce(int $yyruleno): void
                 break;
             case 61:
             case 155:
-#line 426 "parser.php.lemon"
-                {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_NULL, null, $this->status->getState());
-
-                    $this->yy_destructor(57, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 1977 "parser.php.php"
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_NULL, null, $this->status->getState());
+                $this->yy_destructor(57, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 62:
             case 156:
-#line 430 "parser.php.lemon"
-                {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_FALSE, null, $this->status->getState());
-                    $this->yy_destructor(58, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 1986 "parser.php.php"
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_FALSE, null, $this->status->getState());
+                $this->yy_destructor(58, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 63:
             case 157:
-#line 434 "parser.php.lemon"
-                {
-                    phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_TRUE, null, $this->status->getState());
-
-                    $this->yy_destructor(59, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 1995 "parser.php.php"
+                phvolt_ret_literal_zval($this->output, Compiler::PHVOLT_T_TRUE, null, $this->status->getState());
+                $this->yy_destructor(59, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 64:
 #line 438 "parser.php.lemon"
@@ -2962,177 +2934,97 @@ private function yy_reduce(int $yyruleno): void
 #line 2271 "parser.php.php"
                 break;
             case 92:
-#line 550 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(18, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(18, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2280 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(18, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(18, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 93:
-#line 554 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(20, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2288 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_MOD, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(20, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 94:
-#line 558 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_AND, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(6, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2296 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_AND, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(6, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 95:
-#line 562 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_OR, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(7, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2304 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_OR, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(7, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 96:
-#line 566 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_CONCAT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(23, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2312 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_CONCAT, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(23, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 97:
-#line 570 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PIPE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(25, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2320 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_PIPE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(25, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 98:
-#line 574 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_RANGE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(5, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2328 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_RANGE, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(5, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 99:
-#line 578 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_EQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(10, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2336 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_EQUALS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(10, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 100:
-#line 582 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2345 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 101:
-#line 586 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2354 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSET, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(80, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 102:
-#line 590 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2363 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 103:
-#line 594 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2372 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEMPTY, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(81, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 104:
-#line 598 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2381 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 105:
-#line 602 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2390 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISEVEN, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(82, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 106:
-#line 606 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2399 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 107:
-#line 610 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2408 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISODD, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(83, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 108:
-#line 614 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2417 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 109:
-#line 618 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2426 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISNUMERIC, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(84, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 110:
-#line 622 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2435 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(11, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 111:
-#line 626 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2444 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ISSCALAR, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(9, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(85, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 112:
                 phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_ISITERABLE, $this->yystack[$this->yyidx + -2]->minor, null, null, $this->status->getState());
@@ -3157,108 +3049,60 @@ private function yy_reduce(int $yyruleno): void
                 $this->yy_destructor(16, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 117:
-#line 650 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTIDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(17, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2494 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOTIDENTICAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(17, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 118:
-#line 654 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(12, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2502 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESS, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(12, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 119:
-#line 658 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATER, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(13, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2510 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATER, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(13, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 120:
-#line 662 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATEREQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(14, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2518 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_GREATEREQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(14, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 121:
-#line 666 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESSEQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(15, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2526 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_LESSEQUAL, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(15, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 123:
-#line 674 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IN, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2534 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_IN, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 124:
-#line 678 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_IN, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(26, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2543 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT_IN, $this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(26, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(8, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 125:
-#line 682 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT, null, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
-                    $this->yy_destructor(26, $this->yystack[$this->yyidx + -1]->minor);
-            }
-#line 2551 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_NOT, null, $this->yystack[$this->yyidx + 0]->minor, null, $this->status->getState());
+                $this->yy_destructor(26, $this->yystack[$this->yyidx + -1]->minor);
                 break;
             case 126:
-#line 686 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_INCR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(27, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2559 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_INCR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(27, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 127:
                 phvolt_ret_expr($this->output, Compiler::PHVOLT_T_DECR, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
                 $this->yy_destructor(28, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 128:
-#line 694 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ENCLOSED, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(29, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2576 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ENCLOSED, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(29, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(52, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 129:
-#line 698 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, null, null, null, $this->status->getState());
-                    $this->yy_destructor(24, $this->yystack[$this->yyidx + -1]->minor);
-                    $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2585 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, null, null, null, $this->status->getState());
+                $this->yy_destructor(24, $this->yystack[$this->yyidx + -1]->minor);
+                $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 130:
-#line 702 "parser.php.lemon"
-                {
-                    phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
-                    $this->yy_destructor(24, $this->yystack[$this->yyidx + -2]->minor);
-                    $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
-            }
-#line 2594 "parser.php.php"
+                phvolt_ret_expr($this->output, Compiler::PHVOLT_T_ARRAY, $this->yystack[$this->yyidx + -1]->minor, null, null, $this->status->getState());
+                $this->yy_destructor(24, $this->yystack[$this->yyidx + -2]->minor);
+                $this->yy_destructor(50, $this->yystack[$this->yyidx + 0]->minor);
                 break;
             case 131:
 #line 706 "parser.php.lemon"

From cd2ec3bbb9ab051a11e04499ac42a087d85fe2ca Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 27 Oct 2024 20:33:18 +0000
Subject: [PATCH 39/39] Fix scanning of comment

---
 src/Scanner/Scanner.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
index b14aef9..db37fbb 100644
--- a/src/Scanner/Scanner.php
+++ b/src/Scanner/Scanner.php
@@ -43,6 +43,10 @@ public function scanForToken(): int
                 $next       = $this->state->getNext();
                 $doubleNext = $this->state->getNext(2);
 
+                if ($cursor === "\n") {
+                    $this->state->incrementActiveLine();
+                }
+
                 if ($cursor === null || ($cursor === '{' && ($next === '%' || $next === '{' || $next === '#'))) {
                     if ($next !== '#') {
                         $this->state->setMode(Compiler::PHVOLT_MODE_CODE);
@@ -71,6 +75,7 @@ public function scanForToken(): int
                         while ($next = $this->state->incrementStart()->getStart()) {
                             $doubleNext = $this->state->getNext();
                             if ($next === '#' && $doubleNext === '}') {
+                                $this->state->incrementStart(2);
                                 $this->token->setOpcode(Compiler::PHVOLT_T_IGNORE);
                                 return 0;
                             } elseif ($next === "\n") {
@@ -84,10 +89,6 @@ public function scanForToken(): int
                     return 0;
                 }
 
-                if ($cursor === "\n") {
-                    $this->state->incrementActiveLine();
-                }
-
                 $this->state->rawFragment .= $cursor;
                 $this->state->incrementStart();
             } else {