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

Re-enable And_Rule in parser. Disable boxedcpp in cmake until compiler errors fixed.

Browse Source
This commit is contained in:
Jonathan Turner
2009-05-27 15:11:09 +00:00
parent 332fdf0c8e
commit 74338670fa
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -14,5 +14,5 @@ if(Boost_FOUND)
add_executable(langkit_test langkit/main.cpp langkit/langkit_lexer.cpp langkit/langkit_parser.cpp)
target_link_libraries(langkit_test ${Boost_LIBRARIES})
add_executable(boxedcpp_test boxedcpp/test.cpp)
#add_executable(boxedcpp_test boxedcpp/test.cpp)
endif()

12
langkit/langkit_parser.cpp
View File

@@ -45,24 +45,22 @@ std::pair<Token_Iterator, TokenPtr> Or_Rule(Token_Iterator iter, Token_Iterator
return std::pair<Token_Iterator, TokenPtr>(iter, *iter);
}
/*
std::pair<Token_Iterator, Token> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
std::pair<Token_Iterator, TokenPtr> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) {
Token_Iterator lhs_iter, rhs_iter;
if (iter != end) {
lhs_iter = lhs.rule(iter, end);
lhs_iter = lhs.rule(iter, end).first;
if (lhs_iter != iter) {
rhs_iter = rhs.rule(iter, end);
rhs_iter = rhs.rule(iter, end).first;
if (rhs_iter != iter) {
return std::pair<Token_Iterator, Token>(rhs_iter, *iter);
return std::pair<Token_Iterator, TokenPtr>(rhs_iter, *iter);
}
}
}
return std::pair<Token_Iterator, Token>(iter, *iter);
return std::pair<Token_Iterator, TokenPtr>(iter, *iter);
}
*/
std::pair<Token_Iterator, TokenPtr> Rule::operator()(Token_Iterator iter, Token_Iterator end) {
return this->rule(iter, end);

2
langkit/langkit_parser.hpp
View File

@@ -23,7 +23,7 @@ struct Rule {
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);
std::pair<Token_Iterator, TokenPtr> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs);
#endif /* LANGKIT_PARSER_HPP_ */