- Token name and options are now passed through parse() method

src/Compiler.php

@@ -50,14 +50,15 @@ class Compiler
             list($token, $arguments) = array_pad(array_filter(explode(' ', $matches[2], 2), 'strlen'), 2, null);
 
             $token = strtolower(trim($token));
-            $tokenName = explode('.', $token, 2)[0];
+            $tokenName = $context->tokenName($token);
+            $tokenOptions = $context->tokenOptions($token);
             
             # @TODO Refractor this parts to allows registration to the tag's name
             if ( $this->tagList[$tokenName] ?? false ) {
-                return $this->tagList[$tokenName]->parse($context, $arguments, $token);
+                return $this->tagList[$tokenName]->parse($context, $arguments, $tokenName, $tokenOptions);
             }
             elseif ( $this->extensionList[$tokenName] ?? false ) {
-                return $this->extensionList[$tokenName]->parse($context, $arguments, $token);
+                return $this->extensionList[$tokenName]->parse($context, $arguments, $tokenName, $tokenOptions);
             }
             else {
                 throw new \LogicException("Impossible to find token `$tokenName` declared in `{$matches[2]}`. Perhapse you forgot to add a custom token to Picea's engine ?");

src/Compiler/Context.php

@@ -95,8 +95,7 @@ abstract class Context {
 
     public function tokenOptions(string $token, bool $export = false) : array|string
     {
-        $options = explode('.', strtolower($token));
-        array_shift($options);
+        $options = array_slice(explode('.', strtolower($token)), 1);
 
         return $export ? var_export($options, true) : $options;
     }

src/ControlStructure/AbstractLoop.php

@@ -4,7 +4,8 @@ namespace Picea\ControlStructure;
 
 abstract class AbstractLoop implements ControlStructure {
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         switch($token) {
             case "while":
             case "foreach":

src/ControlStructure/BlockToken.php

@@ -6,7 +6,8 @@ class BlockToken implements ControlStructure {
 
     public array $token = [ "arguments", "block", "endblock", "define", "slot", "endslot", "using" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         static $slotDefinitions = [];
 
         switch($token) {

src/ControlStructure/BreakToken.php

@@ -6,7 +6,8 @@ class BreakToken implements ControlStructure {
 
     public string $token = "break";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         return "<?php break; ?>";
     }
 

src/ControlStructure/CaseToken.php

@@ -6,7 +6,8 @@ class CaseToken implements ControlStructure {
 
     public string $token = "case";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         $output = "";
 
         if ( $context->switchStack ) {

src/ControlStructure/ContinueToken.php

@@ -6,7 +6,7 @@ class ContinueToken implements ControlStructure {
 
     public string $token = "continue";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         return "<?php continue; ?>";
     }
 

src/ControlStructure/DefaultToken.php

@@ -6,7 +6,7 @@ class DefaultToken implements ControlStructure {
 
     public string $token = "default";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         $output = "";
 
         if ( $context->switchStack ) {

src/ControlStructure/EchoToken.php

@@ -6,7 +6,7 @@ class EchoToken implements ControlStructure {
 
     public array $token = [ "echo", "echo.raw" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "echo":
                 return "<?php \\Picea\\ControlStructure\\EchoToken::echoSafe($arguments) ?>";

src/ControlStructure/ForToken.php

@@ -6,7 +6,7 @@ class ForToken implements ControlStructure {
 
     public array $token = [ "for", "endfor" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "for":
                 $uid = "$".uniqid("for_");

src/ControlStructure/FunctionToken.php

@@ -6,7 +6,7 @@ class FunctionToken implements ControlStructure {
 
     public array $token = [ "function", "endfunction", "return" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "function":
                 $context->functions++;

src/ControlStructure/IfToken.php

@@ -6,7 +6,7 @@ class IfToken implements ControlStructure {
 
     public array $token = [ "if", "else", "elseif", "endif" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "if":
                 return "<?php if ($arguments): ?>";

src/ControlStructure/NamespaceToken.php

@@ -6,7 +6,7 @@ class NamespaceToken implements ControlStructure {
 
     public string $token = "namespace";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         $context->namespace = $arguments;
         return "";
     }

src/ControlStructure/OrToken.php

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

src/ControlStructure/SectionToken.php

@@ -2,19 +2,26 @@
 
 namespace Picea\ControlStructure;
 
+enum PrintActionEnum : string {
+    case prepend = "prepend";
+    case default = "default";
+    case append = "append";
+    # case both = "both";
+}
+
 class SectionToken implements ControlStructure {
 
     public array $token = [ "section", "endsection" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token)
-    {
-        $opt = $context->tokenOptions($token);
+    protected PrintActionEnum $action = PrintActionEnum::default;
 
-        if (in_array('prepend', $opt)) {
-            $context->sectionAction = "prepend";
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
+        if (in_array('prepend', $options)) {
+            $this->action = PrintActionEnum::prepend;
         }
-        elseif (in_array('append', $opt)) {
-            $context->sectionAction = "append";
+        elseif (in_array('append', $options)) {
+            $this->action = PrintActionEnum::append;
         }
 
         switch($token) {
@@ -30,7 +37,7 @@ class SectionToken implements ControlStructure {
         }
     }
     
-    protected function printSection($context, ?string $arguments) : string
+    protected function printSection($context, ? string $arguments) : string
     {
         list($name, $options) = array_pad(explode(',', $arguments, 2), 2, null);
 
@@ -47,9 +54,7 @@ class SectionToken implements ControlStructure {
             'options' => $options,
         ];
 
-        $action = $options['action'] ?? $context->sectionAction ?? "default";
-
-        unset($context->sectionAction);
+        $action = $options['action'] ?? $this->action->value;
 
         if (! in_array($action, ['prepend', 'append', 'default'])) {
             throw new \RuntimeException("An unsupported action `$action` was given as an option of a {% section %} tag");

src/ControlStructure/SwitchToken.php

@@ -6,7 +6,7 @@ class SwitchToken implements ControlStructure {
 
     public array $token = [ "switch", "case", "endswitch" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "switch":
                 $context->switchStack[] = true;

src/ControlStructure/UseToken.php

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

src/ControlStructure/ViewToken.php

@@ -6,7 +6,7 @@ class ViewToken implements ControlStructure {
 
     public string $token = "view";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         # The way this is ordered, if you provide a second arguments, being an array of variables, get_defined_vars() will not be pushed inside the view
         return "<?php echo \$___class__template->picea->inlineHtml(\$this, $arguments, get_defined_vars()); ?>";
     }

src/ControlStructure/WhileToken.php

@@ -5,7 +5,7 @@ namespace Picea\ControlStructure;
 class WhileToken extends AbstractLoop {
     public array $token = [ "do", "while", "endwhile", ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
             case "do":
                 $context->iterationStack[] = [

src/Exception/ParseExtensionException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Picea\Exception;
+
+use Picea\Picea;
+
+class ParseExtensionException extends \Exception {}

src/Extension/Extension.php

@@ -3,5 +3,5 @@
 namespace Picea\Extension;
 
 interface Extension {
-    public function parse(\Picea\Compiler\Context &$context, string $sourceCode, string $token);
+    public function parse(\Picea\Compiler\Context &$context, string $sourceCode, string $token, array $options = []) : string;
 }

src/Extension/JsonExtension.php

@@ -10,17 +10,15 @@ class JsonExtension implements Extension, FunctionExtension {
     
     public int $flags =  JSON_HEX_TAG | \JSON_HEX_QUOT | \JSON_THROW_ON_ERROR | \JSON_UNESCAPED_UNICODE;
    
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token)
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        $opt = $context->tokenOptions($token);
-
         $flag = $this->flags;
 
-        if ( in_array('pretty', $opt) ) {
+        if ( in_array('pretty', $options) ) {
             $flag |= \JSON_PRETTY_PRINT;
         }
 
-        if ( in_array('html', $opt) ) {
+        if ( in_array('html', $options) ) {
             return "<?php echo htmlentities(json_encode($arguments, $flag), ENT_QUOTES, 'UTF-8') ?>";
         }
 

src/Extension/LanguageExtension.php

@@ -25,10 +25,8 @@ class LanguageExtension implements Extension, FunctionExtension {
         ];
     }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) : string
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        $opt = $context->tokenOptions($token);
-
         switch(explode('.', $token)[0]) {
             case "language":
                 $cls = $this::class;
@@ -49,14 +47,14 @@ class LanguageExtension implements Extension, FunctionExtension {
                 PHP;
 
             case "lang":
-                if ( in_array('raw', $opt) ) {
+                if ( in_array('raw', $options) ) {
                     return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->absoluteLang($arguments) ?>";
                 }
 
                 return "<?php echo htmlspecialchars(\$picea->compiler->getExtensionFromToken('$token')->absoluteLang($arguments), \ENT_QUOTES, ini_get('default_charset'), true) ?>";
 
             case "_":
-                if ( in_array('raw', $opt) ) {
+                if ( in_array('raw', $options) ) {
                     return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->relativeLang($arguments) ?>";
                 }
 

src/Extension/MoneyExtension.php

@@ -26,7 +26,8 @@ class MoneyExtension implements Extension, FunctionExtension {
         ];
     }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         return "<?php echo money($arguments) ?>";
     }
 

src/Extension/PhpExtension.php

@@ -6,7 +6,8 @@ class PhpExtension implements Extension {
 
     public array $token = [ "php" ];
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         return "<?php $arguments ?>";
     }
 }

src/Extension/PrintExtension.php

@@ -18,21 +18,19 @@ class PrintExtension implements Extension {
         $this->encoding = ini_get("default_charset");
     }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) : string
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        $opt = $context->tokenOptions($token);
-
-        switch($context->tokenName($token)) {
+        switch($token) {
             case 'echo':
             case 'print':
-                if (in_array('raw', $opt)) {
+                if (in_array('raw', $options)) {
                     return "<?php echo $arguments ?>";
                 }
 
                 return "<?php echo htmlspecialchars((string) $arguments, {$this->flag}, '{$this->encoding}', " . ($this->doubleEncode ? "true" : "false") . ") ?>";
 
             case 'printf':
-                if (in_array('raw', $opt)) {
+                if (in_array('raw', $options)) {
                     return "<?php printf((string) $arguments) ?>";
                 }
 

src/Extension/TitleExtension.php

@@ -15,7 +15,8 @@ class TitleExtension implements Extension, FunctionExtension {
         ];
     }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
+    {
         return <<<PHP
             <?php 
                 if ( null !== \$title = title($arguments) ) {

src/Extension/UrlExtension.php

@@ -29,10 +29,8 @@ PATTERN;
         $this->assetToken = $assetToken;
    }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) : ?string
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        $opt = $context->tokenOptions($token);
-
         switch($token) {
             case "asset":
                 return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->buildAssetUrl($arguments) ?>";
@@ -41,10 +39,10 @@ PATTERN;
                 return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->buildRouteUrl($arguments) ?>";
 
             case "url":
-                if ( in_array('parameters', $opt) ) {
+                if ( in_array('parameters', $options) ) {
                     return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->setUrlParameters($arguments) ?>";
                 }
-                elseif ( in_array('current', $opt) ) {
+                elseif ( in_array('current', $options) ) {
                     return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->currentUrl($arguments) ?>";
                 }
 
@@ -54,7 +52,7 @@ PATTERN;
                 return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->slug($arguments) ?>";
         }
 
-        return null;
+        throw new \ParseExtensionException("Unknown token given $token in UrlExtension.");
     }
 
     public function exportFunctions(): array

src/Method/Request.php

@@ -24,7 +24,7 @@ class Request implements Extension, FunctionExtension {
         $this->request = $request;
     }
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) : string { }
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string { }
 
     public function exportFunctions(): array
     {