From 97763d28e8418ba9d2d10d2ba17483adf9f9f1de Mon Sep 17 00:00:00 2001
From: codeboss <2422523675@qq.com>
Date: Fri, 26 Jul 2024 16:02:48 +0800
Subject: [PATCH] update

---
 libSyntax/libsyntax.cpp    | 12 ------------
 libSyntax/syntax_novel.cpp |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/libSyntax/libsyntax.cpp b/libSyntax/libsyntax.cpp
index 1723048..f720e5e 100644
--- a/libSyntax/libsyntax.cpp
+++ b/libSyntax/libsyntax.cpp
@@ -129,18 +129,6 @@ Any::Any(const QList<std::shared_ptr<const IBasicRule>> mbrs) : mbrs_store(mbrs)
 
 QList<std::shared_ptr<const IBasicRule>> Any::children() const { return mbrs_store; }
 
-class words_span {
-public:
-	int row_span, column_span;
-	words_span(int rspan, int cspan) :row_span(rspan), column_span(cspan) {}
-	bool operator>(const words_span& other) {
-		if (row_span > other.row_span)
-			return true;
-		if (row_span == other.row_span)
-			return column_span > other.column_span;
-		return false;
-	}
-};
 std::tuple<IBasicRule::MatchResult, std::shared_ptr<const IWordBase>> Any::parse(std::shared_ptr<IContext> rt_inst, std::shared_ptr<const IWordBase> head) const {
 	std::tuple<std::shared_ptr<const IBasicRule>, uint64_t> temp_result = std::make_tuple(nullptr, 0);
 	auto rule_present = this->token_present();
diff --git a/libSyntax/syntax_novel.cpp b/libSyntax/syntax_novel.cpp
index 2748a4c..7615a00 100644
--- a/libSyntax/syntax_novel.cpp
+++ b/libSyntax/syntax_novel.cpp
@@ -20,8 +20,8 @@ auto frag_key = std::make_shared<Keywords>(u8"
 auto volume_key = std::make_shared<Keywords>(u8"·Ö¾í", 0xACu);          // ·Ö¾í
 auto article_key = std::make_shared<Keywords>(u8"Õ½Ú", 0xADu);        // Õ½Ú
 auto split_mark = std::make_shared<Split>();                                 // &
-auto vtext = std::make_shared<VTextSection>();                          // ^([^\\{\\}\\n@&]+)
-auto name_text = std::make_shared<NameSection>();                           // ^([^:\\{\\}\\n@&][^\\{\\}\\n@&]*)
+auto vtext = std::make_shared<VTextSection>();                          // ^([^\\{\\}\@&]+)
+auto name_text = std::make_shared<NameSection>();                           // ^([^\\{\\}@&]+)