From 5fea845666ba45910d05b6a81e92b139d8c30dbd Mon Sep 17 00:00:00 2001
From: codeboss <2422523675@qq.com>
Date: Sat, 13 Jul 2024 06:19:30 +0800
Subject: [PATCH] =?UTF-8?q?Context=E6=8E=A5=E5=8F=A3=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WsNovelParser/novelparser.cpp | 2 +-
 libSyntax/ast_basic.cpp       | 6 +++---
 libSyntax/ast_basic.h         | 6 +++---
 libSyntax/libsyntax.cpp       | 2 +-
 libSyntax/libsyntax.h         | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WsNovelParser/novelparser.cpp b/WsNovelParser/novelparser.cpp
index 94b3844..b8ddbe8 100644
--- a/WsNovelParser/novelparser.cpp
+++ b/WsNovelParser/novelparser.cpp
@@ -41,7 +41,7 @@ std::shared_ptr<const ast_gen::ElementAccess> NovelParser::parse(const QFileInfo
         this->syntax_defines->parse(context, words);
     }
 
-    forst_root = context->getDocs();
+    forst_root = context->getDocInsts();
     auto current_stamp = QTime::currentTime();
     qDebug().noquote() << QString(u8"%词法解析+语法解析消耗时间：%1 ms。").arg(time_stamp.msecsTo(current_stamp));
 
diff --git a/libSyntax/ast_basic.cpp b/libSyntax/ast_basic.cpp
index 13cffdf..7865c2b 100644
--- a/libSyntax/ast_basic.cpp
+++ b/libSyntax/ast_basic.cpp
@@ -96,15 +96,15 @@ void ExpressionContext::clearErrors(const QString &file_path, int start) {
 	}
 }
 
-QList<std::shared_ptr<const IBasicRule>> ExpressionContext::currentExpressionRuleStack() const {
+QList<std::shared_ptr<const IBasicRule>> ExpressionContext::currentExprRuleStack() const {
 	return rule_stack;
 }
 
 
-void ExpressionContext::appendDoc(std::shared_ptr<ast_basic::IExprInst> inst) {
+void ExpressionContext::appendDocInst(std::shared_ptr<ast_basic::IExprInst> inst) {
 	this->document_store.append(inst);
 }
 
-QList<std::shared_ptr<const ast_basic::IExprInst>> ExpressionContext::getDocs() const {
+QList<std::shared_ptr<const ast_basic::IExprInst>> ExpressionContext::getDocInsts() const {
 	return this->document_store;
 }
\ No newline at end of file
diff --git a/libSyntax/ast_basic.h b/libSyntax/ast_basic.h
index 2c7dbf7..0346e9f 100644
--- a/libSyntax/ast_basic.h
+++ b/libSyntax/ast_basic.h
@@ -99,10 +99,10 @@ namespace ast_basic {
         std::shared_ptr<const lib_syntax::IBasicRule> currentExprRule() const override;
         void pushExprRule(std::shared_ptr<const lib_syntax::IBasicRule> inst) override;
         std::shared_ptr<const lib_syntax::IBasicRule> popExprRule() override;
-        virtual QList<std::shared_ptr<const lib_syntax::IBasicRule>> currentExpressionRuleStack() const;
+        virtual QList<std::shared_ptr<const lib_syntax::IBasicRule>> currentExprRuleStack() const;
 
-        virtual void appendDoc(std::shared_ptr<ast_basic::IExprInst> inst) override;
-        virtual QList<std::shared_ptr<const ast_basic::IExprInst>> getDocs() const override;
+        virtual void appendDocInst(std::shared_ptr<ast_basic::IExprInst> inst) override;
+        virtual QList<std::shared_ptr<const ast_basic::IExprInst>> getDocInsts() const override;
 
         void appendParseErrors(const QString& file_path, int start, const QString& error_msg) override;
         QStringList errors() const override;
diff --git a/libSyntax/libsyntax.cpp b/libSyntax/libsyntax.cpp
index d9215ce..27e701a 100644
--- a/libSyntax/libsyntax.cpp
+++ b/libSyntax/libsyntax.cpp
@@ -228,7 +228,7 @@ ExprRule::parse(std::shared_ptr<IContext> rt_inst, std::shared_ptr<const IWordBa
 			rt_inst->currentExprInst()->addChild(elm_ast);
 		}
 		else {
-			rt_inst->appendDoc(elm_ast);
+			rt_inst->appendDocInst(elm_ast);
 		}
 	}break;
 	default:
diff --git a/libSyntax/libsyntax.h b/libSyntax/libsyntax.h
index be528f8..1517942 100644
--- a/libSyntax/libsyntax.h
+++ b/libSyntax/libsyntax.h
@@ -42,8 +42,8 @@ namespace lib_syntax {
 		virtual QStringList errors() const = 0;
 		virtual void clearErrors(const QString &file_path, int start) = 0;
 
-		virtual void appendDoc(std::shared_ptr<ast_basic::IExprInst> inst) = 0;
-		virtual QList<std::shared_ptr<const ast_basic::IExprInst>> getDocs() const = 0;
+		virtual void appendDocInst(std::shared_ptr<ast_basic::IExprInst> inst) = 0;
+		virtual QList<std::shared_ptr<const ast_basic::IExprInst>> getDocInsts() const = 0;
 
 		/**
 		 * \brief 当前表达式元素.
@@ -57,7 +57,7 @@ namespace lib_syntax {
 		virtual std::shared_ptr<const IBasicRule> currentExprRule() const = 0;
 		virtual void pushExprRule(std::shared_ptr<const IBasicRule> inst) = 0;
 		virtual std::shared_ptr<const IBasicRule> popExprRule() = 0;
-		virtual QList<std::shared_ptr<const IBasicRule>> currentExpressionRuleStack() const = 0;
+		virtual QList<std::shared_ptr<const IBasicRule>> currentExprRuleStack() const = 0;
 	};
 
 	/**