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

Flipped shift operator direction to match spirit

Browse Source
This commit is contained in:
Jonathan Turner 2009-06-01 19:18:55 +00:00
parent f0088d8ade
commit fc3b9de2d2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langkit/langkit_lexer.cpp
View File

@ -67,7 +67,7 @@ std::vector<TokenPtr> Lexer::lex(const std::string &input, const char *filename)
} }
if ((!found_eoc) && (input_iter != input_end)) { if ((!found_eoc) && (input_iter != input_end)) {
++input_iter; ++input_iter;
current_col += 1; ++current_col;
} }
} }

2
langkit/langkit_parser.hpp
View File

@ -77,7 +77,7 @@ struct Rule {
return Rule(boost::bind(Or_Rule, _1, _2, _3, _4, _5, *this, rhs)); return Rule(boost::bind(Or_Rule, _1, _2, _3, _4, _5, *this, rhs));
} }
Rule operator<<(const Rule &rhs) { Rule operator>>(const Rule &rhs) {
return Rule(boost::bind(And_Rule, _1, _2, _3, _4, _5, *this, rhs)); return Rule(boost::bind(And_Rule, _1, _2, _3, _4, _5, *this, rhs));
} }

18
langkit/main.cpp
View File

@ -53,14 +53,14 @@ void parse(std::vector<TokenPtr> &tokens, const char *filename) {
/* /*
Rule lhs; Rule lhs;
Rule rhs; Rule rhs;
Rule rule = lhs << rhs; Rule rule = lhs >> rhs;
lhs = Str("def", true); lhs = Str("def", true);
rhs = Id(TokenType::Identifier, true); rhs = Id(TokenType::Identifier, true);
//Rule rule(TokenType::Function_Def); //Rule rule(TokenType::Function_Def);
//rule = Str("def") | Str("int"); //rule = Str("def") | Str("int");
//Rule rule = Str("def", false) << Id(TokenType::Identifier); //Rule rule = Str("def", false) >> Id(TokenType::Identifier);
*/ */
@ -73,11 +73,11 @@ void parse(std::vector<TokenPtr> &tokens, const char *filename) {
Rule return_statement(TokenType::Return); Rule return_statement(TokenType::Return);
Rule add(TokenType::Add); Rule add(TokenType::Add);
rule = Ign(Str("def")) << Id(TokenType::Identifier) << ~(Ign(Str("(")) << ~params << Ign(Str(")"))) << block; rule = Ign(Str("def")) >> Id(TokenType::Identifier) >> ~(Ign(Str("(")) >> ~params >> Ign(Str(")"))) >> block;
params = Id(TokenType::Identifier) << *(Ign(Str(",")) << Id(TokenType::Identifier)); params = Id(TokenType::Identifier) >> *(Ign(Str(",")) >> Id(TokenType::Identifier));
block = Ign(Str("{")) << ~return_statement << Ign(Str("}")); block = Ign(Str("{")) >> ~return_statement >> Ign(Str("}"));
return_statement = Ign(Str("return")) << add; return_statement = Ign(Str("return")) >> add;
add = Id(TokenType::Identifier) << Ign(Str("+")) << Id(TokenType::Identifier); add = Id(TokenType::Identifier) >> Ign(Str("+")) >> Id(TokenType::Identifier);
/* /*
@ -93,12 +93,12 @@ void parse(std::vector<TokenPtr> &tokens, const char *filename) {
/* /*
Rule rule(3); Rule rule(3);
rule = Ign(Str("Bob")) << Str("Fred"); rule = Ign(Str("Bob")) >> Str("Fred");
*/ */
/* /*
statement = equation; statement = equation;
equation = Id(TokenType::Identifier) << Str("+") << Id(TokenType::Identifier); equation = Id(TokenType::Identifier) >> Str("+") >> Id(TokenType::Identifier);
*/ */
/* /*