Browse Source

hotfix: 框架部分的几处紧急修复

dzp 3 years ago
parent
commit
dd5c7a8e67
4 changed files with 16 additions and 5 deletions
  1. 1 1
      framework/main.tin
  2. 3 3
      framework/module-loader.tin
  3. 1 1
      plugins/lib/option.tin
  4. 11 0
      plugins/lib/xtintin/fp.tin

+ 1 - 1
framework/main.tin

@@ -39,9 +39,9 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
 #event {SESSION CREATED} {
     #%0 {
         log.Open;
+        load-module lib/event;
         load-module lib/ui/prompt;
         load-module lib/ui/beautify;
-        load-module lib/event;
     };
 };
 

+ 3 - 3
framework/module-loader.tin

@@ -64,11 +64,11 @@ class.open module-loader;
             #nop 模块路径;
             #local PATH {$path};
             #nop 模块中触发器的默认 ID;
-            #local ID     {%!{|id=${moduleName}}};
+            #local ID     {%!{(?:|id=${moduleName})}};
             #nop 文本开始;
             #local {B}    {^{[> ]*}};
             #nop 文本结束;
-            #local {E}    {%!{|id=${moduleName}}$};
+            #local {E}    {%!{(?:|id=${moduleName})}$};
             #nop 颜色触发中的文本结束;
             #local {CE}   {%!{\e\[[0-9\;]*[mK]}$E};
             class.read {$moduleName} {$path};
@@ -161,7 +161,7 @@ class.open module-loader;
 #alias {kill-module} {
     #local moduleName   {%1};
     #if { "$moduleName" == "" } {
-        warnLog 用法: reload-module <模块全限定名称>;
+        warnLog 用法: kill-module <模块全限定名称>;
         #return;
     };
 

+ 1 - 1
plugins/lib/option.tin

@@ -78,7 +78,7 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
     #local {option} {%1};
     #local {value}  {%2};
 
-    #local old {$xttOptions[$option]};
+    #local old {$gOptions[$option][value]};
     #if { "$old" == "" } {
         errLog 不存在选项「$option」,请先定义后再使用。;
         #return {};

+ 11 - 0
plugins/lib/xtintin/fp.tin

@@ -10,6 +10,8 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
     #local table {%1};
     #local cond {%2};
 
+    #local key      {};
+    #local value    {};
     #replace {cond} {KEY} {$$key};
     #replace {cond} {VALUE} {$$value};
 
@@ -30,6 +32,9 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
     #local cond {%2};
     #local body {%3};
 
+    #local key      {};
+    #local value    {};
+
     #replace {cond} {KEY} {$$key};
     #replace {cond} {VALUE} {$$value};
     #replace {body} {KEY} {$$key};
@@ -52,6 +57,9 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
     #local cond {%2};
     #local body {%3};
 
+    #local key      {};
+    #local value    {};
+
     #replace {cond} {KEY} {$$key};
     #replace {cond} {VALUE} {$$value};
     #replace {body} {KEY} {$$key};
@@ -78,6 +86,9 @@ PaoTin++ © 2020~2022 的所有版权均由担子炮(dzp <danzipao@gmail.com>) 
     #local table {%1};
     #local body {%2};
 
+    #local key      {};
+    #local value    {};
+
     #replace {body} {KEY} {$$key};
     #replace {body} {VALUE} {$$value};