zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove unused func, combinator::pattern

Browse Source 
because it is not human-readable (too long and redundant)
This commit is contained in:
ToruNiina
2019-05-30 18:05:47 +09:00
parent d352c9e66f
commit b13e727b90
2 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_lex_aux.hpp
View File

@@ -18,7 +18,7 @@ do { \
BOOST_CHECK_EQUAL(static_cast<std::size_t>(std::distance( \ BOOST_CHECK_EQUAL(static_cast<std::size_t>(std::distance( \
loc.begin(), loc.iter())), region.size()); \ loc.begin(), loc.iter())), region.size()); \
} else { \ } else { \
std::cerr << "lexer " << lxr::pattern() << " failed with input `"; \ std::cerr << "lexer failed with input `"; \
std::cerr << token << "`. expected `" << expected << "`\n"; \ std::cerr << token << "`. expected `" << expected << "`\n"; \
std::cerr << "reason: " << result.unwrap_err() << '\n'; \ std::cerr << "reason: " << result.unwrap_err() << '\n'; \
} \ } \

45
toml/combinator.hpp
View File

@@ -79,8 +79,6 @@ struct character
return ok(region<Cont>(loc, first, loc.iter())); return ok(region<Cont>(loc, first, loc.iter()));
} }
static std::string pattern() {return show_char(target);}
}; };
template<char C> template<char C>
constexpr char character<C>::target; constexpr char character<C>::target;
@@ -120,11 +118,6 @@ struct in_range
loc.advance(); loc.advance();
return ok(region<Cont>(loc, first, loc.iter())); return ok(region<Cont>(loc, first, loc.iter()));
} }
static std::string pattern()
{
return concat_to_string("[",show_char(lower),"-",show_char(upper),"]");
}
}; };
template<char L, char U> constexpr char in_range<L, U>::upper; template<char L, char U> constexpr char in_range<L, U>::upper;
template<char L, char U> constexpr char in_range<L, U>::lower; template<char L, char U> constexpr char in_range<L, U>::lower;
@@ -150,19 +143,14 @@ struct exclude
loc.reset(first); loc.reset(first);
if(msg) if(msg)
{ {
return err(concat_to_string("invalid pattern (", return err(concat_to_string("invalid pattern appeared ",
Combinator::pattern(), ") appeared ", rslt.unwrap().str())); rslt.unwrap().str()));
} }
return err(""); return err("");
} }
loc.reset(std::next(first)); // XXX maybe loc.advance() is okay but... loc.reset(std::next(first)); // XXX maybe loc.advance() is okay but...
return ok(region<Cont>(loc, first, loc.iter())); return ok(region<Cont>(loc, first, loc.iter()));
} }
static std::string pattern()
{
return concat_to_string("^(", Combinator::pattern(), ')');
}
}; };
// increment `iter`, if matches. otherwise, just return empty string. // increment `iter`, if matches. otherwise, just return empty string.
@@ -183,11 +171,6 @@ struct maybe
} }
return ok(region<Cont>(loc)); return ok(region<Cont>(loc));
} }
static std::string pattern()
{
return concat_to_string('(', Combinator::pattern(), ")?");
}
}; };
template<typename ... Ts> template<typename ... Ts>
@@ -228,11 +211,6 @@ struct sequence<Head, Tail...>
reg += rslt.unwrap(); // concat regions reg += rslt.unwrap(); // concat regions
return sequence<Tail...>::invoke(loc, std::move(reg), first, msg); return sequence<Tail...>::invoke(loc, std::move(reg), first, msg);
} }
static std::string pattern()
{
return concat_to_string(Head::pattern(), sequence<Tail...>::pattern());
}
}; };
template<typename Head> template<typename Head>
@@ -253,7 +231,6 @@ struct sequence<Head>
reg += rslt.unwrap(); // concat regions reg += rslt.unwrap(); // concat regions
return ok(reg); return ok(reg);
} }
static std::string pattern() {return Head::pattern();}
}; };
template<typename ... Ts> template<typename ... Ts>
@@ -273,11 +250,6 @@ struct either<Head, Tail...>
if(rslt.is_ok()) {return rslt;} if(rslt.is_ok()) {return rslt;}
return either<Tail...>::invoke(loc, msg); return either<Tail...>::invoke(loc, msg);
} }
static std::string pattern()
{
return concat_to_string('(', Head::pattern(), ")|", either<Tail...>::pattern());
}
}; };
template<typename Head> template<typename Head>
struct either<Head> struct either<Head>
@@ -290,10 +262,6 @@ struct either<Head>
"internal error: container::value_type should be `char`."); "internal error: container::value_type should be `char`.");
return Head::invoke(loc, msg); return Head::invoke(loc, msg);
} }
static std::string pattern()
{
return concat_to_string('(', Head::pattern(), ')');
}
}; };
template<typename T, typename N> template<typename T, typename N>
@@ -324,10 +292,6 @@ struct repeat<T, exactly<N>>
} }
return ok(std::move(retval)); return ok(std::move(retval));
} }
static std::string pattern()
{
return concat_to_string('(', T::pattern(), "){", N, '}');
}
}; };
template<typename T, std::size_t N> template<typename T, std::size_t N>
@@ -360,10 +324,6 @@ struct repeat<T, at_least<N>>
retval += rslt.unwrap(); retval += rslt.unwrap();
} }
} }
static std::string pattern()
{
return concat_to_string('(',T::pattern(), "){", N, ",}");
}
}; };
template<typename T> template<typename T>
@@ -384,7 +344,6 @@ struct repeat<T, unlimited>
retval += rslt.unwrap(); retval += rslt.unwrap();
} }
} }
static std::string pattern() {return concat_to_string('(', T::pattern(), ")*");}
}; };
} // detail } // detail