AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 11:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
yhirose 2021-01-28 19:21:59 -05:00
parent 15aa1380de
commit 23b284d0a3
1 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
peglib.h
View File

@ -325,6 +325,24 @@ inline std::string resolve_escape_sequence(const char *s, size_t n) {
return r; return r;
} }
/*-----------------------------------------------------------------------------
* token_to_number_ - This function should be removed eventually
*---------------------------------------------------------------------------*/
template <typename T> T token_to_number_(std::string_view sv) {
T n = 0;
#if __has_include(<charconv>)
if constexpr (!std::is_floating_point<T>::value) {
std::from_chars(sv.data(), sv.data() + sv.size(), n);
return n;
}
#endif
auto s = std::string(sv);
std::istringstream ss(s);
ss >> n;
return n;
}
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Trie * Trie
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -479,23 +497,7 @@ struct SemanticValues : protected std::vector<std::any> {
} }
template <typename T> T token_to_number() const { template <typename T> T token_to_number() const {
T n = 0; return token_to_number_<T>(token());
#if __has_include(<charconv>)
if constexpr (std::is_floating_point<T>::value) {
// TODO: The following code should be removed eventually.
std::istringstream ss(token_to_string());
ss >> n;
return n;
} else {
auto sv = token();
std::from_chars(sv.data(), sv.data() + sv.size(), n);
return n;
}
#else
std::istringstream ss(token_to_string());
ss >> n;
return n;
#endif
} }
// Transform the semantic value vector to another vector // Transform the semantic value vector to another vector
@ -549,7 +551,7 @@ private:
/* /*
* Semantic action * Semantic action
*/ */
template <typename F, typename... Args> std::any call(F fn, Args &&... args) { template <typename F, typename... Args> std::any call(F fn, Args &&...args) {
using R = decltype(fn(std::forward<Args>(args)...)); using R = decltype(fn(std::forward<Args>(args)...));
if constexpr (std::is_void<R>::value) { if constexpr (std::is_void<R>::value) {
fn(std::forward<Args>(args)...); fn(std::forward<Args>(args)...);
@ -942,7 +944,7 @@ public:
class Sequence : public Ope { class Sequence : public Ope {
public: public:
template <typename... Args> template <typename... Args>
Sequence(const Args &... args) Sequence(const Args &...args)
: opes_{static_cast<std::shared_ptr<Ope>>(args)...} {} : opes_{static_cast<std::shared_ptr<Ope>>(args)...} {}
Sequence(const std::vector<std::shared_ptr<Ope>> &opes) : opes_(opes) {} Sequence(const std::vector<std::shared_ptr<Ope>> &opes) : opes_(opes) {}
Sequence(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(opes) {} Sequence(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(opes) {}
@ -985,7 +987,7 @@ public:
class PrioritizedChoice : public Ope { class PrioritizedChoice : public Ope {
public: public:
template <typename... Args> template <typename... Args>
PrioritizedChoice(bool for_label, const Args &... args) PrioritizedChoice(bool for_label, const Args &...args)
: opes_{static_cast<std::shared_ptr<Ope>>(args)...}, : opes_{static_cast<std::shared_ptr<Ope>>(args)...},
for_label_(for_label) {} for_label_(for_label) {}
PrioritizedChoice(const std::vector<std::shared_ptr<Ope>> &opes) PrioritizedChoice(const std::vector<std::shared_ptr<Ope>> &opes)
@ -1543,16 +1545,16 @@ public:
/* /*
* Factories * Factories
*/ */
template <typename... Args> std::shared_ptr<Ope> seq(Args &&... args) { template <typename... Args> std::shared_ptr<Ope> seq(Args &&...args) {
return std::make_shared<Sequence>(static_cast<std::shared_ptr<Ope>>(args)...); return std::make_shared<Sequence>(static_cast<std::shared_ptr<Ope>>(args)...);
} }
template <typename... Args> std::shared_ptr<Ope> cho(Args &&... args) { template <typename... Args> std::shared_ptr<Ope> cho(Args &&...args) {
return std::make_shared<PrioritizedChoice>( return std::make_shared<PrioritizedChoice>(
false, static_cast<std::shared_ptr<Ope>>(args)...); false, static_cast<std::shared_ptr<Ope>>(args)...);
} }
template <typename... Args> std::shared_ptr<Ope> cho4label_(Args &&... args) { template <typename... Args> std::shared_ptr<Ope> cho4label_(Args &&...args) {
return std::make_shared<PrioritizedChoice>( return std::make_shared<PrioritizedChoice>(
true, static_cast<std::shared_ptr<Ope>>(args)...); true, static_cast<std::shared_ptr<Ope>>(args)...);
} }
@ -3777,23 +3779,7 @@ template <typename Annotation> struct AstBase : public Annotation {
} }
template <typename T> T token_to_number() const { template <typename T> T token_to_number() const {
T n = 0; return token_to_number_<T>(token);
#if __has_include(<charconv>)
if constexpr (std::is_floating_point<T>::value) {
// TODO: The following code should be removed eventually.
std::istringstream ss(token_to_string());
ss >> n;
return n;
} else {
assert(is_token);
std::from_chars(token.data(), token.data() + token.size(), n);
return n;
}
#else
std::istringstream ss(token_to_string());
ss >> n;
return n;
#endif
} }
}; };