generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added nop operator to prevent incorrect aliasing

Browse Source
This commit is contained in:
Jonathan Turner
2009-05-29 16:04:31 +00:00
parent 14be974fb0
commit 22654b5754
3 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
langkit/langkit_parser.cpp
View File

@@ -121,7 +121,7 @@ std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end
}
std::pair<Token_Iterator, bool> Kleene_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule rule) {
TokenPtr prev_parent = parent;
std::pair<Token_Iterator, bool> result;
@@ -149,7 +149,7 @@ std::pair<Token_Iterator, bool> Kleene_Rule
}
std::pair<Token_Iterator, bool> Plus_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule rule) {
unsigned int prev_size;
TokenPtr prev_parent = parent;
@@ -196,7 +196,7 @@ std::pair<Token_Iterator, bool> Plus_Rule
}
std::pair<Token_Iterator, bool> Optional_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule rule) {
TokenPtr prev_parent = parent;
Token_Iterator new_iter = iter;
@@ -224,6 +224,33 @@ std::pair<Token_Iterator, bool> Optional_Rule
return std::pair<Token_Iterator, bool>(result.first, true);
}
std::pair<Token_Iterator, bool> Nop_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule rule) {
TokenPtr prev_parent = parent;
Token_Iterator new_iter = iter;
if (new_id != -1) {
parent = TokenPtr(new Token("", new_id, parent->filename));
}
std::pair<Token_Iterator, bool> result;
result.second = true;
if ((new_iter != end) && (result.second == true)) {
result = rule(new_iter, end, parent);
new_iter = result.first;
}
if (new_id != -1) {
parent->filename = (*iter)->filename;
parent->start = (*iter)->start;
parent->end = (*(result.first - 1))->end;
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(iter, true);
}
Rule Str(const std::string &text, bool keep) {
return Rule(boost::bind(String_Rule, _1, _2, _3, _4, _5, text), keep);
@@ -246,3 +273,7 @@ Rule Ign(Rule rule) {
return rule;
}
Rule Nop(Rule rule) {
return Rule(boost::bind(Nop_Rule, _1, _2, _3, _4, _5, rule));
}