From 8b7ebd11ac4bd379fd76b69a1198f45dc0c527d1 Mon Sep 17 00:00:00 2001 From: codeboss <2422523675@qq.com> Date: Sun, 28 Jul 2024 14:41:54 +0800 Subject: [PATCH] update --- libSyntax/ast_basic.cpp | 14 +++++++------- libSyntax/ast_basic.h | 4 ++-- libSyntax/ast_gen.h | 2 +- libSyntax/ast_novel.cpp | 6 +++--- libSyntax/ast_novel.h | 2 +- libSyntax/libsyntax.h | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libSyntax/ast_basic.cpp b/libSyntax/ast_basic.cpp index 9787b8a..ed1469e 100644 --- a/libSyntax/ast_basic.cpp +++ b/libSyntax/ast_basic.cpp @@ -5,32 +5,32 @@ using namespace ast_basic; using namespace lib_token; using namespace lib_syntax; -ExpressionElement::ExpressionElement(std::shared_ptr bind) : _expr_rule(bind) {} +ExprElement::ExprElement(std::shared_ptr bind) : _expr_rule(bind) {} -std::shared_ptr ExpressionElement::definedRule() const { +std::shared_ptr ExprElement::definedRule() const { return _expr_rule; } -QString ExpressionElement::filePath() const { +QString ExprElement::filePath() const { if (!tokens_bind.size()) throw new SyntaxException(u8"InternalError[0x0002]一个空的非法无效节点"); return tokens_bind.first()->file(); } -void ExpressionElement::addToken(std::shared_ptr token_inst) { +void ExprElement::addToken(std::shared_ptr token_inst) { this->tokens_bind.append(token_inst); } -QList> ExpressionElement::children() const { +QList> ExprElement::children() const { return this->children_store; } -void ExpressionElement::addChild(std::shared_ptr inst) { +void ExprElement::addChild(std::shared_ptr inst) { this->children_store.append(inst); } -QList> ExpressionElement::tokens() const { +QList> ExprElement::tokens() const { return this->tokens_bind; } diff --git a/libSyntax/ast_basic.h b/libSyntax/ast_basic.h index c92c67d..6a73f79 100644 --- a/libSyntax/ast_basic.h +++ b/libSyntax/ast_basic.h @@ -57,14 +57,14 @@ namespace ast_basic { /** * @brief 表达式节点 */ - class LIBSYNTAX_EXPORT ExpressionElement : public ast_basic::IExprInst, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT ExprElement : public ast_basic::IExprInst, public std::enable_shared_from_this { private: std::shared_ptr _expr_rule; QList> children_store; QList> tokens_bind; public: - ExpressionElement(std::shared_ptr bind); + ExprElement(std::shared_ptr bind); // 通过 Expression 继承 std::shared_ptr definedRule() const override; diff --git a/libSyntax/ast_gen.h b/libSyntax/ast_gen.h index b31ad96..8092981 100644 --- a/libSyntax/ast_gen.h +++ b/libSyntax/ast_gen.h @@ -107,7 +107,7 @@ namespace ast_gen QString names_store; QHash> node_cache; - std::shared_ptr bind_exprs = std::make_shared(nullptr); + std::shared_ptr bind_exprs = std::make_shared(nullptr); public: static GlobalElement* UniquePtr; diff --git a/libSyntax/ast_novel.cpp b/libSyntax/ast_novel.cpp index e358dfb..8b2cdaa 100644 --- a/libSyntax/ast_novel.cpp +++ b/libSyntax/ast_novel.cpp @@ -121,10 +121,10 @@ void Document::cacheLoad() } AbstractImpl::AbstractImpl(std::shared_ptr rule_bind) - : ExpressionElement(rule_bind) { parent_store.reset(); } + : ExprElement(rule_bind) { parent_store.reset(); } QList > AbstractImpl::selfTokens() const { - auto tokensx = ast_basic::ExpressionElement::tokens(); + auto tokensx = ast_basic::ExprElement::tokens(); QList> values; for (auto xit : tokensx) { values.append(std::make_shared(std::dynamic_pointer_cast(shared_from_this()), xit)); @@ -151,7 +151,7 @@ std::shared_ptr AbstractImpl::bindExpression() const QString AbstractImpl::path() const { - return ast_basic::ExpressionElement::filePath(); + return ast_basic::ExprElement::filePath(); } VolumeDefine::VolumeDefine(std::shared_ptr rule_bind) diff --git a/libSyntax/ast_novel.h b/libSyntax/ast_novel.h index baafad9..9f3ac57 100644 --- a/libSyntax/ast_novel.h +++ b/libSyntax/ast_novel.h @@ -16,7 +16,7 @@ namespace example_novel RankDeclaration = 8, }; - class LIBSYNTAX_EXPORT AbstractImpl : public ast_basic::ExpressionElement, public ast_gen::SyntaxElement { + class LIBSYNTAX_EXPORT AbstractImpl : public ast_basic::ExprElement, public ast_gen::SyntaxElement { private: std::weak_ptr parent_store; diff --git a/libSyntax/libsyntax.h b/libSyntax/libsyntax.h index efff551..1ef3d50 100644 --- a/libSyntax/libsyntax.h +++ b/libSyntax/libsyntax.h @@ -7,7 +7,7 @@ #include namespace ast_basic { class IExprInst; - class ExpressionElement; + class ExprElement; } namespace lib_syntax {