diff --git a/libSyntax/syntax_templets.h b/libSyntax/syntax_templets.h index b27bc33..81ab416 100644 --- a/libSyntax/syntax_templets.h +++ b/libSyntax/syntax_templets.h @@ -36,16 +36,20 @@ namespace lib_composit { SeqsR() : Seqs(__types_list::getRules()){ } }; - template + template requires std::derived_from class ReptR : public lib_syntax::Rept { public: ReptR() : Rept(std::make_shared(), min, max){ } }; + template class OptMulti : public ReptR{ }; + template class Multi : public ReptR{ }; + template class Opt : public ReptR{ }; - template xproc = nullptr> + + template p = nullptr> requires std::derived_from && std::derived_from - class TokenR : public lib_syntax::TokenMatch { + class TokenR : public lib_syntax::TokenMatch { public: - TokenR() : TokenMatch(std::make_shared()){ } + TokenR() : TokenMatch(std::make_shared()){ } }; } diff --git a/libSyntax/tokens_novel.h b/libSyntax/tokens_novel.h index 43e527f..397dd84 100644 --- a/libSyntax/tokens_novel.h +++ b/libSyntax/tokens_novel.h @@ -54,7 +54,6 @@ namespace example_novel { virtual std::tuple, std::shared_ptr> analysis(std::shared_ptr content) const override; }; - class LIBSYNTAX_EXPORT RankWord : public __keywords { public: RankWord();