fix: tempalte compile error on special expr

inhere · Nov 7, 2021 · 756da34 · 756da34
1 parent 7ca5491
commit 756da34
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/app/Lib/Template/Compiler/PregCompiler.php b/app/Lib/Template/Compiler/PregCompiler.php
@@ -40,7 +40,7 @@ public function setOpenCloseTag(string $open, string $close): self
     {
         parent::setOpenCloseTag($open, $close);
 
-        $this->openTagE = addslashes($open);
+        $this->openTagE  = addslashes($open);
         $this->closeTagE = addslashes($close);
 
         return $this;
@@ -58,8 +58,7 @@ public function compile(string $tplCode): string
             return $tplCode;
         }
 
-        // $compiler = $this->getCompiler();
-        // $compiler->compile($code);
+        $this->prevTokenType = '';
 
         $openTagE  = $this->openTagE;
         $closeTagE = $this->closeTagE;
@@ -102,20 +101,23 @@ public function parseCodeBlock(string $block): string
             return $block;
         }
 
+        // special '}' -  if, for, foreach end char
+        if ($trimmed === '}') {
+            return self::PHP_TAG_OPEN . ' } ' . self::PHP_TAG_CLOSE;
+        }
+
         $isInline = !str_contains($trimmed, "\n");
-        // ~^(if|elseif|else|endif|for|endfor|foreach|endforeach)~
         $kwPattern = Token::getBlockNamePattern();
 
         // default is define statement.
-        $type = Token::T_DEFINE;
-        $open = self::PHP_TAG_OPEN . "\n";
-        $close = ($isInline ? ' ' : "\n" ) . self::PHP_TAG_CLOSE;
+        $type  = Token::T_DEFINE;
+        $open  = self::PHP_TAG_OPEN . "\n";
+        $close = ($isInline ? ' ' : "\n") . self::PHP_TAG_CLOSE;
 
-        // echo statement
         if ($trimmed[0] === '=') {
             $type = Token::T_ECHO;
             $open = self::PHP_TAG_ECHO;
-        } elseif (str_starts_with($trimmed, 'echo')) { // echo statement
+        } elseif (str_starts_with($trimmed, 'echo ')) { // echo statement
             $type = Token::T_ECHO;
             $open = self::PHP_TAG_OPEN . ' ';
         } elseif ($isInline && ($tryType = Token::tryAloneToken($trimmed))) {
@@ -134,10 +136,10 @@ public function parseCodeBlock(string $block): string
 
             // auto fix pad some chars.
             if (Token::canAutoFixed($type)) {
-                $endChar = $trimmed[strlen($trimmed)-1];
+                $endChar = $trimmed[strlen($trimmed) - 1];
 
                 // not in raw php code AND end char != :
-                if ($endChar !== '}' && $endChar !== ':') {
+                if ($endChar !== '}' && $endChar !== '{' && $endChar !== ':') {
                     $close = ': ' . self::PHP_TAG_CLOSE;
                 }
             }

diff --git a/app/Lib/Template/TextTemplate.php b/app/Lib/Template/TextTemplate.php
@@ -13,7 +13,6 @@
 use function extract;
 use function file_exists;
 use function file_put_contents;
-use function hash;
 use function md5;
 use function ob_clean;
 use function ob_get_clean;
@@ -107,7 +106,7 @@ protected function doRenderFile(string $tplFile, array $tplVars): string
             return ob_get_clean();
         } catch (Throwable $e) {
             ob_clean();
-            throw $e;
+            throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
         }
     }
 

diff --git a/test/testdata/full-demo.tpl.php b/test/testdata/full-demo.tpl.php
@@ -38,6 +38,12 @@
 
 <?php if ($a < 2) { echo "at if\n"; }?>
 
+if example3:
+
+<?php if ($a < 2){ ?>
+  at if
+<?php } ?>
+
 if-elseif-else example1:
 
 <?php if ($a < 3): ?>

diff --git a/test/unittest/Lib/Template/PregCompilerTest.php b/test/unittest/Lib/Template/PregCompilerTest.php
@@ -116,6 +116,10 @@ public function testCompile_if_block():void
                 '{{if ($a < 4) }} hi {{endif}}',
                 '<?php if ($a < 4): ?> hi <?php endif ?>',
             ],
+            [
+                '{{if ($a < 4) { }} hi {{ } }}',
+                '<?php if ($a < 4) { ?> hi <?php } ?>',
+            ],
             [
                 '{{if ($a < 4) }}
 hi