feat(format): len & expired

新增len&expired
优化&=键值对识别对嵌套的影响

Author: mystringEmpty

Dice/DiceFormatter.cpp

@@ -172,7 +172,7 @@ class MarkCaseNode : public MarkNode {
 	ptr<MarkNode> other;
 public:
 	MarkCaseNode(const std::string_view& s) :MarkNode(s), field(s.substr(0,s.find('?'))) {
-		auto paras{ splitPairs(string(s.substr(s.find('?') + 1)),'=','&') };
+		auto paras{ splitPairs(s.substr(s.find('?') + 1),'=','&') };
 		for (auto& [key, val] : paras) {
 			if (key == "else")other = buildFormatter(val);
 			else cases[key] = buildFormatter(val);
@@ -191,8 +191,9 @@ class MarkGradeNode : public MarkNode {
 	grad_map<double, ptr<MarkNode>> grades;
 public:
 	MarkGradeNode(const std::string_view& s) :MarkNode(s), field(s.substr(0, s.find('?'))) {
-		auto paras{ splitPairs(string(s.substr(s.find('?') + 1)),'=','&') };
+		auto paras{ splitPairs(s.substr(s.find('?') + 1),'=','&') };
 		for (auto& [key, val] : paras) {
+			DD::debugLog("split=" + val);
 			if (key == "else")grades.set_else(buildFormatter(val));
 			else if (isNumeric(key))grades.set_step(stod(key), buildFormatter(val));
 		}
@@ -224,9 +225,27 @@ class MarkPyNode : public MarkNode {
 		return {};
 	}
 };
+class MarkLenNode : public MarkNode {
+	MarkReference field;
+public:
+	MarkLenNode(const std::string_view& s) :MarkNode(s), field(s) {}
+	AttrVar format(const AttrObject& context, bool isTrust = true, const dict_ci<string>& global = {})const override {
+		auto res{ field.concat(context, isTrust, global) };
+		return (long long)res.len();
+	}
+};
+class MarkExpiredNode : public MarkNode {
+	MarkReference field;
+public:
+	MarkExpiredNode(const std::string_view& s) :MarkNode(s), field(s) {}
+	AttrVar format(const AttrObject& context, bool isTrust = true, const dict_ci<string>& global = {})const override{
+		auto res{ field.concat(context, isTrust, global)};
+		return !res.is_numberic() || res.to_int() < time(nullptr);
+	}
+};
 
-static enumap<string> methods{ "var","print","help","sample","case","vary","grade","at","ran","wait","js","py","len" };
-enum class FmtMethod { Var, Print, Help, Sample, Case, Vary, Grade, At, Ran, Wait, JS, Py, Len };
+static enumap<string> methods{ "var","print","help","sample","case","vary","grade","at","ran","wait","js","py","len","expired" };
+enum class FmtMethod { Var, Print, Help, Sample, Case, Vary, Grade, At, Ran, Wait, JS, Py, Len, Expired };
 //Formatter
 static size_t find_close_brace(const std::string_view& s, size_t pos) {
 	int diff = 1;
@@ -332,6 +351,16 @@ ptr<MarkNode> buildFormatter(const std::string_view& exp) {
 				cur = &(*cur)->next;
 				continue;
 			}
+			else if (method == "len") {
+				*cur = std::static_pointer_cast<MarkNode>(std::make_shared<MarkLenNode>(para));
+				cur = &(*cur)->next;
+				continue;
+			}
+			else if (method == "expired") {
+				*cur = std::static_pointer_cast<MarkNode>(std::make_shared<MarkExpiredNode>(para));
+				cur = &(*cur)->next;
+				continue;
+			}
 		}
 		if (auto func = strFuncs.find(string(field)); func != strFuncs.end()) {
 			*cur = std::make_shared<MarkGlobalIndexNode>(field);

Dice/GlobalVar.cpp

@@ -442,7 +442,7 @@ const dict_ci<string> PlainMsg
 	{"strSelfName", "" },
 	{"strSelfNick", "&strSelfName" },
 	{"self", "&strSelfCall"},
-	{"strBotHeader", "标准型 " },
+	{"strBotHeader", "试验型 " },
 	{"strBotMsg", "\n使用.help 查看{self}帮助文档"},
 	{"strHlpMsg", R"(请使用.dismiss ID（或后四位） 使{self}退群退讨论组
 .bot on/off ID（或at或后四位） //开启或关闭指令
@@ -536,6 +536,7 @@ const dict_ci<string> GlobalComment{
 };
 const dict_ci<> HelpDoc = {
 {"更新",R"(
+667:format新增len&expired
 666:变更内部字符编码
 665:webui依赖本地化
 664:新增监听BlackInfoWarned

Dice/GlobalVar.h

@@ -37,9 +37,9 @@
  * Please Do not modify Dice_Build, Dice_Ver_Without_Build, DiceRequestHeader or Dice_Ver
  * To costum version info, please modify const Dice_Short_Ver or Dice_Full_Ver
  */
-constexpr unsigned short Dice_Build = 666u;
-inline const std::string Dice_Ver_Without_Build = "2.7.0hotfix";
-constexpr auto DiceRequestHeader = "Dice/2.7.0";
+constexpr unsigned short Dice_Build = 667u;
+inline const std::string Dice_Ver_Without_Build = "2.7.1beta1";
+constexpr auto DiceRequestHeader = "Dice/2.7.1";
 inline const std::string Dice_Ver = Dice_Ver_Without_Build + "(" + std::to_string(Dice_Build) + ")";
 extern std::string Dice_Short_Ver;
 constexpr bool isDev = true;

Dice/StrExtern.hpp

@@ -50,7 +50,7 @@ int count_char(const string& s, char ch);
 vector<string> getLines(const string& s, char delim = '\n');
 vector<string> split(const string&, const string&);
 string splitOnce(string& str, const string& sep = ".");
-fifo_dict<string> splitPairs(const std::string&, char delim = '=', char br = '\n');
+fifo_dict<string> splitPairs(std::string_view, char delim = '=', char br = '\n');
 
 template<typename Con>
 void splitID(const string& str , Con& list) {

Dice/strExtern.cpp

@@ -87,12 +87,31 @@ string splitOnce(string& str, const string& sep) {
     }
     return head;
 }
-fifo_dict<> splitPairs(const string& s, char delim, char br) {
+
+size_t find_close_brace(const std::string_view& s, size_t start = 0) {
+    int brace_count = 0;
+    for (size_t i = start; i < s.size(); ++i) {
+        if (s[i] == '{') {
+            brace_count++; 
+        }
+        else if (s[i] == '}') {
+            if (--brace_count == 0) {
+                return i;
+            }
+        }
+    }
+    return std::string::npos; // 如果没有找到匹配的右花括号，返回npos
+}
+
+fifo_dict<> splitPairs(string_view sv, char delim, char br) {
     fifo_dict<>dict;
-    string_view sv(s),line;
+    string_view line;
     size_t posDe{ 0 }, posBr{ 0 }, p{ 0 };
     while (posBr != string::npos) {
         posBr = sv.find(br);
+        if (auto l{ sv.rfind('{', posBr) };l < posBr) {
+            posBr = sv.find(br, find_close_brace(sv, l));
+        }
         line = sv.substr(p = sv.find_first_not_of(space_char, p), sv.find_last_not_of(space_char, posBr - 1) - p + 1);
         if ((posDe = line.find(delim)) != string::npos) {
             if(posDe)dict[string(line.substr(0, posDe))] = line.substr(posDe + 1);