重构语法结构名称

libSyntax/syntax_novel.cpp

@@ -11,14 +11,14 @@ auto leftb = std::make_shared<LeftBracket>();                           // {
 auto rightb = std::make_shared<RightBracket>();                         // }
 auto refers = std::make_shared<ReferMark>();                            // @
 
-auto story = std::make_shared<Keywords>(u8"故事", u8"story-mark");            // 故事
+auto story_key = std::make_shared<Keywords>(u8"故事", u8"story-mark");            // 故事
 auto numbers = std::make_shared<Numbers>();                              // [0-9]+
-auto frags = std::make_shared<Keywords>(u8"情节", u8"fragment-mark");         // 情节
-auto volume = std::make_shared<Keywords>(u8"分卷", u8"volume-mark");          // 分卷
-auto article = std::make_shared<Keywords>(u8"章节", u8"article-mark");        // 章节
-auto split = std::make_shared<Split>();                                 // &
+auto frag_key = std::make_shared<Keywords>(u8"情节", u8"fragment-mark");         // 情节
+auto volume_key = std::make_shared<Keywords>(u8"分卷", u8"volume-mark");          // 分卷
+auto article_key = std::make_shared<Keywords>(u8"章节", u8"article-mark");        // 章节
+auto split_mark = std::make_shared<Split>();                                 // &
 auto vtext = std::make_shared<VTextSection>();                          // ^([^\\{\\}\\n@&]+)
-auto ntext = std::make_shared<NameSection>();                           // ^([^:\\{\\}\\n@&][^\\{\\}\\n@&]*)
+auto name_text = std::make_shared<NameSection>();                           // ^([^:\\{\\}\\n@&][^\\{\\}\\n@&]*)
 
 auto newl = std::make_shared<NewLine>();
 
@@ -29,13 +29,25 @@ auto newl = std::make_shared<NewLine>();
 // MatchRule
 #define MR(x) std::make_shared<const TokenMatch>(x)
 // Buffer
-#define Buff QList<std::shared_ptr<const BaseRule>>()
+#define Rules QList<std::shared_ptr<const BaseRule>>
 // Option
 #define OptMulT(token) std::make_shared<const Rept>(MR(token), 0, INT_MAX)
 #define OptMulR(rule) std::make_shared<const Rept>(rule, 0, INT_MAX)
 // multi+
 #define MultiR(rule) std::make_shared<const Rept>(rule, 1, INT_MAX)
 
+
+QList<std::shared_ptr<const BaseRule>> LinesMerge(const QList<std::shared_ptr<const BaseRule>>& mbrs) {
+    QList<std::shared_ptr<const BaseRule>> values_ret;
+    for (auto& item : mbrs) {
+        values_ret << item << OptMulT(newl);
+    }
+    return values_ret;
+}
+QList<std::shared_ptr<const BaseRule>> LinesMerge(std::shared_ptr<const BaseRule> item) {
+    return QList<std::shared_ptr<const BaseRule>>() << item << OptMulT(newl);
+}
+
 // remove-return
 auto remove_nl = [](const ExprRule::TokenSeqs& p)->ExprRule::TokenSeqs {
     ExprRule::TokenSeqs result;
@@ -50,55 +62,54 @@ auto remove_nl = [](const ExprRule::TokenSeqs& p)->ExprRule::TokenSeqs {
     return result;
 };
 
-auto decl_comp = std::make_shared<const Any>(Buff << MR(numbers) << MR(vtext) << MR(ntext) << MR(split));
-auto decl_expr = ExprRule(u8"decl_section", (int)NovelExprs::DESC_SECTION)
-.reloadRule(remove_nl, std::make_shared<const Seqs>(Buff << MultiR(decl_comp) << OptMulT(newl)));
+auto decl_comp = std::make_shared<const Any>(Rules{MR(numbers), MR(vtext), MR(name_text), MR(split_mark)});
+auto decl_expr = ExprRule(u8"decl_section", (int)NovelExprs::DESC_SECTION).reloadRule(remove_nl, 
+    std::make_shared<const Seqs>(LinesMerge(MultiR(decl_comp))
+));
 
-auto fragment_decl = ExprRule(u8"fragment_define", (int)NovelExprs::FRAG_DEFINES)
-.reloadRule(remove_nl, std::make_shared<const Seqs>(Buff
-    << MR(leftb) << OptMulT(newl) << MR(frags) << OptMulT(newl) << MR(ntext) << OptMulT(newl)
-    << OptMulR(decl_expr) << MR(rightb) << OptMulT(newl)));
+auto fragment_decl = ExprRule(u8"fragment_define", (int)NovelExprs::FRAG_DEFINES).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    LinesMerge(Rules{MR(leftb), MR(frag_key), MR(name_text)}) << 
+        OptMulR(decl_expr) << 
+    LinesMerge(MR(rightb))
+));
 
-auto fragment_refer = ExprRule(u8"fragment_refer", (int)NovelExprs::FRAG_REFERS)
-.reloadRule(remove_nl, std::make_shared<const Seqs>(Buff
-    << MR(leftb) << OptMulT(newl) << MR(refers) << OptMulT(newl) << MR(frags) << OptMulT(newl)
-    << MR(ntext) << OptMulT(newl) << MR(split) << OptMulT(newl) << MR(ntext) << OptMulT(newl)
-    << OptMulR(decl_expr) << MR(rightb) << OptMulT(newl)));
+auto fragment_refer = ExprRule(u8"fragment_refer", (int)NovelExprs::FRAG_REFERS).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    LinesMerge(Rules{MR(leftb), MR(refers), MR(frag_key), MR(name_text), MR(split_mark), MR(name_text)}) << 
+        OptMulR(decl_expr) << 
+    LinesMerge(MR(rightb))
+));
 
-auto fragment_comp = std::make_shared<const Any>(Buff << fragment_decl << fragment_refer << decl_expr);
-
-auto story_define =
-ExprRule(u8"story_define", (int)NovelExprs::STORY_DEFINES)
-.reloadRule(remove_nl, std::make_shared<const Seqs>(Buff << OptMulT(newl)
-    << MR(leftb) << OptMulT(newl) << MR(story) << OptMulT(newl) << MR(numbers) << OptMulT(newl) << MR(ntext) << OptMulT(newl)
-    << OptMulR(fragment_comp) << MR(rightb) << OptMulT(newl)));
+auto fragment_comp = std::make_shared<const Any>(Rules{fragment_decl, fragment_refer, decl_expr});
+auto story_define = ExprRule(u8"story_define", (int)NovelExprs::STORY_DEFINES).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    LinesMerge(Rules{MR(leftb), MR(story_key), MR(numbers), MR(name_text)}) <<
+        OptMulR(fragment_comp) <<
+    LinesMerge(MR(rightb))
+));
 // ===================================================================
-auto article_decl =
-ExprRule(u8"article_define", (int)NovelExprs::ARTICLE_DEFINE)
-.reloadRule(remove_nl, std::make_shared<const Seqs>(
-    Buff << MR(leftb) << OptMulT(newl) << MR(article) << OptMulT(newl) << MR(ntext) << OptMulT(newl)
-    << OptMulR(std::make_shared<const Any>(Buff << fragment_refer << decl_expr))
-    << MR(rightb) << OptMulT(newl)));
+auto article_decl = ExprRule(u8"article_define", (int)NovelExprs::ARTICLE_DEFINE).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    LinesMerge(Rules{MR(leftb), MR(article_key), MR(name_text)}) <<
+        OptMulR(std::make_shared<const Any>(Rules{ fragment_refer, decl_expr })) <<
+    LinesMerge(MR(rightb))
+));
 
-auto volume_decl =
-ExprRule(u8"volume_define", (int)NovelExprs::VOLUME_DEFINE)
-.reloadRule(remove_nl,
-    std::make_shared<const Seqs>(Buff << OptMulT(newl)
-    << MR(leftb) << OptMulT(newl) << MR(volume) << OptMulT(newl) << MR(ntext) << OptMulT(newl)
-        << OptMulR(std::make_shared<const Any>(Buff << decl_expr << article_decl))
-        << MR(rightb) << OptMulT(newl)));
+auto volume_decl = ExprRule(u8"volume_define", (int)NovelExprs::VOLUME_DEFINE).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    LinesMerge(Rules{MR(leftb), MR(volume_key), MR(name_text)}) <<
+        OptMulR(std::make_shared<const Any>(Rules{ decl_expr, article_decl })) <<
+    LinesMerge(MR(rightb))
+));
 
-auto document_define =
-ExprRule(u8"decls-doc", (int)NovelExprs::DOC_DEFINES)
-.reloadRule(remove_nl, std::make_shared<const Rept>(std::make_shared<const Any>(Buff << story_define << volume_decl), 1, INT_MAX));
+auto document_define = ExprRule(u8"decls-doc", (int)NovelExprs::DOC_DEFINES).reloadRule(remove_nl, std::make_shared<const Seqs>(
+    Rules{
+        OptMulT(newl), 
+        MultiR(std::make_shared<const Any>(Rules{story_define, volume_decl}))
+    }
+));
 
 std::shared_ptr<const ExprRule> NovalSyntax::getParseTree() { return document_define; }
-
-
 std::shared_ptr<const TokenReader> NovalSyntax::getLexReader()
 {
     auto inst = std::make_shared<lib_token::TokenReader>(QList<std::shared_ptr<const lib_token::TokenDefine>>()
-        << leftb << rightb << refers << split << story << frags << volume << article << numbers << ntext << vtext << newl);
+        << leftb << rightb << refers << split_mark << story_key << frag_key << volume_key << article_key << numbers << name_text << vtext << newl);
     return inst;
 }