Added Kleene star, plus, and optional

This commit is contained in:
Jonathan Turner
2009-05-28 12:49:17 +00:00
parent 5f6ec9521b
commit af9bd41221
3 changed files with 114 additions and 7 deletions

View File

@@ -10,7 +10,7 @@
#include "langkit_parser.hpp"
std::pair<Token_Iterator, bool> String_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, const std::string &val) {
if (*iter != *end) {
if (iter != end) {
if ((*iter)->text == val) {
if (keep) {
parent->children.push_back(*iter);
@@ -23,7 +23,7 @@ std::pair<Token_Iterator, bool> String_Rule(Token_Iterator iter, Token_Iterator
}
std::pair<Token_Iterator, bool> Type_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, const int val) {
if (*iter != *end) {
if (iter != end) {
if ((*iter)->identifier == val) {
if (keep) {
parent->children.push_back(*iter);
@@ -44,7 +44,7 @@ std::pair<Token_Iterator, bool> Or_Rule(Token_Iterator iter, Token_Iterator end,
parent = TokenPtr(new Token("", new_id, parent->filename));
}
if (*iter != *end) {
if (iter != end) {
std::pair<Token_Iterator, bool> result = lhs(iter, end, parent);
if (result.second) {
@@ -83,7 +83,7 @@ std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end
prev_size = parent->children.size();
if (*iter != *end) {
if (iter != end) {
std::pair<Token_Iterator, bool> result = lhs(iter, end, parent);
if (result.second) {
@@ -105,6 +105,92 @@ std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end
return std::pair<Token_Iterator, bool>(iter, false);
}
std::pair<Token_Iterator, bool> Kleene_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
TokenPtr prev_parent = parent;
std::pair<Token_Iterator, bool> result;
if (new_id != -1) {
parent = TokenPtr(new Token("", new_id, parent->filename));
}
result.second = true;
while ((iter != end) && (result.second == true)) {
result = rule(iter, end, parent);
iter = result.first;
}
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
std::pair<Token_Iterator, bool> Plus_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
unsigned int prev_size;
TokenPtr prev_parent = parent;
Token_Iterator loop_iter = iter;
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;
result = rule(loop_iter, end, parent);
if (result.second == true) {
loop_iter = result.first;
result.second = true;
while ((iter != end) && (result.second == true)) {
result = rule(loop_iter, end, parent);
loop_iter = result.first;
}
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
}
if (parent->children.size() != prev_size) {
//Clear out the partial matches
parent->children.erase(parent->children.begin() + prev_size, parent->children.end());
}
return std::pair<Token_Iterator, bool>(iter, false);
}
std::pair<Token_Iterator, bool> Optional_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, bool keep, int new_id, struct Rule rule) {
TokenPtr prev_parent = parent;
if (new_id != -1) {
parent = TokenPtr(new Token("", new_id, parent->filename));
}
std::pair<Token_Iterator, bool> result;
result.second = true;
if ((iter != end) && (result.second == true)) {
result = rule(iter, end, parent);
iter = result.first;
}
if (new_id != -1) {
prev_parent->children.push_back(parent);
}
return std::pair<Token_Iterator, bool>(result.first, true);
}
Rule Str(const std::string &text, bool keep) {
return Rule(boost::bind(String_Rule, _1, _2, _3, _4, _5, text), keep);
}