From 19985a4bb722b507111cf930acd07d23ba27fac9 Mon Sep 17 00:00:00 2001 From: codeboss <2422523675@qq.com> Date: Sat, 13 Jul 2024 05:52:32 +0800 Subject: [PATCH] refactor rename --- WsNovelParser/novelparser.cpp | 2 +- libSyntax/ast_basic.cpp | 22 +++---- libSyntax/ast_basic.h | 44 +++++++------- libSyntax/ast_gen.cpp | 4 +- libSyntax/ast_gen.h | 6 +- libSyntax/ast_novel.cpp | 2 +- libSyntax/ast_novel.h | 2 +- libSyntax/libsyntax.cpp | 104 ++++++++++++++++---------------- libSyntax/libsyntax.h | 110 +++++++++++++++++----------------- libSyntax/syntax_novel.cpp | 2 +- 10 files changed, 149 insertions(+), 149 deletions(-) diff --git a/WsNovelParser/novelparser.cpp b/WsNovelParser/novelparser.cpp index d7f2be4..94b3844 100644 --- a/WsNovelParser/novelparser.cpp +++ b/WsNovelParser/novelparser.cpp @@ -30,7 +30,7 @@ QString NovelParser::version() const } std::shared_ptr NovelParser::parse(const QFileInfoList source_list) const { - QList> forst_root; + QList> forst_root; auto word_reader = std::make_shared(); auto context = std::make_shared(u8"小说"); diff --git a/libSyntax/ast_basic.cpp b/libSyntax/ast_basic.cpp index 5c5a62b..568a203 100644 --- a/libSyntax/ast_basic.cpp +++ b/libSyntax/ast_basic.cpp @@ -26,11 +26,11 @@ void ExpressionElement::addToken(std::shared_ptr token_inst) { this->tokens_bind.append(token_inst); } -QList> ExpressionElement::children() const { +QList> ExpressionElement::children() const { return this->children_store; } -void ExpressionElement::addChild(std::shared_ptr inst) { +void ExpressionElement::addChild(std::shared_ptr inst) { this->children_store.append(inst); } @@ -44,7 +44,7 @@ void ExpressionContext::setCurrentFile(const QString& path) { this->current_file QString ExpressionContext::currentFile() const { return this->current_file_path; } -std::shared_ptr ExpressionContext::currentInst() const +std::shared_ptr ExpressionContext::currentExprInst() const { if (expression_stack.size()) return expression_stack.last(); @@ -52,30 +52,30 @@ std::shared_ptr ExpressionContext::currentInst() const return nullptr; } -void ExpressionContext::pushInst(std::shared_ptr current_inst) +void ExpressionContext::pushExprInst(std::shared_ptr current_inst) { if (!expression_stack.size() || expression_stack.last() != current_inst) expression_stack.append(current_inst); } -std::shared_ptr ExpressionContext::popInst() +std::shared_ptr ExpressionContext::popExprInst() { auto lastx = expression_stack.takeLast(); return lastx; } -std::shared_ptr ExpressionContext::currentExpressionRule() const { +std::shared_ptr ExpressionContext::currentExprRule() const { if (rule_stack.size()) return rule_stack.last(); return nullptr; } -void ExpressionContext::pushExpressionRule(std::shared_ptr inst) { +void ExpressionContext::pushExprRule(std::shared_ptr inst) { if (!rule_stack.size() || rule_stack.last() != inst) rule_stack.append(inst); } -std::shared_ptr ExpressionContext::popExpressionRule() +std::shared_ptr ExpressionContext::popExprRule() { return rule_stack.takeLast(); } @@ -100,15 +100,15 @@ void ExpressionContext::clearErrors(const QString &file_path, int start) { } } -QList> ExpressionContext::currentExpressionRuleStack() const { +QList> ExpressionContext::currentExpressionRuleStack() const { return rule_stack; } -void ExpressionContext::appendDoc(std::shared_ptr inst) { +void ExpressionContext::appendDoc(std::shared_ptr inst) { this->document_store.append(inst); } -QList> ExpressionContext::getDocs() const { +QList> ExpressionContext::getDocs() const { return this->document_store; } \ No newline at end of file diff --git a/libSyntax/ast_basic.h b/libSyntax/ast_basic.h index ffd5b33..5f7bfda 100644 --- a/libSyntax/ast_basic.h +++ b/libSyntax/ast_basic.h @@ -10,9 +10,9 @@ namespace ast_basic { /** * @brief 抽象语法树集合节点/表达式节点 */ - class ExprInst { + class IExprInst { public: - virtual ~ExprInst() = default; + virtual ~IExprInst() = default; /** * @brief 获取表达式的解析规则 @@ -49,13 +49,13 @@ namespace ast_basic { * @brief 子表达式集合 * @return */ - virtual QList> children() const = 0; + virtual QList> children() const = 0; /** * @brief 添加子表达式. * * \param inst 子表达式实例 */ - virtual void addChild(std::shared_ptr inst) = 0; + virtual void addChild(std::shared_ptr inst) = 0; }; @@ -63,10 +63,10 @@ namespace ast_basic { /** * @brief 表达式节点 */ - class LIBSYNTAX_EXPORT ExpressionElement : public ast_basic::ExprInst, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT ExpressionElement : public ast_basic::IExprInst, public std::enable_shared_from_this { private: std::shared_ptr _expr_rule; - QList> children_store; + QList> children_store; QList> tokens_bind; public: @@ -80,15 +80,15 @@ namespace ast_basic { void tokensReset(const QList>& list) override; void addToken(std::shared_ptr token_inst) override; - QList> children() const override; - void addChild(std::shared_ptr inst) override; + QList> children() const override; + void addChild(std::shared_ptr inst) override; }; - class LIBSYNTAX_EXPORT ExpressionContext : public lib_syntax::ParseContext, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT ExpressionContext : public lib_syntax::IContext, public std::enable_shared_from_this { private: - QList> rule_stack; - QList> expression_stack; - QList> document_store; + QList> rule_stack; + QList> expression_stack; + QList> document_store; QString current_file_path; QList> errors_storage; @@ -98,18 +98,18 @@ namespace ast_basic { virtual void setCurrentFile(const QString& path); virtual QString currentFile() const; - // 通过 ParseContext 继承 - std::shared_ptr currentInst() const override; - void pushInst(std::shared_ptr current_inst) override; - std::shared_ptr popInst() override; + // 通过 IContext 继承 + std::shared_ptr currentExprInst() const override; + void pushExprInst(std::shared_ptr current_inst) override; + std::shared_ptr popExprInst() override; - std::shared_ptr currentExpressionRule() const override; - void pushExpressionRule(std::shared_ptr inst) override; - std::shared_ptr popExpressionRule() override; - virtual QList> currentExpressionRuleStack() const; + std::shared_ptr currentExprRule() const override; + void pushExprRule(std::shared_ptr inst) override; + std::shared_ptr popExprRule() override; + virtual QList> currentExpressionRuleStack() const; - virtual void appendDoc(std::shared_ptr inst) override; - virtual QList> getDocs() const override; + virtual void appendDoc(std::shared_ptr inst) override; + virtual QList> getDocs() const override; void appendParseErrors(const QString& file_path, int start, const QString& error_msg) override; QStringList errors() const override; diff --git a/libSyntax/ast_gen.cpp b/libSyntax/ast_gen.cpp index 3284993..56e6ecc 100644 --- a/libSyntax/ast_gen.cpp +++ b/libSyntax/ast_gen.cpp @@ -39,7 +39,7 @@ void ast_gen::GlobalElement::setParent(std::shared_ptr inst QList> GlobalElement::selfTokens() const { return QList>(); } -std::shared_ptr ast_gen::GlobalElement::bindExpression() const +std::shared_ptr ast_gen::GlobalElement::bindExpression() const { return bind_exprs; } @@ -49,7 +49,7 @@ void ast_gen::GlobalElement::cacheLoad() } void GlobalElement::addChild(std::shared_ptr citem) { - auto convx = std::dynamic_pointer_cast(citem); + auto convx = std::dynamic_pointer_cast(citem); bind_exprs->addChild(convx); } diff --git a/libSyntax/ast_gen.h b/libSyntax/ast_gen.h index 71c54bb..2dc6246 100644 --- a/libSyntax/ast_gen.h +++ b/libSyntax/ast_gen.h @@ -21,7 +21,7 @@ namespace ast_gen * * \return 表达式实例 */ - virtual std::shared_ptr bindExpression() const = 0; + virtual std::shared_ptr bindExpression() const = 0; /** * @brief 类型标记 @@ -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; @@ -135,7 +135,7 @@ namespace ast_gen virtual QList> selfTokens() const override; // 通过 SyntaxElement 继承 - virtual std::shared_ptr bindExpression() const override; + virtual std::shared_ptr bindExpression() const override; virtual void cacheLoad() override; }; } \ No newline at end of file diff --git a/libSyntax/ast_novel.cpp b/libSyntax/ast_novel.cpp index 1dc2662..e358dfb 100644 --- a/libSyntax/ast_novel.cpp +++ b/libSyntax/ast_novel.cpp @@ -145,7 +145,7 @@ void AbstractImpl::setParent(std::shared_ptr inst) // 通过 SyntaxElement 继承 -std::shared_ptr AbstractImpl::bindExpression() const { +std::shared_ptr AbstractImpl::bindExpression() const { return shared_from_this(); } diff --git a/libSyntax/ast_novel.h b/libSyntax/ast_novel.h index 45e3b79..6e55bbb 100644 --- a/libSyntax/ast_novel.h +++ b/libSyntax/ast_novel.h @@ -24,7 +24,7 @@ namespace example_novel explicit AbstractImpl(std::shared_ptr rule_bind); // 通过 SyntaxElement 继承 - virtual std::shared_ptr bindExpression() const override; + virtual std::shared_ptr bindExpression() const override; QString path() const override; virtual std::shared_ptr parent() const override; virtual void setParent(std::shared_ptr inst) override; diff --git a/libSyntax/libsyntax.cpp b/libSyntax/libsyntax.cpp index 2a06257..a40dce3 100644 --- a/libSyntax/libsyntax.cpp +++ b/libSyntax/libsyntax.cpp @@ -9,30 +9,30 @@ using namespace ast_basic; TokenMatch::TokenMatch(shared_ptr define) : define_peer(define) {} -QList> TokenMatch::children() const { return QList>(); } +QList> TokenMatch::children() const { return QList>(); } -std::tuple> TokenMatch::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { +std::tuple> TokenMatch::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { if (!head) { rt_inst->appendParseErrors(rt_inst->currentFile(), - 1, QString(u8"Syntax[0x0000]token流（%1）提前终止").arg(rt_inst->currentFile())); - return std::make_tuple(BaseRule::MatchResult::Fail, head); + return std::make_tuple(IBasicRule::MatchResult::Fail, head); } auto match_result = define_peer->analysis(head); if (std::get<0>(match_result)) { - rt_inst->currentInst()->addToken(std::get<0>(match_result)); + rt_inst->currentExprInst()->addToken(std::get<0>(match_result)); } else { rt_inst->appendParseErrors(rt_inst->currentFile(), head->position(), QString(u8"Syntax[0x00001]语法匹配错误，不能识别token：%1<%2,%3>(%4)") .arg(head->content()).arg(head->row()).arg(head->column()).arg(head->file())); - return std::make_tuple(BaseRule::MatchResult::Part, head); + return std::make_tuple(IBasicRule::MatchResult::Part, head); } if (std::get<1>(match_result)) { - return std::make_tuple(BaseRule::MatchResult::Success, std::make_shared(std::get<1>(match_result), head->nextWord())); + return std::make_tuple(IBasicRule::MatchResult::Success, std::make_shared(std::get<1>(match_result), head->nextWord())); } else { - return std::make_tuple(BaseRule::MatchResult::Success, head->nextWord()); + return std::make_tuple(IBasicRule::MatchResult::Success, head->nextWord()); } } @@ -40,21 +40,21 @@ QString TokenMatch::token_present() const { return QString(u8"<%1>").arg(this->define_peer->typeName()); } -Rept::Rept(std::shared_ptr rule, int min, int max) : rule_peer(rule), min_match(min), max_match(max) {} +Rept::Rept(std::shared_ptr rule, int min, int max) : rule_peer(rule), min_match(min), max_match(max) {} -QList> Rept::children() const { return QList>() << rule_peer; } +QList> Rept::children() const { return QList>() << rule_peer; } -std::tuple> Rept::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { +std::tuple> Rept::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { auto temp_head = head; // min-match for (auto idx = 0; idx < min_match; ++idx) { auto result_gen = rule_peer->parse(rt_inst, temp_head); switch (std::get<0>(result_gen)) { - case BaseRule::MatchResult::Fail: - return std::make_tuple(BaseRule::MatchResult::Part, temp_head); - case BaseRule::MatchResult::Part: - return std::make_tuple(BaseRule::MatchResult::Part, std::get<1>(result_gen)); + case IBasicRule::MatchResult::Fail: + return std::make_tuple(IBasicRule::MatchResult::Part, temp_head); + case IBasicRule::MatchResult::Part: + return std::make_tuple(IBasicRule::MatchResult::Part, std::get<1>(result_gen)); default: temp_head = std::get<1>(result_gen); break; @@ -68,16 +68,16 @@ std::tuple> Rept::parse( auto result_gen = rule_peer->parse(rt_inst, temp_head); switch (std::get<0>(result_gen)) { - case BaseRule::MatchResult::Fail: - case BaseRule::MatchResult::Part: - return std::make_tuple(BaseRule::MatchResult::Success, temp_head); + case IBasicRule::MatchResult::Fail: + case IBasicRule::MatchResult::Part: + return std::make_tuple(IBasicRule::MatchResult::Success, temp_head); default: temp_head = std::get<1>(result_gen); break; } } - return std::make_tuple(BaseRule::MatchResult::Success, temp_head); + return std::make_tuple(IBasicRule::MatchResult::Success, temp_head); } QString Rept::token_present() const @@ -85,21 +85,21 @@ QString Rept::token_present() const return u8"(" + this->rule_peer->token_present() + QString(u8"{%1, %2}").arg(min_match).arg(max_match) + u8")"; } -Seqs::Seqs(const QList> mbrs) : mbrs_store(mbrs) {} +Seqs::Seqs(const QList> mbrs) : mbrs_store(mbrs) {} -QList> Seqs::children() const { return mbrs_store; } +QList> Seqs::children() const { return mbrs_store; } -std::tuple> Seqs::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { +std::tuple> Seqs::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { auto temp_head = head; for (auto& r : mbrs_store) { auto rst_gene = r->parse(rt_inst, temp_head); switch (std::get<0>(rst_gene)) { - case BaseRule::MatchResult::Fail: - return std::make_tuple(BaseRule::MatchResult::Part, temp_head); - case BaseRule::MatchResult::Part: + case IBasicRule::MatchResult::Fail: + return std::make_tuple(IBasicRule::MatchResult::Part, temp_head); + case IBasicRule::MatchResult::Part: return rst_gene; - case BaseRule::MatchResult::Success: + case IBasicRule::MatchResult::Success: temp_head = std::get<1>(rst_gene); break; default: @@ -107,7 +107,7 @@ std::tuple> Seqs::parse( } } - return std::make_tuple(BaseRule::MatchResult::Success, temp_head); + return std::make_tuple(IBasicRule::MatchResult::Success, temp_head); } QString Seqs::token_present() const @@ -118,10 +118,10 @@ QString Seqs::token_present() const return QString(u8"(%1)").arg(content); } -//std::tuple, std::shared_ptr> -Any::Any(const QList> mbrs) : mbrs_store(mbrs) {} +//std::tuple, std::shared_ptr> +Any::Any(const QList> mbrs) : mbrs_store(mbrs) {} -QList> Any::children() const { return mbrs_store; } +QList> Any::children() const { return mbrs_store; } class words_span { public: @@ -135,21 +135,21 @@ public: return false; } }; -std::tuple> Any::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { - std::tuple, uint64_t> temp_result = std::make_tuple(nullptr, 0); +std::tuple> Any::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { + std::tuple, uint64_t> temp_result = std::make_tuple(nullptr, 0); auto rule_present = this->token_present(); for (auto& fork : mbrs_store) { auto gen = fork->parse(rt_inst, head); switch (std::get<0>(gen)) { // 遇到成功的直接返回解析结果 - case BaseRule::MatchResult::Success: + case IBasicRule::MatchResult::Success: return gen; - case BaseRule::MatchResult::Fail: { + case IBasicRule::MatchResult::Fail: { if (!std::get<0>(temp_result)) temp_result = std::make_tuple(fork, 0); }break; - case BaseRule::MatchResult::Part: { + case IBasicRule::MatchResult::Part: { auto span = std::get<1>(gen)->position() - head->position(); if (span >= std::get<1>(temp_result)) temp_result = std::make_tuple(fork, span); @@ -162,7 +162,7 @@ std::tuple> Any::parse(s // 分析最匹配的分支 rt_inst->clearErrors(rt_inst->currentFile(), head->position()); auto temp = std::get<0>(temp_result)->parse(rt_inst, head); - return std::make_tuple(BaseRule::MatchResult::Part, std::get<1>(temp)); + return std::make_tuple(IBasicRule::MatchResult::Part, std::get<1>(temp)); } QString Any::token_present() const @@ -183,7 +183,7 @@ ExprRule::ExprRule(const QString& rule_name, int expr_mark) : name_store(rule_na this->mark_store = expr_mark; } -std::shared_ptr ExprRule::reloadRule(std::shared_ptr rule) { +std::shared_ptr ExprRule::reloadRule(std::shared_ptr rule) { auto ninst = makeCopy(); ninst->child_store = rule; return ninst; @@ -193,39 +193,39 @@ QString ExprRule::name() const { return name_store; } int ExprRule::typeMark() const { return this->mark_store; } -QList> ExprRule::children() const { - return QList>() << this->child_store; +QList> ExprRule::children() const { + return QList>() << this->child_store; } #include -std::tuple> -ExprRule::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { - std::shared_ptr elm_ast = this->newEmptyInstance(); +std::tuple> +ExprRule::parse(std::shared_ptr rt_inst, std::shared_ptr head) const { + std::shared_ptr elm_ast = this->newEmptyInstance(); auto text_present = this->token_present(); - rt_inst->pushExpressionRule(this->shared_from_this()); - rt_inst->pushInst(elm_ast); + rt_inst->pushExprRule(this->shared_from_this()); + rt_inst->pushExprInst(elm_ast); auto rstg = child_store->parse(rt_inst, head); auto tokens_decl = elm_ast->tokens(); switch (std::get<0>(rstg)) { - case BaseRule::MatchResult::Fail: - case BaseRule::MatchResult::Part: - rt_inst->popInst(); - rt_inst->popExpressionRule(); + case IBasicRule::MatchResult::Fail: + case IBasicRule::MatchResult::Part: + rt_inst->popExprInst(); + rt_inst->popExprRule(); break; - case BaseRule::MatchResult::Success: { + case IBasicRule::MatchResult::Success: { if (!std::dynamic_pointer_cast(elm_ast)) { auto start_pos = tokens_decl.first()->position(); rt_inst->clearErrors(rt_inst->currentFile(), start_pos); } - rt_inst->popInst(); - rt_inst->popExpressionRule(); + rt_inst->popExprInst(); + rt_inst->popExprRule(); - if (rt_inst->currentInst()) { - rt_inst->currentInst()->addChild(elm_ast); + if (rt_inst->currentExprInst()) { + rt_inst->currentExprInst()->addChild(elm_ast); } else { rt_inst->appendDoc(elm_ast); diff --git a/libSyntax/libsyntax.h b/libSyntax/libsyntax.h index f9bd378..be528f8 100644 --- a/libSyntax/libsyntax.h +++ b/libSyntax/libsyntax.h @@ -6,12 +6,12 @@ #include #include namespace ast_basic { - class ExprInst; + class IExprInst; class ExpressionElement; } namespace lib_syntax { - class BaseRule; + class IBasicRule; /** * @brief 语法异常 @@ -31,9 +31,9 @@ namespace lib_syntax { /** * @brief 解析上下文接口 */ - class ParseContext { + class IContext { public: - virtual ~ParseContext() = default; + virtual ~IContext() = default; virtual void setCurrentFile(const QString &path) = 0; virtual QString currentFile() const = 0; @@ -42,35 +42,35 @@ namespace lib_syntax { virtual QStringList errors() const = 0; virtual void clearErrors(const QString &file_path, int start) = 0; - virtual void appendDoc(std::shared_ptr inst) = 0; - virtual QList> getDocs() const = 0; + virtual void appendDoc(std::shared_ptr inst) = 0; + virtual QList> getDocs() const = 0; /** * \brief 当前表达式元素. * * \return 返回当前表达式 */ - virtual std::shared_ptr currentInst() const = 0; - virtual void pushInst(std::shared_ptr current_inst) = 0; - virtual std::shared_ptr popInst() = 0; + virtual std::shared_ptr currentExprInst() const = 0; + virtual void pushExprInst(std::shared_ptr current_inst) = 0; + virtual std::shared_ptr popExprInst() = 0; - virtual std::shared_ptr currentExpressionRule() const = 0; - virtual void pushExpressionRule(std::shared_ptr inst) = 0; - virtual std::shared_ptr popExpressionRule() = 0; - virtual QList> currentExpressionRuleStack() const = 0; + virtual std::shared_ptr currentExprRule() const = 0; + virtual void pushExprRule(std::shared_ptr inst) = 0; + virtual std::shared_ptr popExprRule() = 0; + virtual QList> currentExpressionRuleStack() const = 0; }; /** * @brief 基础语法匹配规则接口 */ - class BaseRule { + class IBasicRule { public: - virtual ~BaseRule() = default; + virtual ~IBasicRule() = default; /** * @brief 子规则 * @return */ - virtual QList> children() const = 0; + virtual QList> children() const = 0; /** * @brief 匹配结果 @@ -87,8 +87,8 @@ namespace lib_syntax { * @param head 列表头 * @return 返回结果<匹配完成新列表头,匹配长度> */ - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const = 0; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const = 0; /** * 返回匹配语法规则的词法序列表达 @@ -102,75 +102,75 @@ namespace lib_syntax { /** * @brief token匹配 */ - class LIBSYNTAX_EXPORT TokenMatch : public BaseRule, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT TokenMatch : public IBasicRule, public std::enable_shared_from_this { private: std::shared_ptr define_peer; public: TokenMatch(std::shared_ptr define); - // BaseRule interface + // IBasicRule interface public: - virtual QList> children() const override; - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; + virtual QList> children() const override; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; virtual QString token_present() const override; }; /** * @brief 语法规则或匹配 */ - class LIBSYNTAX_EXPORT Any : public BaseRule, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT Any : public IBasicRule, public std::enable_shared_from_this { private: - QList> mbrs_store; + QList> mbrs_store; - std::tuple, std::shared_ptr> rule_select(std::shared_ptr head) const; + std::tuple, std::shared_ptr> rule_select(std::shared_ptr head) const; public: - Any(const QList> mbrs); + Any(const QList> mbrs); - // BaseRule interface + // IBasicRule interface public: - virtual QList> children() const override; - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; + virtual QList> children() const override; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; virtual QString token_present() const override; }; /** * @brief 语法规则序列匹配 */ - class LIBSYNTAX_EXPORT Seqs : public BaseRule, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT Seqs : public IBasicRule, public std::enable_shared_from_this { private: - QList> mbrs_store; + QList> mbrs_store; public: - Seqs(const QList> mbrs); + Seqs(const QList> mbrs); - // BaseRule interface + // IBasicRule interface public: - virtual QList> children() const override; - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; + virtual QList> children() const override; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; virtual QString token_present() const override; }; /** * @brief 语法规则重复匹配 */ - class LIBSYNTAX_EXPORT Rept : public BaseRule, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT Rept : public IBasicRule, public std::enable_shared_from_this { private: - std::shared_ptr rule_peer; + std::shared_ptr rule_peer; int min_match, max_match; public: - Rept(std::shared_ptr rule, int min, int max); + Rept(std::shared_ptr rule, int min, int max); - // BaseRule interface + // IBasicRule interface public: - virtual QList> children() const override; - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; + virtual QList> children() const override; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; virtual QString token_present() const override; }; @@ -178,27 +178,27 @@ namespace lib_syntax { /** * @brief 对应语法表达式解析规则 */ - class LIBSYNTAX_EXPORT ExprRule : public lib_syntax::BaseRule, public std::enable_shared_from_this { + class LIBSYNTAX_EXPORT ExprRule : public lib_syntax::IBasicRule, public std::enable_shared_from_this { public: typedef QList> TokenSeqs; ExprRule(const QString& rule_name, int expr_mark); - virtual std::shared_ptr reloadRule(std::shared_ptr rule); + virtual std::shared_ptr reloadRule(std::shared_ptr rule); virtual QString name() const; virtual int typeMark() const; - virtual std::shared_ptr newEmptyInstance() const = 0; + virtual std::shared_ptr newEmptyInstance() const = 0; virtual std::shared_ptr makeCopy() const = 0; - // BaseRule interface + // IBasicRule interface public: - virtual QList> children() const override; - virtual std::tuple> - parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; + virtual QList> children() const override; + virtual std::tuple> + parse(std::shared_ptr rt_inst, std::shared_ptr head) const override; virtual QString token_present() const override; private: - std::shared_ptr child_store; + std::shared_ptr child_store; QString name_store; int mark_store; }; @@ -212,8 +212,8 @@ namespace lib_syntax { ElementRule(const QString& rule_name, int expr_mark) :ExprRule(rule_name, expr_mark){} - virtual std::shared_ptr newEmptyInstance() const { - return std::dynamic_pointer_cast( + virtual std::shared_ptr newEmptyInstance() const { + return std::dynamic_pointer_cast( std::make_shared(this->shared_from_this())); } diff --git a/libSyntax/syntax_novel.cpp b/libSyntax/syntax_novel.cpp index 90d13ee..3046366 100644 --- a/libSyntax/syntax_novel.cpp +++ b/libSyntax/syntax_novel.cpp @@ -29,7 +29,7 @@ auto name_text = std::make_shared(); // ^ // MatchRule #define MR(x) std::make_shared(x) // Buffer -#define Rules QList> +#define Rules QList> // Option #define OptMulT(token) std::make_shared(MR(token), 0, INT_MAX) #define OptMulR(rule) std::make_shared(rule, 0, INT_MAX)