From b13e727b9096cdb6a98097c3226dbc69a449e7ec Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Thu, 30 May 2019 18:05:47 +0900 Subject: [PATCH] refactor: remove unused func, combinator::pattern because it is not human-readable (too long and redundant) --- tests/test_lex_aux.hpp | 2 +- toml/combinator.hpp | 45 ++---------------------------------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/tests/test_lex_aux.hpp b/tests/test_lex_aux.hpp index 3778f27..8585c38 100644 --- a/tests/test_lex_aux.hpp +++ b/tests/test_lex_aux.hpp @@ -18,7 +18,7 @@ do { \ BOOST_CHECK_EQUAL(static_cast(std::distance( \ loc.begin(), loc.iter())), region.size()); \ } else { \ - std::cerr << "lexer " << lxr::pattern() << " failed with input `"; \ + std::cerr << "lexer failed with input `"; \ std::cerr << token << "`. expected `" << expected << "`\n"; \ std::cerr << "reason: " << result.unwrap_err() << '\n'; \ } \ diff --git a/toml/combinator.hpp b/toml/combinator.hpp index 36d367c..9b26ca6 100644 --- a/toml/combinator.hpp +++ b/toml/combinator.hpp @@ -79,8 +79,6 @@ struct character return ok(region(loc, first, loc.iter())); } - - static std::string pattern() {return show_char(target);} }; template constexpr char character::target; @@ -120,11 +118,6 @@ struct in_range loc.advance(); return ok(region(loc, first, loc.iter())); } - - static std::string pattern() - { - return concat_to_string("[",show_char(lower),"-",show_char(upper),"]"); - } }; template constexpr char in_range::upper; template constexpr char in_range::lower; @@ -150,19 +143,14 @@ struct exclude loc.reset(first); if(msg) { - return err(concat_to_string("invalid pattern (", - Combinator::pattern(), ") appeared ", rslt.unwrap().str())); + return err(concat_to_string("invalid pattern appeared ", + rslt.unwrap().str())); } return err(""); } loc.reset(std::next(first)); // XXX maybe loc.advance() is okay but... return ok(region(loc, first, loc.iter())); } - - static std::string pattern() - { - return concat_to_string("^(", Combinator::pattern(), ')'); - } }; // increment `iter`, if matches. otherwise, just return empty string. @@ -183,11 +171,6 @@ struct maybe } return ok(region(loc)); } - - static std::string pattern() - { - return concat_to_string('(', Combinator::pattern(), ")?"); - } }; template @@ -228,11 +211,6 @@ struct sequence reg += rslt.unwrap(); // concat regions return sequence::invoke(loc, std::move(reg), first, msg); } - - static std::string pattern() - { - return concat_to_string(Head::pattern(), sequence::pattern()); - } }; template @@ -253,7 +231,6 @@ struct sequence reg += rslt.unwrap(); // concat regions return ok(reg); } - static std::string pattern() {return Head::pattern();} }; template @@ -273,11 +250,6 @@ struct either if(rslt.is_ok()) {return rslt;} return either::invoke(loc, msg); } - - static std::string pattern() - { - return concat_to_string('(', Head::pattern(), ")|", either::pattern()); - } }; template struct either @@ -290,10 +262,6 @@ struct either "internal error: container::value_type should be `char`."); return Head::invoke(loc, msg); } - static std::string pattern() - { - return concat_to_string('(', Head::pattern(), ')'); - } }; template @@ -324,10 +292,6 @@ struct repeat> } return ok(std::move(retval)); } - static std::string pattern() - { - return concat_to_string('(', T::pattern(), "){", N, '}'); - } }; template @@ -360,10 +324,6 @@ struct repeat> retval += rslt.unwrap(); } } - static std::string pattern() - { - return concat_to_string('(',T::pattern(), "){", N, ",}"); - } }; template @@ -384,7 +344,6 @@ struct repeat retval += rslt.unwrap(); } } - static std::string pattern() {return concat_to_string('(', T::pattern(), ")*");} }; } // detail