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

Fixed the token detect logic.

Browse Source
This commit is contained in:
yhirose 2015-06-05 13:50:07 -04:00
parent 05ca1961b4
commit 57a3ecc620
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
peglib.h
View File

@ -180,10 +180,8 @@ struct SemanticValues : protected std::vector<SemanticValue>
const char* s; const char* s;
size_t n; size_t n;
size_t choice; size_t choice;
bool has_anchor;
bool is_leaf;
SemanticValues() : s(nullptr), n(0), choice(0), has_anchor(false), is_leaf(true) {} SemanticValues() : s(nullptr), n(0), choice(0) {}
std::string str(size_t i = 0) const { std::string str(size_t i = 0) const {
if (i > 0) { if (i > 0) {
@ -192,10 +190,6 @@ struct SemanticValues : protected std::vector<SemanticValue>
return std::string(s, n); return std::string(s, n);
} }
bool is_token() const {
return has_anchor || is_leaf;
}
typedef SemanticValue T; typedef SemanticValue T;
using std::vector<T>::iterator; using std::vector<T>::iterator;
using std::vector<T>::const_iterator; using std::vector<T>::const_iterator;
@ -521,8 +515,6 @@ struct Context
} }
sv.s = nullptr; sv.s = nullptr;
sv.n = 0; sv.n = 0;
sv.has_anchor = false;
sv.is_leaf = true;
return sv; return sv;
} }
@ -626,8 +618,6 @@ public:
sv.s = chldsv.s; sv.s = chldsv.s;
sv.n = chldsv.n; sv.n = chldsv.n;
sv.choice = id; sv.choice = id;
sv.has_anchor = chldsv.has_anchor;
sv.is_leaf = chldsv.is_leaf;
c.pop(); c.pop();
return len; return len;
} }
@ -890,7 +880,6 @@ public:
if (success(len)) { if (success(len)) {
sv.s = s; sv.s = s;
sv.n = len; sv.n = len;
sv.has_anchor = true;
} }
return len; return len;
} }
@ -1320,7 +1309,6 @@ inline any Holder::reduce(const SemanticValues& sv, any& dt, const Action& actio
inline size_t DefinitionReference::parse( inline size_t DefinitionReference::parse(
const char* s, size_t n, SemanticValues& sv, Context& c, any& dt) const { const char* s, size_t n, SemanticValues& sv, Context& c, any& dt) const {
sv.is_leaf = false;
const auto& rule = *get_rule(); const auto& rule = *get_rule();
return rule.parse(s, n, sv, c, dt); return rule.parse(s, n, sv, c, dt);
} }
@ -2086,8 +2074,10 @@ private:
} }
void ast_node(const AstNodeInfo& info) { void ast_node(const AstNodeInfo& info) {
(*this)[info.name] = [info](const SemanticValues& sv) { auto& rule = (*this)[info.name];
if (sv.is_token()) { auto is_token = rule.is_token;
rule = [info, is_token](const SemanticValues& sv) {
if (is_token) {
return std::make_shared<Ast>(info.name, info.tag, std::string(sv.s, sv.n)); return std::make_shared<Ast>(info.name, info.tag, std::string(sv.s, sv.n));
} }
if (info.optimize && sv.size() == 1) { if (info.optimize && sv.size() == 1) {
@ -2104,8 +2094,9 @@ private:
auto& rule = x.second; auto& rule = x.second;
auto& action = rule.actions.front(); auto& action = rule.actions.front();
if (!action) { if (!action) {
action = [name](const SemanticValues& sv) { auto is_token = rule.is_token;
if (sv.is_token()) { action = [name, is_token](const SemanticValues& sv) {
if (is_token) {
return std::make_shared<Ast>(name.c_str(), AstDefaultTag, std::string(sv.s, sv.n)); return std::make_shared<Ast>(name.c_str(), AstDefaultTag, std::string(sv.s, sv.n));
} }
if (sv.size() == 1) { if (sv.size() == 1) {