X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/e5b0e8bee502e61dfaaf2a5bc4b4d9d4938a9a2a..f3ad8b46ca1621f4a90db91ed6f9c1eceac96c4c:/interpretor/lexer.mll

diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll
index 3cb9847..4f2f525 100644
--- a/interpretor/lexer.mll
+++ b/interpretor/lexer.mll
@@ -10,30 +10,52 @@ rule token = parse
 | "-"                                   { IDENT Sub}
 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}
+| "^"					{ IDENT Power}
 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}
+| "&"					{ IDENT And}
+| "|"					{ IDENT Or}
+| "xor"					{ IDENT Xor}
 | "mem"                                 { IDENT Mem}
 | "@"                                   { IDENT Delay}
 | "floor"                               { IDENT Floor}
+| "ceil"				{ IDENT Ceil}
+| "rint"				{ IDENT Rint}
 | "int"                                 { IDENT Int}
+| "float"				{ IDENT Float}
 | "sin"                                 { IDENT Sin}
+| "asin"				{ IDENT Asin}
 | "cos"                                 { IDENT Cos}
+| "acos"				{ IDENT Acos}
+| "tan"					{ IDENT Tan}
 | "atan"                                { IDENT Atan}
-| "atantwo"                             { IDENT Atan2}
+| "atantwo"                            	{ IDENT Atan2}
+| "exp"					{ IDENT Exp}
 | "sqrt"                                { IDENT Sqrt}
-| "rdtable"                             { IDENT Rdtable}
+| "log"					{ IDENT Ln}
+| "logten"				{ IDENT Log10}
+| "pow"					{ IDENT Power}
+| "abs"					{ IDENT Abs}
+| "fmod"				{ IDENT Fmod}
 | "%"                                   { IDENT Mod}
+| "remainder"				{ IDENT Remainder}
 | "vectorize"                           { IDENT Vectorize}
 | "#"                                   { IDENT Vconcat}
 | "[]"                                  { IDENT Vpick }
 | "serialize"                           { IDENT Serialize}
-| ">"                                   { IDENT Larger}
-| "<"                                   { IDENT Smaller}
+| '>'                                   { IDENT Greater}
+| '<'                                   { IDENT Less}
+| ">="					{ IDENT Gore}
+| "<="					{ IDENT Lore}
+| "=="					{ IDENT Equal}
+| "!="					{ IDENT Different}
 | "max"					{ IDENT Max}
 | "min"					{ IDENT Min}
 | "prefix"                              { IDENT Prefix}
 | "selecttwo"                           { IDENT Select2}
 | "selectthree"                         { IDENT Select3}  
+| "rdtable"                             { IDENT Rdtable}
+| "rwtable"				{ IDENT Rwtable}
 
 
 | ['0'-'9']+ as a		        { CONST a }