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

Code cleanup.

Browse Source
This commit is contained in:
yhirose 2015-02-19 19:51:38 -05:00
parent 69b82ba92b
commit 42c9d06221
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
peglib.h
View File

@ -217,8 +217,8 @@ public:
return (bool)fn_; return (bool)fn_;
} }
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) const { any operator()(const SemanticValues& v, any& c) const {
return fn_(s, l, v, c); return fn_(v, c);
} }
private: private:
@ -226,7 +226,7 @@ private:
struct TypeAdaptor { struct TypeAdaptor {
TypeAdaptor(std::function<R (const SemanticValues& v)> fn) TypeAdaptor(std::function<R (const SemanticValues& v)> fn)
: fn_(fn) {} : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, v); return call<R>(fn_, v);
} }
std::function<R (const SemanticValues& v)> fn_; std::function<R (const SemanticValues& v)> fn_;
@ -236,7 +236,7 @@ private:
struct TypeAdaptor_c { struct TypeAdaptor_c {
TypeAdaptor_c(std::function<R (const SemanticValues& v, any& c)> fn) TypeAdaptor_c(std::function<R (const SemanticValues& v, any& c)> fn)
: fn_(fn) {} : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, v, c); return call<R>(fn_, v, c);
} }
std::function<R (const SemanticValues& v, any& c)> fn_; std::function<R (const SemanticValues& v, any& c)> fn_;
@ -246,8 +246,8 @@ private:
struct TypeAdaptor_s_l_v_c { struct TypeAdaptor_s_l_v_c {
TypeAdaptor_s_l_v_c(std::function<R (const char* s, size_t l, const std::vector<any>& v, any& c)> fn) TypeAdaptor_s_l_v_c(std::function<R (const char* s, size_t l, const std::vector<any>& v, any& c)> fn)
: fn_(fn) {} : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, s, l, v.values, c); return call<R>(fn_, v.s, v.l, v.values, c);
} }
std::function<R (const char* s, size_t l, const std::vector<any>& v, any& c)> fn_; std::function<R (const char* s, size_t l, const std::vector<any>& v, any& c)> fn_;
}; };
@ -256,8 +256,8 @@ private:
struct TypeAdaptor_s_l_v { struct TypeAdaptor_s_l_v {
TypeAdaptor_s_l_v(std::function<R (const char* s, size_t l, const std::vector<any>& v)> fn) TypeAdaptor_s_l_v(std::function<R (const char* s, size_t l, const std::vector<any>& v)> fn)
: fn_(fn) {} : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, s, l, v.values); return call<R>(fn_, v.s, v.l, v.values);
} }
std::function<R (const char* s, size_t l, const std::vector<any>& v)> fn_; std::function<R (const char* s, size_t l, const std::vector<any>& v)> fn_;
}; };
@ -265,8 +265,8 @@ private:
template <typename R> template <typename R>
struct TypeAdaptor_s_l { struct TypeAdaptor_s_l {
TypeAdaptor_s_l(std::function<R (const char* s, size_t l)> fn) : fn_(fn) {} TypeAdaptor_s_l(std::function<R (const char* s, size_t l)> fn) : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, s, l); return call<R>(fn_, v.s, v.l);
} }
std::function<R (const char* s, size_t l)> fn_; std::function<R (const char* s, size_t l)> fn_;
}; };
@ -274,7 +274,7 @@ private:
template <typename R> template <typename R>
struct TypeAdaptor_v_n { struct TypeAdaptor_v_n {
TypeAdaptor_v_n(std::function<R (const std::vector<any>& v, any& c)> fn) : fn_(fn) {} TypeAdaptor_v_n(std::function<R (const std::vector<any>& v, any& c)> fn) : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, v.values, c); return call<R>(fn_, v.values, c);
} }
std::function<R (const std::vector<any>& v, any& c)> fn_; std::function<R (const std::vector<any>& v, any& c)> fn_;
@ -283,7 +283,7 @@ private:
template <typename R> template <typename R>
struct TypeAdaptor_v { struct TypeAdaptor_v {
TypeAdaptor_v(std::function<R (const std::vector<any>& v)> fn) : fn_(fn) {} TypeAdaptor_v(std::function<R (const std::vector<any>& v)> fn) : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_, v.values); return call<R>(fn_, v.values);
} }
std::function<R (const std::vector<any>& v)> fn_; std::function<R (const std::vector<any>& v)> fn_;
@ -292,13 +292,13 @@ private:
template <typename R> template <typename R>
struct TypeAdaptor_empty { struct TypeAdaptor_empty {
TypeAdaptor_empty(std::function<R ()> fn) : fn_(fn) {} TypeAdaptor_empty(std::function<R ()> fn) : fn_(fn) {}
any operator()(const char* s, size_t l, const SemanticValues& v, any& c) { any operator()(const SemanticValues& v, any& c) {
return call<R>(fn_); return call<R>(fn_);
} }
std::function<R ()> fn_; std::function<R ()> fn_;
}; };
typedef std::function<any (const char* s, size_t l, const SemanticValues& v, any& c)> Fty; typedef std::function<any (const SemanticValues& v, any& c)> Fty;
template<typename F, typename R> template<typename F, typename R>
Fty make_adaptor(F fn, R (F::*mf)(const SemanticValues& v) const) { Fty make_adaptor(F fn, R (F::*mf)(const SemanticValues& v) const) {
@ -922,11 +922,13 @@ private:
? outer_->actions[id] ? outer_->actions[id]
: outer_->actions[0]; : outer_->actions[0];
auto ts = chldsv.s ? chldsv.s : s; if (!chldsv.s) {
auto tl = chldsv.s ? chldsv.l : r.len; chldsv.s = s;
auto sv = reduce(ts, tl, chldsv, c, action); chldsv.l = r.len;
}
auto val = reduce(chldsv, c, action);
v.values.push_back(sv); v.values.push_back(val);
v.names.push_back(outer_->name); v.names.push_back(outer_->name);
} }
return r; return r;
@ -935,9 +937,9 @@ private:
private: private:
friend class Definition; friend class Definition;
any reduce(const char* s, size_t l, const SemanticValues& v, any& c, const Action& action) const { any reduce(const SemanticValues& v, any& c, const Action& action) const {
if (action) { if (action) {
return action(s, l, v, c); return action(v, c);
} else if (v.values.empty()) { } else if (v.values.empty()) {
return any(); return any();
} else { } else {