- WIP on RAW token

- WIP on caching interface
- Work done on easing template rendering for the controller

src/ControlStructure/BreakToken.php

@@ -6,7 +6,7 @@ class BreakToken implements ControlStructure {
 
     public string $token = "break";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php break; ?>";
     }
 

src/ControlStructure/CaseToken.php

@@ -6,7 +6,7 @@ class CaseToken implements ControlStructure {
 
     public string $token = "case";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $output = "";
 
         if ( $context->switchStack ) {

src/ControlStructure/ControlStructure.php

@@ -3,5 +3,5 @@
 namespace Picea\ControlStructure;
 
 interface ControlStructure {
-    public function parse(\Picae\Compiler\Context &$context, string $sourceCode);
+    public function parse(\Picae\Compiler\Context &$context, string $sourceCode, string $token);
 }

src/ControlStructure/DefaultToken.php

@@ -6,7 +6,7 @@ class DefaultToken implements ControlStructure {
 
     public string $token = "default";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $output = "";
 
         if ( $context->switchStack ) {

src/ControlStructure/ElseIfToken.php

@@ -6,7 +6,7 @@ class ElseIfToken implements ControlStructure {
 
     public string $token = "elseif";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php elseif ($arguments): ?>";
     }
 

src/ControlStructure/ElseToken.php

@@ -6,7 +6,7 @@ class ElseToken implements ControlStructure {
 
     public string $token = "else";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php else: ?>";
     }
 

src/ControlStructure/EndIfToken.php

@@ -6,7 +6,7 @@ class EndIfToken implements ControlStructure {
 
     public string $token = "endif";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php endif ?>";
     }
 

src/ControlStructure/EndRawToken.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Picea\ControlStructure;
+
+class EndRawToken implements ControlStructure {
+
+    public string $token = "endraw";
+
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
+    }
+
+}

src/ControlStructure/EndSectionToken.php

@@ -6,7 +6,7 @@ class EndSectionToken implements ControlStructure {
 
     public string $token = "endsection";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         if ( empty($context->sections) ) {
             throw new \RuntimeException("A section closing tag {% endsection %} was found without an opening {% section %} tag");
         }

src/ControlStructure/EndSwitchToken.php

@@ -6,7 +6,7 @@ class EndSwitchToken implements ControlStructure {
 
     public string $token = "endswitch";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php endswitch; ?>";
     }
 }

src/ControlStructure/EndforToken.php

@@ -6,7 +6,7 @@ class EndforToken implements ControlStructure {
 
     public string $token = "endfor";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         if ( end($context->iterationStack)['or'] === false ) {
             $output = "<?php endfor; ?>";
         }

src/ControlStructure/EndforeachToken.php

@@ -6,7 +6,7 @@ class EndforeachToken implements ControlStructure {
 
     public string $token = "endforeach";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         if ( end($context->iterationStack)['or'] === false ) {
             $output = "<?php endforeach; ?>";
         }

src/ControlStructure/ExtendsToken.php

@@ -6,7 +6,7 @@ class ExtendsToken implements ControlStructure {
 
     public string $token = "extends";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $path) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $path, string $token) {
         # Triming string's quotes
         $path = trim($path, "\"\' \t");
 

src/ControlStructure/ForToken.php

@@ -6,7 +6,7 @@ class ForToken implements ControlStructure {
 
     public string $token = "for";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $uid = "$".uniqid("for_");
 
         $context->iterationStack[] = [

src/ControlStructure/ForeachToken.php

@@ -6,7 +6,7 @@ class ForeachToken implements ControlStructure {
 
     public string $token = "foreach";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $uid = "$".uniqid("foreach_");
 
         $context->iterationStack[] = [

src/ControlStructure/IfToken.php

@@ -6,7 +6,7 @@ class IfToken implements ControlStructure {
 
     public string $token = "if";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         return "<?php if ($arguments): ?>";
     }
 

src/ControlStructure/NamespaceToken.php

@@ -6,7 +6,7 @@ class NamespaceToken implements ControlStructure {
 
     public string $token = "namespace";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $context->namespace = $arguments;
         return "";
     }

src/ControlStructure/OrToken.php

@@ -6,7 +6,7 @@ class OrToken implements ControlStructure {
 
     public string $token = "or";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         if ( empty($context->iterationStack) ) {
             throw new \LogicException("Token `or` was used outside of iterator. Make sure your `for` or `foreach` declaration are properly made.");
         }

src/ControlStructure/RawToken.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Picea\ControlStructure;
+
+class RawToken implements ControlStructure {
+
+    public string $token = "raw";
+
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
+    }
+
+}

src/ControlStructure/SectionToken.php

@@ -6,7 +6,7 @@ class SectionToken implements ControlStructure {
 
     public string $token = "section";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         list($name, $options) = array_pad(explode(',', $arguments), 2, null);
 
         if ( $options ?? false ) {

src/ControlStructure/SwitchToken.php

@@ -6,7 +6,7 @@ class SwitchToken implements ControlStructure {
 
     public string $token = "switch";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $context->switchStack[] = true;
         return "<?php switch($arguments):";
     }

src/ControlStructure/UseToken.php

@@ -6,7 +6,7 @@ class UseToken implements ControlStructure {
 
     public string $token = "use";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         $context->useStack[] = $arguments;
         return "";
     }

src/ControlStructure/ViewToken.php

@@ -6,7 +6,7 @@ class ViewToken implements ControlStructure {
 
     public string $token = "view";
 
-    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments) {
+    public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
         #$context->switchStack[] = true;
         #return "<?php switch($arguments):";
     }