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

Fix a few crashers with And_Rule, Kleene_Rule, Plus_Rule, and Optional_Rule

Browse Source
This commit is contained in:
Jonathan Turner 2009-05-29 02:58:05 +00:00
parent 4921d9a89e
commit 14be974fb0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
langkit/langkit_parser.cpp
View File

@ -95,7 +95,7 @@ std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end
if (iter != end) { if (iter != end) {
std::pair<Token_Iterator, bool> result = lhs(iter, end, parent); std::pair<Token_Iterator, bool> result = lhs(iter, end, parent);
if (result.second) { if ((result.second) && (result.first != end)) {
result = rhs(result.first, end, parent); result = rhs(result.first, end, parent);
if (result.second) { if (result.second) {
if (new_id != -1) { if (new_id != -1) {
@ -133,7 +133,7 @@ std::pair<Token_Iterator, bool> Kleene_Rule
result.second = true; result.second = true;
while ((new_iter != end) && (result.second == true)) { while ((new_iter != end) && (result.second == true)) {
result = rule(iter, end, parent); result = rule(new_iter, end, parent);
new_iter = result.first; new_iter = result.first;
} }
@ -143,7 +143,6 @@ std::pair<Token_Iterator, bool> Kleene_Rule
parent->start = (*iter)->start; parent->start = (*iter)->start;
parent->end = (*(result.first - 1))->end; parent->end = (*(result.first - 1))->end;
prev_parent->children.push_back(parent); prev_parent->children.push_back(parent);
} }
return std::pair<Token_Iterator, bool>(result.first, true); return std::pair<Token_Iterator, bool>(result.first, true);
@ -169,7 +168,7 @@ std::pair<Token_Iterator, bool> Plus_Rule
if (result.second == true) { if (result.second == true) {
loop_iter = result.first; loop_iter = result.first;
result.second = true; result.second = true;
while ((iter != end) && (result.second == true)) { while ((loop_iter != end) && (result.second == true)) {
result = rule(loop_iter, end, parent); result = rule(loop_iter, end, parent);
loop_iter = result.first; loop_iter = result.first;
} }
@ -209,7 +208,7 @@ std::pair<Token_Iterator, bool> Optional_Rule
std::pair<Token_Iterator, bool> result; std::pair<Token_Iterator, bool> result;
result.second = true; result.second = true;
if ((new_iter != end) && (result.second == true)) { if ((new_iter != end) && (result.second == true)) {
result = rule(iter, end, parent); result = rule(new_iter, end, parent);
new_iter = result.first; new_iter = result.first;
} }

6
langkit/main.cpp
View File

@ -66,6 +66,7 @@ void parse(std::vector<TokenPtr> &tokens) {
//Example: "def add(x,y)" //Example: "def add(x,y)"
Rule params; Rule params;
Rule block(TokenType::Scoped_Block); Rule block(TokenType::Scoped_Block);
Rule rule(TokenType::Function_Def); Rule rule(TokenType::Function_Def);
@ -78,6 +79,11 @@ void parse(std::vector<TokenPtr> &tokens) {
return_statement = Ign(Str("return")) << Id(TokenType::Identifier) << Str("+") << Id(TokenType::Identifier); return_statement = Ign(Str("return")) << Id(TokenType::Identifier) << Str("+") << Id(TokenType::Identifier);
/*
Rule rule, rule2;
rule = rule2;
rule2 = Str("Bob");
*/
/* /*
Rule rule(3); Rule rule(3);
rule = Ign(Str("Bob")) << Str("Fred"); rule = Ign(Str("Bob")) << Str("Fred");