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

Added equations w/ BoxedCPP interaction

Browse Source
This commit is contained in:
Jonathan Turner
2009-06-04 11:56:19 +00:00
parent a304254270
commit 53301ccb66
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wesley/main.cpp
View File

@@ -85,7 +85,7 @@ std::string load_file(const char *filename) {
return ret_val; return ret_val;
} }
Boxed_Value eval_token(BoxedCPP_System ss, TokenPtr node) { Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
Boxed_Value retval; Boxed_Value retval;
unsigned int i, j; unsigned int i, j;
@@ -97,6 +97,7 @@ Boxed_Value eval_token(BoxedCPP_System ss, TokenPtr node) {
} }
break; break;
case (TokenType::Identifier) : case (TokenType::Identifier) :
retval = ss.get_object(node->text);
break; break;
case (TokenType::Number) : case (TokenType::Number) :
retval = Boxed_Value(double(atof(node->text.c_str()))); retval = Boxed_Value(double(atof(node->text.c_str())));
@@ -107,6 +108,14 @@ Boxed_Value eval_token(BoxedCPP_System ss, TokenPtr node) {
case (TokenType::Single_Quoted_String) : case (TokenType::Single_Quoted_String) :
retval = Boxed_Value(node->text); retval = Boxed_Value(node->text);
break; break;
case (TokenType::Equation) :
retval = eval_token(ss, node->children.back());
if (node->children.size() > 1) {
for (i = node->children.size()-2; ((int)i) >= 0; --i) {
ss.add_object(node->children[i]->text, retval);
}
}
break;
case (TokenType::Factor) : case (TokenType::Factor) :
case (TokenType::Expression) : case (TokenType::Expression) :
case (TokenType::Term) : { case (TokenType::Term) : {
@@ -213,7 +222,6 @@ Boxed_Value eval_token(BoxedCPP_System ss, TokenPtr node) {
case (TokenType::Return) : case (TokenType::Return) :
case (TokenType::Carriage_Return) : case (TokenType::Carriage_Return) :
case (TokenType::Semicolon) : case (TokenType::Semicolon) :
case (TokenType::Equation) :
case (TokenType::Function_Def) : case (TokenType::Function_Def) :
case (TokenType::Comment) : case (TokenType::Comment) :
case (TokenType::Operator) : case (TokenType::Operator) :
@@ -236,6 +244,7 @@ Rule build_parser_rules() {
Rule block(TokenType::Scoped_Block); Rule block(TokenType::Scoped_Block);
Rule statement(TokenType::Statement); Rule statement(TokenType::Statement);
Rule return_statement(TokenType::Return); Rule return_statement(TokenType::Return);
Rule equation(TokenType::Equation);
Rule expression(TokenType::Expression); Rule expression(TokenType::Expression);
Rule term(TokenType::Term); Rule term(TokenType::Term);
Rule factor(TokenType::Factor); Rule factor(TokenType::Factor);
@@ -245,7 +254,8 @@ Rule build_parser_rules() {
Rule poetrycall(TokenType::Poetry_Call); Rule poetrycall(TokenType::Poetry_Call);
Rule value; Rule value;
Rule rule = *(expression >> *Ign(Id(TokenType::Semicolon))); Rule rule = ~(equation >> *(Ign(Id(TokenType::Semicolon)) >> equation) >> *(Ign(Id(TokenType::Semicolon))));
equation = *(Id(TokenType::Identifier) >> Ign(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 | poetrycall | value | negate | (Ign(Str("+")) >> value); factor = methodcall | poetrycall | value | negate | (Ign(Str("+")) >> value);
@@ -336,6 +346,9 @@ Boxed_Value evaluate_string(Lexer &lexer, Rule &parser, BoxedCPP_System &ss, con
catch (EvalError &ee) { catch (EvalError &ee) {
std::cout << "Eval error: " << ee.reason << std::endl; std::cout << "Eval error: " << ee.reason << std::endl;
} }
catch (std::exception &e) {
std::cout << "Exception: " << e.what() << std::endl;
}
return value; return value;
} }