coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-09 11:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added short form lambda: (x) : { x + 10 }. Fixed eval sample

Browse Source
This commit is contained in:
Jonathan Turner 2009-06-21 00:35:45 +00:00
parent 9f13858482
commit 75431a052b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chaiscript/chaiscript.hpp
View File

@ -19,7 +19,7 @@ namespace chaiscript
Square_Open, Square_Close, Curly_Open, Curly_Close, Comma, Quoted_String, Single_Quoted_String, Carriage_Return, Semicolon, Square_Open, Square_Close, Curly_Open, Curly_Close, Comma, Quoted_String, Single_Quoted_String, Carriage_Return, Semicolon,
Function_Def, Lambda_Def, Scoped_Block, Statement, Equation, Return, Expression, Term, Factor, Negate, Not, Comment, Function_Def, Lambda_Def, Scoped_Block, Statement, Equation, Return, Expression, Term, Factor, Negate, Not, Comment,
Value, Fun_Call, Method_Call, Comparison, If_Block, While_Block, Boolean, Real_Number, Array_Call, Variable_Decl, Array_Init, Map_Init, Value, Fun_Call, Method_Call, Comparison, If_Block, While_Block, Boolean, Real_Number, Array_Call, Variable_Decl, Array_Init, Map_Init,
For_Block, Prefix, Break, Map_Pair }; }; For_Block, Prefix, Break, Map_Pair}; };
const char *tokentype_to_string(int tokentype) { const char *tokentype_to_string(int tokentype) {
const char *token_types[] = {"File", "Whitespace", "Identifier", "Integer", "Operator", "Parens_Open", "Parens_Close", const char *token_types[] = {"File", "Whitespace", "Identifier", "Integer", "Operator", "Parens_Open", "Parens_Close",

4
chaiscript/chaiscript_engine.hpp
View File

@ -168,7 +168,7 @@ namespace chaiscript
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 | arraycall | value | negate | boolean_not | prefix | (Ign(Str("+")) >> value); factor = methodcall | arraycall | value | negate | boolean_not | prefix | (Ign(Str("+")) >> value);
value = vardecl | mapinit | arrayinit | block | paren_block | lambda_def | return_statement | break_statement | value = vardecl | mapinit | arrayinit | block | lambda_def | paren_block | return_statement | break_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) ;
@ -187,7 +187,7 @@ namespace chaiscript
return_statement = Ign(Str("return")) >> ~boolean; return_statement = Ign(Str("return")) >> ~boolean;
break_statement = Wrap(Ign(Str("break"))); break_statement = Wrap(Ign(Str("break")));
paren_block = (Ign(Id(TokenType::Parens_Open)) >> equation >> Ign(Id(TokenType::Parens_Close))); paren_block = (Ign(Id(TokenType::Parens_Open)) >> equation >> Ign(Id(TokenType::Parens_Close)));
lambda_def = Ign(Str("function")) >> ~(Ign(Id(TokenType::Parens_Open)) >> ~params >> Ign(Id(TokenType::Parens_Close))) >> block; lambda_def = (Ign(Str("function")) >> ~(Ign(Id(TokenType::Parens_Open)) >> ~params >> Ign(Id(TokenType::Parens_Close))) >> block) | (Ign(Id(TokenType::Parens_Open)) >> ~params >> Ign(Id(TokenType::Parens_Close)) >> Ign(Str(":")) >> block);
return rule; return rule;
} }

2
samples/eval.chai
View File

@ -1,3 +1,3 @@
var i = 1 var i = 1
var j = eval("i + 4") var j = eval("5 + 4")
print(j) print(j)