重构语法结构名称
This commit is contained in:
parent
868703fce5
commit
6b240e313b
|
@ -11,14 +11,14 @@ auto leftb = std::make_shared<LeftBracket>(); // {
|
||||||
auto rightb = std::make_shared<RightBracket>(); // }
|
auto rightb = std::make_shared<RightBracket>(); // }
|
||||||
auto refers = std::make_shared<ReferMark>(); // @
|
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 numbers = std::make_shared<Numbers>(); // [0-9]+
|
||||||
auto frags = std::make_shared<Keywords>(u8"情节", u8"fragment-mark"); // 情节
|
auto frag_key = std::make_shared<Keywords>(u8"情节", u8"fragment-mark"); // 情节
|
||||||
auto volume = std::make_shared<Keywords>(u8"分卷", u8"volume-mark"); // 分卷
|
auto volume_key = std::make_shared<Keywords>(u8"分卷", u8"volume-mark"); // 分卷
|
||||||
auto article = std::make_shared<Keywords>(u8"章节", u8"article-mark"); // 章节
|
auto article_key = std::make_shared<Keywords>(u8"章节", u8"article-mark"); // 章节
|
||||||
auto split = std::make_shared<Split>(); // &
|
auto split_mark = std::make_shared<Split>(); // &
|
||||||
auto vtext = std::make_shared<VTextSection>(); // ^([^\\{\\}\\n@&]+)
|
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>();
|
auto newl = std::make_shared<NewLine>();
|
||||||
|
|
||||||
|
@ -62,38 +62,38 @@ auto remove_nl = [](const ExprRule::TokenSeqs& p)->ExprRule::TokenSeqs {
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
auto decl_comp = std::make_shared<const Any>(Rules{MR(numbers), MR(vtext), MR(ntext), MR(split)});
|
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,
|
auto decl_expr = ExprRule(u8"decl_section", (int)NovelExprs::DESC_SECTION).reloadRule(remove_nl,
|
||||||
std::make_shared<const Seqs>(LinesMerge(MultiR(decl_comp))
|
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>(
|
auto fragment_decl = ExprRule(u8"fragment_define", (int)NovelExprs::FRAG_DEFINES).reloadRule(remove_nl, std::make_shared<const Seqs>(
|
||||||
LinesMerge(Rules{MR(leftb), MR(frags), MR(ntext)}) <<
|
LinesMerge(Rules{MR(leftb), MR(frag_key), MR(name_text)}) <<
|
||||||
OptMulR(decl_expr) <<
|
OptMulR(decl_expr) <<
|
||||||
LinesMerge(MR(rightb))
|
LinesMerge(MR(rightb))
|
||||||
));
|
));
|
||||||
|
|
||||||
auto fragment_refer = ExprRule(u8"fragment_refer", (int)NovelExprs::FRAG_REFERS).reloadRule(remove_nl, std::make_shared<const Seqs>(
|
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(frags), MR(ntext), MR(split), MR(ntext)}) <<
|
LinesMerge(Rules{MR(leftb), MR(refers), MR(frag_key), MR(name_text), MR(split_mark), MR(name_text)}) <<
|
||||||
OptMulR(decl_expr) <<
|
OptMulR(decl_expr) <<
|
||||||
LinesMerge(MR(rightb))
|
LinesMerge(MR(rightb))
|
||||||
));
|
));
|
||||||
|
|
||||||
auto fragment_comp = std::make_shared<const Any>(Rules{fragment_decl, fragment_refer, decl_expr});
|
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>(
|
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), MR(numbers), MR(ntext)}) <<
|
LinesMerge(Rules{MR(leftb), MR(story_key), MR(numbers), MR(name_text)}) <<
|
||||||
OptMulR(fragment_comp) <<
|
OptMulR(fragment_comp) <<
|
||||||
LinesMerge(MR(rightb))
|
LinesMerge(MR(rightb))
|
||||||
));
|
));
|
||||||
// ===================================================================
|
// ===================================================================
|
||||||
auto article_decl = ExprRule(u8"article_define", (int)NovelExprs::ARTICLE_DEFINE).reloadRule(remove_nl, std::make_shared<const Seqs>(
|
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), MR(ntext)}) <<
|
LinesMerge(Rules{MR(leftb), MR(article_key), MR(name_text)}) <<
|
||||||
OptMulR(std::make_shared<const Any>(Rules{ fragment_refer, decl_expr })) <<
|
OptMulR(std::make_shared<const Any>(Rules{ fragment_refer, decl_expr })) <<
|
||||||
LinesMerge(MR(rightb))
|
LinesMerge(MR(rightb))
|
||||||
));
|
));
|
||||||
|
|
||||||
auto volume_decl = ExprRule(u8"volume_define", (int)NovelExprs::VOLUME_DEFINE).reloadRule(remove_nl, std::make_shared<const Seqs>(
|
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), MR(ntext)}) <<
|
LinesMerge(Rules{MR(leftb), MR(volume_key), MR(name_text)}) <<
|
||||||
OptMulR(std::make_shared<const Any>(Rules{ decl_expr, article_decl })) <<
|
OptMulR(std::make_shared<const Any>(Rules{ decl_expr, article_decl })) <<
|
||||||
LinesMerge(MR(rightb))
|
LinesMerge(MR(rightb))
|
||||||
));
|
));
|
||||||
|
@ -109,7 +109,7 @@ std::shared_ptr<const ExprRule> NovalSyntax::getParseTree() { return document_de
|
||||||
std::shared_ptr<const TokenReader> NovalSyntax::getLexReader()
|
std::shared_ptr<const TokenReader> NovalSyntax::getLexReader()
|
||||||
{
|
{
|
||||||
auto inst = std::make_shared<lib_token::TokenReader>(QList<std::shared_ptr<const lib_token::TokenDefine>>()
|
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;
|
return inst;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue