From f63375ee08ea95c9a57926f86e61c36f7543053e Mon Sep 17 00:00:00 2001
From: topnuomi <1130395124@qq.com>
Date: Sat, 27 Jul 2019 21:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=A8=E6=88=B7=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/home/config/config.php            |  3 +
 application/home/taglib/Extend.php            | 23 ++++++
 application/home/taglib/index.html            |  0
 application/home/view/Base/a.html             |  2 +
 application/home/view/Base/b.html             |  1 +
 application/home/view/Index/index.html        | 11 +++
 framework/library/template/driver/Top.php     |  6 ++
 .../library/template/driver/tags/Engine.php   | 73 ++++++++++++-------
 public/index.php                              |  2 +-
 .../home/6666cd76f96956469e7be39d750cc7d9     | 13 ----
 .../home/8b6903ea105d9a35bb03114244786eb8.php | 13 +++-
 11 files changed, 105 insertions(+), 42 deletions(-)
 create mode 100644 application/home/taglib/Extend.php
 create mode 100644 application/home/taglib/index.html
 create mode 100644 application/home/view/Base/a.html
 create mode 100644 application/home/view/Base/b.html
 delete mode 100644 public/runtime/cache/application/home/6666cd76f96956469e7be39d750cc7d9

diff --git a/application/home/config/config.php b/application/home/config/config.php
index a39feb5..ca02d0a 100644
--- a/application/home/config/config.php
+++ b/application/home/config/config.php
@@ -21,6 +21,9 @@ return [
     ],
     'view' => [
         'engine' => 'Top',
+        'tagLib' => [
+            \app\home\taglib\Extend::class
+        ],
         'ext' => 'html',
         'dir' => APP_PATH . 'home/view/',
         'cacheDir' => './runtime/cache/application/home/',
diff --git a/application/home/taglib/Extend.php b/application/home/taglib/Extend.php
new file mode 100644
index 0000000..32a1ada
--- /dev/null
+++ b/application/home/taglib/Extend.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace app\home\taglib;
+
+use top\library\template\driver\tags\Engine;
+
+class Extend extends Engine
+{
+    protected $tags = [
+        'say' => ['attr' => 'what', 'close' => 0]
+    ];
+
+    protected function _say_start($tag)
+    {
+        return 'echo \'' . $tag['what'] . '\';';
+    }
+
+    protected function _say_end($tag, $content)
+    {
+        return "echo '{$content}123';";
+    }
+
+}
diff --git a/application/home/taglib/index.html b/application/home/taglib/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/application/home/view/Base/a.html b/application/home/view/Base/a.html
new file mode 100644
index 0000000..ba073a4
--- /dev/null
+++ b/application/home/view/Base/a.html
@@ -0,0 +1,2 @@
+a.html
+<include file="Base/b" />
\ No newline at end of file
diff --git a/application/home/view/Base/b.html b/application/home/view/Base/b.html
new file mode 100644
index 0000000..a34cd0f
--- /dev/null
+++ b/application/home/view/Base/b.html
@@ -0,0 +1 @@
+b.html
\ No newline at end of file
diff --git a/application/home/view/Index/index.html b/application/home/view/Index/index.html
index ccff415..fda0099 100644
--- a/application/home/view/Index/index.html
+++ b/application/home/view/Index/index.html
@@ -3,4 +3,15 @@
 <block name="body">
     BODY
     {$num}
+    <assign name="b" value="1" />
+    <raw>
+        <volist name="b" id="vo">
+            <if condition="$a == 1">
+                {$a}
+            <else condition="$a == 2" />
+                {$b}
+            </if>
+        </volist>
+    </raw>
+    <include file="Base/a" />
 </block>
\ No newline at end of file
diff --git a/framework/library/template/driver/Top.php b/framework/library/template/driver/Top.php
index f60627e..60fa9e7 100644
--- a/framework/library/template/driver/Top.php
+++ b/framework/library/template/driver/Top.php
@@ -70,6 +70,12 @@ class Top implements TemplateIfs
             }
             $content = file_get_contents($filename);
             $content = $this->engine->compile($content);
+            if (isset($this->config['tagLib']) && !empty($this->config['tagLib'])) {
+                foreach ($this->config['tagLib'] as $lib) {
+                    $object = new $lib();
+                    $content = $object->parseCustomizeTags($content);
+                }
+            }
             $content = $this->engine->returnRaw($content);
             file_put_contents($compileFileName, $content);
         }
diff --git a/framework/library/template/driver/tags/Engine.php b/framework/library/template/driver/tags/Engine.php
index cf7f26a..441cc96 100644
--- a/framework/library/template/driver/tags/Engine.php
+++ b/framework/library/template/driver/tags/Engine.php
@@ -38,8 +38,14 @@ class Engine
         'if' => ['attr' => 'condition', 'close' => 1],
         'else' => ['attr' => 'condition', 'close' => 0],
         'volist' => ['attr' => 'name,id,key', 'close' => 1],
+        'assign' => ['attr' => 'name,value', 'close' => 0]
     ];
 
+    /**
+     * 构造方法
+     * Engine constructor.
+     * @throws \Exception
+     */
     public function __construct()
     {
         $this->config = Register::get('Config')->get('view');
@@ -187,27 +193,30 @@ class Engine
     private function parseTags($tmpl, $tags)
     {
         foreach ($tags as $name => $item) {
-            $pattern = '#' . $this->left . $name . ' +(.*?)';
-            $pattern .= ((!$item['close']) ? '\/' . $this->right : $this->right) . '#';
-            $tmpl = preg_replace_callback($pattern, function ($matches) use ($name, $item) {
-                $function = '_' . $name . '_start';
-                $pattern = '#(.*?)=[\'"](.*?)[\'"]#';
-                preg_match_all($pattern, $matches[1], $result);
+            $pattern = '#' . $this->left . $name . ' +(.*?)' . ($item['close'] ? $this->right : '\/' . $this->right . '#');
+            if ($item['close']) {
+                $pattern .= '([\s\S]*?)' . $this->left . '\/' . $name . $this->right . '#';
+            }
+            preg_match_all($pattern, $tmpl, $matches);
+            for ($i = 0; $i < count($matches[0]); $i++) {
+                $attrPattern = '#(.*?)=[\'"](.*?)[\'"]#';
+                preg_match_all($attrPattern, $matches[1][$i], $result);
                 $tag = [];
                 if (!empty($result)) {
                     foreach ($result[1] as $key => $value) {
                         $tag[trim($value, ' ')] = $result[2][$key];
                     }
                 }
-                return '<?php ' . $this->{$function}($tag) . ' ?>';
-            }, $tmpl);
-            // 处理闭合标签
-            if ($item['close']) {
-                $pattern = '#' . $this->left . '\/' . $name . '' . $this->right . '#';
-                $tmpl = preg_replace_callback($pattern, function ($matches) use ($name) {
-                    $function = '_' . $name . '_end';
-                    return '<?php ' . $this->{$function}() . ' ?>';
-                }, $tmpl);
+                if ($item['close']) {
+                    $tagContent = $matches[2][$i];
+                    $content = $this->{'_' . $name . '_start'}($tag, $tagContent);
+                    if ($item['close']) {
+                        $content .= $this->{'_' . $name . '_end'}($tag, $tagContent);
+                    }
+                } else {
+                    $content = $this->{'_' . $name . '_start'}($tag);
+                }
+                $tmpl = str_replace($matches[0][$i], $content, $tmpl);
             }
         }
         return preg_replace('#\?>([\r|\n|\s]*?)<\?php#', '', $tmpl);
@@ -255,9 +264,9 @@ class Engine
      * @param $tag
      * @return string
      */
-    private function _if_start($tag)
+    private function _if_start($tag, $content)
     {
-        return 'if (' . $tag['condition'] . '):';
+        return '<?php if (' . $tag['condition'] . '): ?>' . $content;
     }
 
     /**
@@ -266,7 +275,7 @@ class Engine
      */
     private function _if_end()
     {
-        return 'endif;';
+        return '<?php endif; ?>';
     }
 
     /**
@@ -277,11 +286,11 @@ class Engine
     private function _else_start($tag)
     {
         if (isset($tag['condition'])) {
-            $content = 'elseif (' . $tag['condition'] . '):';
+            $parse = '<?php elseif (' . $tag['condition'] . '): ?>';
         } else {
-            $content = 'else:';
+            $parse = '<?php else: ?>';
         }
-        return $content;
+        return $parse;
     }
 
     /**
@@ -289,17 +298,17 @@ class Engine
      * @param $tag
      * @return null|string
      */
-    private function _volist_start($tag)
+    private function _volist_start($tag, $content)
     {
         if (substr($tag['name'], 0, 1) == ':') {
             $name = substr($tag['name'], 1);
         } else {
             $name = '$' . $tag['name'];
         }
-        $str = (empty($tag['key'])) ? null : '$' . $tag['key'] . ' = 0; ';
-        $str .= 'foreach (' . $name . ' as $' . $tag['id'] . '):';
-        $str .= (empty($tag['key']) ? null : '$' . $tag['key'] . '++;');
-        return $str;
+        $parse = (empty($tag['key'])) ? null : '$' . $tag['key'] . ' = 0; ';
+        $parse .= '<?php foreach (' . $name . ' as $' . $tag['id'] . '): ?>' . $content;
+        $parse .= (empty($tag['key']) ? null : '$' . $tag['key'] . '++;');
+        return $parse;
     }
 
     /**
@@ -308,7 +317,16 @@ class Engine
      */
     private function _volist_end()
     {
-        return 'endforeach;';
+        return '<?php endforeach; ?>';
+    }
+    
+    /**
+     * assign标签
+     * @return string
+     */
+    private function _assign_start($tag)
+    {
+        return '<?php $'. $tag['name'] .' = ' . $tag['value'] . '; ?>';
     }
 
     /**
@@ -317,6 +335,7 @@ class Engine
      */
     public function compile($tmpl)
     {
+        // 处理raw标签
         $tmpl = $this->parseRaw($tmpl);
         // 处理模板继承标签
         $tmpl = $this->parseExtend($tmpl);
diff --git a/public/index.php b/public/index.php
index aa330b2..89c2a69 100644
--- a/public/index.php
+++ b/public/index.php
@@ -7,7 +7,7 @@ require '../framework/Framework.php';
 // 可能你会使用到下面这些配置
 
 // 调试模式，缺省值：false
-// Framework::debug(true);
+Framework::debug(true);
 // 可使用常量DEBUG取得该值
 
 // 项目目录，缺省值：./application/
diff --git a/public/runtime/cache/application/home/6666cd76f96956469e7be39d750cc7d9 b/public/runtime/cache/application/home/6666cd76f96956469e7be39d750cc7d9
deleted file mode 100644
index 94d13ea..0000000
--- a/public/runtime/cache/application/home/6666cd76f96956469e7be39d750cc7d9
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-父级模板
-
-    BODY
-    49999985000001
-</body>
-</html>
\ No newline at end of file
diff --git a/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php b/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php
index a892cd1..81e0957 100644
--- a/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php
+++ b/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php
@@ -8,7 +8,18 @@
 父级模板
 
     BODY
-    <?php echo $num; ?>
+    <?php echo $num;  $b = 1; ?>
+    
+        <volist name="b" id="vo">
+            <if condition="$a == 1">
+                {$a}
+            <else condition="$a == 2" />
+                {$b}
+            </if>
+        </volist>
+    
+    a.html
+b.html
 
 </body>
 </html>
\ No newline at end of file