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> mbrs) : mbrs_store(mbrs) QList> 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> 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(); 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(u8" auto volume_key = std::make_shared(u8"·Ö¾í", 0xACu); // ·Ö¾í auto article_key = std::make_shared(u8"Õ½Ú", 0xADu); // ÕÂ½Ú auto split_mark = std::make_shared(); // & -auto vtext = std::make_shared(); // ^([^\\{\\}\\n@&]+) -auto name_text = std::make_shared(); // ^([^:\\{\\}\\n@&][^\\{\\}\\n@&]*) +auto vtext = std::make_shared(); // ^([^\\{\\}\@&]+) +auto name_text = std::make_shared(); // ^([^\\{\\}@&]+)