Switch Token to smart pointer

This commit is contained in:
Jonathan Turner
2009-05-27 15:07:29 +00:00
parent fbb9534601
commit 332fdf0c8e
5 changed files with 43 additions and 40 deletions

View File

@@ -8,20 +8,21 @@
#include "langkit_lexer.hpp"
typedef std::vector<Token>::iterator Token_Iterator;
typedef std::vector<TokenPtr>::iterator Token_Iterator;
struct Rule {
int identifier;
boost::function<std::pair<Token_Iterator, Token>(Token_Iterator iter, Token_Iterator end)> rule;
std::pair<Token_Iterator, Token> operator()(Token_Iterator iter, Token_Iterator end);
boost::function<std::pair<Token_Iterator, TokenPtr>(Token_Iterator iter, Token_Iterator end)> rule;
std::pair<Token_Iterator, TokenPtr> operator()(Token_Iterator iter, Token_Iterator end);
Rule() : identifier(-1) {}
Rule(int id) : identifier(id) {}
};
std::pair<Token_Iterator, Token> String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val);
std::pair<Token_Iterator, Token> Type_Rule(Token_Iterator iter, Token_Iterator end, const int val);
std::pair<Token_Iterator, Token> Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs);
std::pair<Token_Iterator, TokenPtr> String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val);
std::pair<Token_Iterator, TokenPtr> Type_Rule(Token_Iterator iter, Token_Iterator end, const int val);
std::pair<Token_Iterator, TokenPtr> Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs);