- Finalizing the documentation before tagging 1.0 release

src/ControlStructure/BlockToken.php

@@ -33,7 +33,7 @@ class BlockToken implements ControlStructure {
                                 sprintf('A block awaiting arguments `%s` instead received `%s` with values `%s`', '$arguments', implode(', ', array_map('gettype', \$inlineVariables ?? [])), json_encode(\$inlineVariables))
                             );
                         }
-                    ?>
+                    /*%EXCEPTION_LINE_BASE%*/?>
                 PHP;
             
             case "define":

src/ControlStructure/EchoToken.php

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

src/ControlStructure/EndRawToken.php

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

src/ControlStructure/FunctionToken.php

@@ -9,6 +9,8 @@ class FunctionToken implements ControlStructure {
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
         switch($token) {
             case "function":
+                $context->functions++;
+
                 return $this->printFunction($context, $arguments);
 
             case "return":
@@ -31,7 +33,6 @@ class FunctionToken implements ControlStructure {
 
     protected function printFunction($context, ?string $arguments) : string
     {
-        $context->functions++;
         return "<?php function $arguments { ?>";
     }
 

src/ControlStructure/IncludeToken.php

@@ -6,7 +6,7 @@ class IncludeToken implements ControlStructure {
 
     public string $token = "include";
 
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
-        return "<?php echo \$___class__template->picea->inlineContent($arguments); ?>";
+    public function parse(\Picea\Compiler\Context &$context, ? string $viewPath, string $token) {
+        return "<?php echo \$___class__template->picea->inlineContent($viewPath); ?>";
     }
 }

src/ControlStructure/RawToken.php

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