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

Starting to stand up the parser using std::pair

Browse Source
This commit is contained in:
Jonathan Turner
2009-05-26 22:39:55 +00:00
parent 8f6f4b81db
commit 6a608f995a
4 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
langkit/langkit_parser.cpp
View File

@@ -1,49 +1,52 @@
// This file is distributed under the BSD License.
// See LICENSE.TXT for details.
#include <utility>
#include "langkit_lexer.hpp"
#include "langkit_parser.hpp"
Token_Iterator String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val) {
std::pair<Token_Iterator, Token> String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val) {
if (iter != end) {
if (iter->text == val) {
return ++iter;
return std::pair<Token_Iterator, Token>(++iter, *iter);
}
}
return iter;
return std::pair<Token_Iterator, Token>(iter, *iter);
}
Token_Iterator Type_Rule(Token_Iterator iter, Token_Iterator end, const int val) {
std::pair<Token_Iterator, Token> Type_Rule(Token_Iterator iter, Token_Iterator end, const int val) {
if (iter != end) {
if (iter->identifier == val) {
return ++iter;
return std::pair<Token_Iterator, Token>(++iter, *iter);
}
}
return iter;
return std::pair<Token_Iterator, Token>(iter, *iter);
}
Token_Iterator Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
std::pair<Token_Iterator, Token> Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
Token_Iterator new_iter;
if (iter != end) {
new_iter = lhs.rule(iter, end);
new_iter = lhs.rule(iter, end).first;
if (new_iter != iter) {
return new_iter;
return std::pair<Token_Iterator, Token>(new_iter, *iter);
}
else {
new_iter = rhs.rule(iter, end);
new_iter = rhs.rule(iter, end).first;
if (new_iter != iter) {
return new_iter;
return std::pair<Token_Iterator, Token>(new_iter, *iter);
}
}
}
return iter;
return std::pair<Token_Iterator, Token>(iter, *iter);
}
Token_Iterator And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
/*
std::pair<Token_Iterator, Token> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
Token_Iterator lhs_iter, rhs_iter;
if (iter != end) {
@@ -52,10 +55,15 @@ Token_Iterator And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs
if (lhs_iter != iter) {
rhs_iter = rhs.rule(iter, end);
if (rhs_iter != iter) {
return rhs_iter;
return std::pair<Token_Iterator, Token>(rhs_iter, *iter);
}
}
}
return iter;
return std::pair<Token_Iterator, Token>(iter, *iter);
}
*/
std::pair<Token_Iterator, Token> Rule::operator()(Token_Iterator iter, Token_Iterator end) {
return this->rule(iter, end);
}