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

Added new ast nodes when new_id != -1

Browse Source
This commit is contained in:
Jonathan Turner
2009-05-27 21:39:35 +00:00
parent 2ca701aa32
commit 891650b97d
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
langkit/langkit_parser.cpp
View File

@@ -38,16 +38,27 @@ std::pair<Token_Iterator, bool> Type_Rule(Token_Iterator iter, Token_Iterator en
std::pair<Token_Iterator, bool> Or_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule lhs, Rule rhs) {
Token_Iterator new_iter;
unsigned int prev_size = parent->children.size();
TokenPtr prev_parent = parent;
if (new_id != -1) {
parent = TokenPtr(new Token("", new_id, parent->filename));
}
if (*iter != *end) {
std::pair<Token_Iterator, bool> result = lhs(iter, end, parent);
if (result.second) {
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
else {
result = rhs(iter, end, parent);
if (result.second) {
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
}
@@ -63,7 +74,14 @@ std::pair<Token_Iterator, bool> Or_Rule(Token_Iterator iter, Token_Iterator end,
std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, Rule lhs, Rule rhs) {
Token_Iterator lhs_iter, rhs_iter;
unsigned int prev_size = parent->children.size();
unsigned int prev_size;
TokenPtr prev_parent = parent;
if (new_id != -1) {
parent = TokenPtr(new Token("", new_id, parent->filename));
}
prev_size = parent->children.size();
if (*iter != *end) {
std::pair<Token_Iterator, bool> result = lhs(iter, end, parent);
@@ -71,6 +89,9 @@ std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end
if (result.second) {
result = rhs(result.first, end, parent);
if (result.second) {
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
}