From 77e8e7362547089ed0fe82f6951347d0545cb86b Mon Sep 17 00:00:00 2001 From: codeboss <2422523675@qq.com> Date: Wed, 12 Feb 2025 21:50:45 +0800 Subject: [PATCH] update --- CoreTest/main.cpp | 9 +- libSyntax/ast_gen.cpp | 2 +- libSyntax/libsyntax.h | 57 +++----- libSyntax/syntax_novel.cpp | 1 + libSyntax/tokens_impl.h | 16 +-- libSyntax/tokens_novel.cpp | 280 ++++++++++++++++++++----------------- libWords/libwords.cpp | 6 +- libWords/libwords.h | 2 +- 8 files changed, 191 insertions(+), 182 deletions(-) diff --git a/CoreTest/main.cpp b/CoreTest/main.cpp index e4783e0..9f1c0b1 100644 --- a/CoreTest/main.cpp +++ b/CoreTest/main.cpp @@ -26,13 +26,18 @@ int main(int argc, char *argv[]) auto rst = parser.parse(vwords); for (auto one : rst) { qDebug() << "==================================================="; - qDebug().noquote() << one->totalErrors(); + QList words_list; auto vtoken = one->currentToken(); while (vtoken) { if(vtoken->defines()) - qDebug() << vtoken->content(); + words_list.prepend(vtoken->content()); vtoken = vtoken->prevToken(); } + + qDebug() << QString("Row:%1,Col:%2,Position:%3,ErrorCount:%4,Errors:") + .arg(one->currentToken()->row()).arg(one->currentToken()->column()).arg(one->currentToken()->position()).arg(one->exprsErrorCount()) + << one->totalErrors(); + qDebug() << words_list; } return a.exec(); diff --git a/libSyntax/ast_gen.cpp b/libSyntax/ast_gen.cpp index 13afbb5..db98ef8 100644 --- a/libSyntax/ast_gen.cpp +++ b/libSyntax/ast_gen.cpp @@ -16,7 +16,7 @@ QList> SyntaxParser::parse(std::shared_ptr_rule_bind->parse(cursor); std::sort(list.begin(), list.end(), [&](std::shared_ptr a, std::shared_ptr b) { - return a->totalErrorCount() < b->totalErrorCount(); + return a->currentToken()->position() > b->currentToken()->position(); }); return list; diff --git a/libSyntax/libsyntax.h b/libSyntax/libsyntax.h index 415eb94..8316db6 100644 --- a/libSyntax/libsyntax.h +++ b/libSyntax/libsyntax.h @@ -194,6 +194,7 @@ namespace lib_syntax { } virtual QList> parse(std::shared_ptr current) const override { auto w_this = current->currentWords(); + // 如果提前结束，记录错误并返回 if (!w_this) { auto clone_ins = std::make_shared(current); clone_ins->logExprsError(QString("Syntax[0x00001]语法匹配错误，缺失\"%1\">") @@ -204,8 +205,8 @@ namespace lib_syntax { auto t_this = current->currentToken(); - auto match_result = _define_peers->analysis(w_this); + // 解析成功 if (std::get<0>(match_result)) { auto chain = std::make_shared>(std::get<0>(match_result), t_this); auto remains = w_this->nextWord(); @@ -220,27 +221,23 @@ namespace lib_syntax { else { QList> retvals; // 少一个 - { - auto short_one = std::make_shared(current); - short_one->logExprsError(QString("Syntax[0x00001]语法匹配错误，缺失\"%1\">") - .arg(this->_define_peers->reviseWords()) - .arg(w_this->row()).arg(w_this->column()).arg(w_this->file())); - retvals << short_one; - } + auto short_one = std::make_shared(current); + short_one->logExprsError(QString("Syntax[0x00001]语法匹配错误，缺失\"%1\">") + .arg(this->_define_peers->reviseWords()) + .arg(w_this->row()).arg(w_this->column()).arg(w_this->file())); + retvals << short_one; // 错一个 - { - auto error_one = std::make_shared(current); - error_one->logExprsError(QString("Syntax[0x00001]语法匹配错误，请修正\"%1\">") - .arg(w_this->content()).arg(w_this->row()).arg(w_this->column()).arg(w_this->file())); - auto tkins = std::make_shared( - w_this->row(), w_this->column(), w_this->position(), - QString("%2_%1").arg((uint64_t) error_one.get()).arg(this->_define_peers->reviseWords()), - w_this->file(), this->_define_peers); - auto tkchain = std::make_shared>(tkins, t_this); - error_one->setCurrent(tkchain, w_this->nextWord()); - retvals << error_one; - } + auto error_one = std::make_shared(current); + error_one->logExprsError(QString("Syntax[0x00001]语法匹配错误，请修正\"%1\">") + .arg(w_this->content()).arg(w_this->row()).arg(w_this->column()).arg(w_this->file())); + auto tkins = std::make_shared( + w_this->row(), w_this->column(), w_this->position(), + QString("%2_%1").arg((uint64_t) error_one.get()).arg(this->_define_peers->reviseWords()), + w_this->file(), this->_define_peers); + auto tkchain = std::make_shared>(tkins, t_this); + error_one->setCurrent(tkchain, w_this->nextWord()); + retvals << error_one; // 多一个 if (w_this->nextWord()) { @@ -288,33 +285,23 @@ namespace lib_syntax { } virtual QList> parse(std::shared_ptr cursor) const override { + // 提前结束，直接返回 if (cursor->mustStop()) return QList>() << cursor; auto t_this = cursor->currentToken(); auto w_this = cursor->currentWords(); + // 起始Token打点 auto split_begin = std::make_shared>(shared_from_this(), t_this); auto ncursor = std::make_shared(cursor); ncursor->setCurrent(split_begin, w_this); ncursor->enterExprs(); + // 表达式语法解析 auto nbranch = this->expr_rule_parse(ncursor); - decltype(nbranch) list_ok; - // 选择完全匹配成功的 - std::copy_if(nbranch.begin(), nbranch.end(), std::back_inserter(list_ok), - [](std::shared_ptr ins) { return !ins->exprsErrorCount(); }); - if (!list_ok.size()) { - // 选择被修正的 - std::copy_if(nbranch.begin(), nbranch.end(), std::back_inserter(list_ok), - [](std::shared_ptr ins) { return !ins->mustStop(); }); - // 匹配失败的 - if (!list_ok.size()) - list_ok = nbranch; - } - - decltype(list_ok) branch_procs; - std::for_each(list_ok.begin(), list_ok.end(), [&](std::shared_ptr curs) { + decltype(nbranch) branch_procs; + std::for_each(nbranch.begin(), nbranch.end(), [&](std::shared_ptr curs) { if (curs->mustStop()) { branch_procs.append(curs); } diff --git a/libSyntax/syntax_novel.cpp b/libSyntax/syntax_novel.cpp index 42323ee..1a1d1a3 100644 --- a/libSyntax/syntax_novel.cpp +++ b/libSyntax/syntax_novel.cpp @@ -172,6 +172,7 @@ public: // 通过 ElementRule 继承 QList> expr_rule_parse(std::shared_ptr cursor) const override { + auto text = _children_store->present(); return _children_store->parse(cursor); } }; diff --git a/libSyntax/tokens_impl.h b/libSyntax/tokens_impl.h index c283197..d6f504d 100644 --- a/libSyntax/tokens_impl.h +++ b/libSyntax/tokens_impl.h @@ -110,11 +110,11 @@ namespace lib_token { // 通过 IActionToken 继承 QString file() const override { - throw new lib_token::TokenException("不应该直接访问ExprBeginToken"); + return this->prevToken()->file(); } uint64_t position() const override { - throw new lib_token::TokenException("不应该直接访问ExprBeginToken"); + return this->prevToken()->position(); } QString content() const override { @@ -122,11 +122,11 @@ namespace lib_token { } int row() const override { - throw new lib_token::TokenException("不应该直接访问ExprBeginToken"); + return this->prevToken()->row(); } int column() const override { - throw new lib_token::TokenException("不应该直接访问ExprBeginToken"); + return this->prevToken()->column(); } std::shared_ptr defines() const override { @@ -160,19 +160,19 @@ namespace lib_token { // 通过 IActionToken 继承 QString file() const override { - throw new lib_token::TokenException("不应该直接访问ExprEndToken"); + return this->prevToken()->file(); } uint64_t position() const override { - throw new lib_token::TokenException("不应该直接访问ExprEndToken"); + return this->prevToken()->position(); } QString content() const override { throw new lib_token::TokenException("不应该直接访问ExprEndToken"); } int row() const override { - throw new lib_token::TokenException("不应该直接访问ExprEndToken"); + return this->prevToken()->row(); } int column() const override { - throw new lib_token::TokenException("不应该直接访问ExprEndToken"); + return this->prevToken()->column(); } std::shared_ptr defines() const override { return nullptr; diff --git a/libSyntax/tokens_novel.cpp b/libSyntax/tokens_novel.cpp index f008f06..fd4c303 100644 --- a/libSyntax/tokens_novel.cpp +++ b/libSyntax/tokens_novel.cpp @@ -7,196 +7,212 @@ using namespace lib_token; using namespace lib_words; -QString LBracket::reviseWords() const { return "{"; } - -int LBracket::typeMark() const -{ - return 0x01000000; +QString LBracket::reviseWords() const { + return "{"; } -QString LBracket::regex() const { return "{"; } +int LBracket::typeMark() const { + return 0x01000000; +} + +QString LBracket::regex() const { + return "{"; +} std::tuple, std::shared_ptr> LBracket::analysis(std::shared_ptr content) const { - auto text = content->content(); - if (!text.startsWith(regex())) - return std::make_tuple(nullptr, content); + auto text = content->content(); + if (!text.startsWith(regex())) + return std::make_tuple(nullptr, content); - auto token_inst = std::make_shared(content->row(), content->column(), content->position(), - content->content().mid(0, regex().length()), content->file(), shared_from_this()); + auto token_inst = std::make_shared(content->row(), content->column(), content->position(), + content->content().mid(0, regex().length()), content->file(), shared_from_this()); - auto t_remains = content->content().mid(regex().length()); - if (t_remains.length() > 0) { - auto remains = std::make_shared(content->row(), content->column() + regex().length(), - content->position() + regex().length(), t_remains, content->file()); - return std::make_tuple(token_inst, remains); - } - return std::make_tuple(token_inst, nullptr); + auto t_remains = content->content().mid(regex().length()); + if (t_remains.length() > 0) { + auto remains = std::make_shared(content->row(), content->column() + regex().length(), t_remains, content->file()); + return std::make_tuple(token_inst, remains); + } + return std::make_tuple(token_inst, nullptr); } -QString RBracket::reviseWords() const { return "}"; } - -int RBracket::typeMark() const -{ - return 0x02000000; +QString RBracket::reviseWords() const { + return "}"; } -QString RBracket::regex() const { return "}"; } - -QString ReferMk::reviseWords() const { return "@"; } - -int ReferMk::typeMark() const -{ - return 0x03000000; +int RBracket::typeMark() const { + return 0x02000000; } -QString ReferMk::regex() const { return "@"; } - -__keywords::__keywords(const QString& val, uint type_code) : means_store(val), type_code(type_code) {} - -QString __keywords::reviseWords() const { return means_store; } - -int __keywords::typeMark() const -{ - return 0x06000000 | (0x00ffffff & type_code); +QString RBracket::regex() const { + return "}"; } -QString __keywords::regex() const { return means_store; } +QString ReferMk::reviseWords() const { + return "@"; +} + +int ReferMk::typeMark() const { + return 0x03000000; +} + +QString ReferMk::regex() const { + return "@"; +} + +__keywords::__keywords(const QString& val, uint type_code) : means_store(val), type_code(type_code) { } + +QString __keywords::reviseWords() const { + return means_store; +} + +int __keywords::typeMark() const { + return 0x06000000 | (0x00ffffff & type_code); +} + +QString __keywords::regex() const { + return means_store; +} std::tuple, std::shared_ptr> __keywords::analysis(std::shared_ptr content) const { - if (content->content() != regex()) { - return std::make_tuple(nullptr, content); - } + if (content->content() != regex()) { + return std::make_tuple(nullptr, content); + } - auto token_inst = std::make_shared(content->row(), content->column(), content->position(), - content->content(), content->file(), shared_from_this()); - return std::make_tuple(token_inst, nullptr); + auto token_inst = std::make_shared(content->row(), content->column(), content->position(), + content->content(), content->file(), shared_from_this()); + return std::make_tuple(token_inst, nullptr); } -QString Numbers::reviseWords() const { return "正整数"; } - -int Numbers::typeMark() const -{ - return 0x07000000; +QString Numbers::reviseWords() const { + return "正整数"; } -QString Numbers::regex() const { return "^([0-9]+)$"; } +int Numbers::typeMark() const { + return 0x07000000; +} + +QString Numbers::regex() const { + return "^([0-9]+)$"; +} std::tuple, std::shared_ptr> Numbers::analysis(std::shared_ptr content) const { - auto text = content->content(); - QRegExp regx(regex()); - if (regx.indexIn(text) == -1) - return std::make_tuple(nullptr, content); + auto text = content->content(); + QRegExp regx(regex()); + if (regx.indexIn(text) == -1) + return std::make_tuple(nullptr, content); - auto tinst = std::make_shared(content->row(), content->column(), content->position(), - content->content(), content->file(), shared_from_this()); - return std::make_tuple(tinst, nullptr); + auto tinst = std::make_shared(content->row(), content->column(), content->position(), + content->content(), content->file(), shared_from_this()); + return std::make_tuple(tinst, nullptr); } -QString NormalText::reviseWords() const { return "文本"; } - -int NormalText::typeMark() const -{ - return 0x09000000; +QString NormalText::reviseWords() const { + return "文本"; } -QString NormalText::regex() const { return "^([^\\{\\}@&]+)"; } +int NormalText::typeMark() const { + return 0x09000000; +} + +QString NormalText::regex() const { + return "^([^\\{\\}@&]+)"; +} std::tuple, std::shared_ptr> NormalText::analysis(std::shared_ptr content) const { - auto text = content->content(); - QRegExp regx(regex()); - if (regx.indexIn(text) == -1) { - return std::make_tuple(nullptr, content); - } + auto text = content->content(); + QRegExp regx(regex()); + if (regx.indexIn(text) == -1) { + return std::make_tuple(nullptr, content); + } - auto match = regx.cap(1); - auto remains = content->content().mid(match.length()); + auto match = regx.cap(1); + auto remains = content->content().mid(match.length()); - auto tinst = std::make_shared(content->row(), content->column(), content->position(), - match, content->file(), shared_from_this()); - if (remains.length()) { - auto t_remains = std::make_shared(content->row(), content->column(), - content->position() + match.length(), remains, content->file()); - return std::make_tuple(tinst, t_remains); - } - return std::make_tuple(tinst, nullptr); + auto tinst = std::make_shared(content->row(), content->column(), content->position(), + match, content->file(), shared_from_this()); + if (remains.length()) { + auto t_remains = std::make_shared(content->row(), content->column() + match.length(), remains, content->file()); + return std::make_tuple(tinst, t_remains); + } + return std::make_tuple(tinst, nullptr); } -QString SplitMk::reviseWords() const { return "&"; } - -int SplitMk::typeMark() const -{ - return 0x05000000; +QString SplitMk::reviseWords() const { + return "&"; } -QString SplitMk::regex() const { return "&"; } - -QString NameText::reviseWords() const { return "名称"; } - -int NameText::typeMark() const -{ - return 0x08000000; +int SplitMk::typeMark() const { + return 0x05000000; } -QString NameText::regex() const { return "^([^\\{\\}@&]+)"; } +QString SplitMk::regex() const { + return "&"; +} + +QString NameText::reviseWords() const { + return "名称"; +} + +int NameText::typeMark() const { + return 0x08000000; +} + +QString NameText::regex() const { + return "^([^\\{\\}@&]+)"; +} std::tuple, std::shared_ptr > -NameText::analysis(std::shared_ptr content) const -{ - auto text = content->content(); - QRegExp regx(regex()); - if (regx.indexIn(text) == -1) { - return std::make_tuple(nullptr, content); - } +NameText::analysis(std::shared_ptr content) const { + auto text = content->content(); + QRegExp regx(regex()); + if (regx.indexIn(text) == -1) { + return std::make_tuple(nullptr, content); + } - auto match = regx.cap(1); - auto remains = content->content().mid(match.length()); + auto match = regx.cap(1); + auto remains = content->content().mid(match.length()); - auto tinst = std::make_shared(content->row(), content->column(), content->position(), - match, content->file(), shared_from_this()); - if (remains.length()) { - auto t_remains = std::make_shared(content->row(), content->column(), - content->position() + match.length(), remains, content->file()); - return std::make_tuple(tinst, t_remains); - } - return std::make_tuple(tinst, nullptr); + auto tinst = std::make_shared(content->row(), content->column(), content->position(), + match, content->file(), shared_from_this()); + if (remains.length()) { + auto t_remains = std::make_shared(content->row(), content->column() + match.length(), remains, content->file()); + return std::make_tuple(tinst, t_remains); + } + return std::make_tuple(tinst, nullptr); } QString DeclareSymbo::reviseWords() const { - return "#"; + return "#"; } -int DeclareSymbo::typeMark() const -{ - return 0x0A000000; +int DeclareSymbo::typeMark() const { + return 0x0A000000; } -QString DeclareSymbo::regex() const -{ - return "#"; +QString DeclareSymbo::regex() const { + return "#"; } std::tuple, std::shared_ptr> -DeclareSymbo::analysis(std::shared_ptr content) const -{ - auto text = content->content(); - if (content->column() != 1 && !text.startsWith(regex())) { - return std::make_tuple(nullptr, content); - } +DeclareSymbo::analysis(std::shared_ptr content) const { + auto text = content->content(); + if (content->column() != 1 && !text.startsWith(regex())) { + return std::make_tuple(nullptr, content); + } - auto remains = content->content().mid(regex().size()); + auto remains = content->content().mid(regex().size()); - auto tinst = std::make_shared(content->row(), content->column(), content->position(), - "#", content->file(), shared_from_this()); - if (remains.length()) { - auto t_remains = std::make_shared(content->row(), content->column()+1, - content->position() + regex().length(), remains, content->file()); - return std::make_tuple(tinst, t_remains); - } - return std::make_tuple(tinst, nullptr); + auto tinst = std::make_shared(content->row(), content->column(), content->position(), + "#", content->file(), shared_from_this()); + if (remains.length()) { + auto t_remains = std::make_shared(content->row(), content->column() + regex().length(), remains, content->file()); + return std::make_tuple(tinst, t_remains); + } + return std::make_tuple(tinst, nullptr); } inline example_novel::RankWord::RankWord() : __keywords("排序", 0xAEu) { } diff --git a/libWords/libwords.cpp b/libWords/libwords.cpp index 20c5b75..d7db0e9 100644 --- a/libWords/libwords.cpp +++ b/libWords/libwords.cpp @@ -40,7 +40,7 @@ QList> WordReader::parse_line(uint64_t start_po int columns_offset = 0; for (auto& w : words) { auto column_start = line_text.indexOf(w, columns_offset); - auto token = std::make_shared(row, column_start + 1, start_pos + column_start, w, path); + auto token = std::make_shared(row, column_start + 1, w, path); primary_words << token; columns_offset = column_start + w.length(); @@ -84,8 +84,8 @@ QString WordsException::message() const { } -WordContent::WordContent(int r, int c, uint64_t pos, const QString& t, const QString& p) - : row_n(r), col_n(c), doc_offset(pos), text_n(t), path_p(p) { } +WordContent::WordContent(int r, int c, const QString& t, const QString& p) + : row_n(r), col_n(c), doc_offset(r * std::pow(2, 20) + c), text_n(t), path_p(p) { } QString WordContent::file() const { return path_p; diff --git a/libWords/libwords.h b/libWords/libwords.h index 50610b2..55a2925 100644 --- a/libWords/libwords.h +++ b/libWords/libwords.h @@ -59,7 +59,7 @@ namespace lib_words { QString text_n, path_p; public: - WordContent(int r, int c, uint64_t pos, const QString& t, const QString& p); + WordContent(int r, int c, const QString& t, const QString& p); // WordBase interface public: