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

Improved array lookup

Browse Source
This commit is contained in:
Jonathan Turner
2009-06-06 23:08:15 +00:00
parent 90c1b1347d
commit 4c317f5861
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wesley/main.cpp
View File

@@ -190,15 +190,16 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
break; break;
case (TokenType::Array_Call) : { case (TokenType::Array_Call) : {
retval = eval_token(ss, node->children[0]); retval = eval_token(ss, node->children[0]);
Param_List_Builder plb; for (i = 1; i < node->children.size(); ++i) {
plb << retval; Param_List_Builder plb;
plb << eval_token(ss, node->children[1]); plb << retval;
plb << eval_token(ss, node->children[i]);
try { try {
retval = dispatch(ss.get_function("[]"), plb); retval = dispatch(ss.get_function("[]"), plb);
} }
catch(std::exception &e){ catch(std::exception &e){
throw EvalError("Can not find appropriate array lookup '[]'", node->children[0]); throw EvalError("Can not find appropriate array lookup '[]'", node->children[i]);
}
} }
} }
break; break;
@@ -367,7 +368,7 @@ Rule build_parser_rules() {
Rule methodcall(TokenType::Method_Call); Rule methodcall(TokenType::Method_Call);
Rule if_block(TokenType::If_Block); Rule if_block(TokenType::If_Block);
Rule while_block(TokenType::While_Block); Rule while_block(TokenType::While_Block);
Rule array_call(TokenType::Array_Call); Rule arraycall(TokenType::Array_Call);
Rule value; Rule value;
Rule statements; Rule statements;
@@ -388,13 +389,13 @@ Rule build_parser_rules() {
(Str("<=") >> expression) |(Str(">") >> expression) | (Str(">=") >> expression)); (Str("<=") >> expression) |(Str(">") >> expression) | (Str(">=") >> expression));
expression = term >> *((Str("+") >> term) | (Str("-") >> term)); expression = term >> *((Str("+") >> term) | (Str("-") >> term));
term = factor >> *((Str("*") >> factor) | (Str("/") >> factor)); term = factor >> *((Str("*") >> factor) | (Str("/") >> factor));
factor = methodcall | value | negate | (Ign(Str("+")) >> value); factor = methodcall | arraycall | value | negate | (Ign(Str("+")) >> value);
funcall = Id(TokenType::Identifier) >> Ign(Id(TokenType::Parens_Open)) >> ~(boolean >> *(Ign(Str("," )) >> boolean)) >> Ign(Id(TokenType::Parens_Close)); funcall = Id(TokenType::Identifier) >> Ign(Id(TokenType::Parens_Open)) >> ~(boolean >> *(Ign(Str("," )) >> boolean)) >> Ign(Id(TokenType::Parens_Close));
methodcall = value >> +(Ign(Str(".")) >> funcall); methodcall = value >> +(Ign(Str(".")) >> funcall);
negate = Ign(Str("-")) >> boolean; negate = Ign(Str("-")) >> boolean;
return_statement = Ign(Str("return")) >> boolean; return_statement = Ign(Str("return")) >> boolean;
array_call = Id(TokenType::Identifier) >> (Ign(Id(TokenType::Square_Open)) >> boolean >> Ign(Id(TokenType::Square_Close))); arraycall = value >> +((Ign(Id(TokenType::Square_Open)) >> boolean >> Ign(Id(TokenType::Square_Close))));
value = array_call | block | (Ign(Id(TokenType::Parens_Open)) >> boolean >> Ign(Id(TokenType::Parens_Close))) | return_statement | value = block | (Ign(Id(TokenType::Parens_Open)) >> boolean >> Ign(Id(TokenType::Parens_Close))) | return_statement |
funcall | Id(TokenType::Identifier) | Id(TokenType::Real_Number) | Id(TokenType::Integer) | Id(TokenType::Quoted_String) | funcall | Id(TokenType::Identifier) | Id(TokenType::Real_Number) | Id(TokenType::Integer) | Id(TokenType::Quoted_String) |
Id(TokenType::Single_Quoted_String) ; Id(TokenType::Single_Quoted_String) ;