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

diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll
index 4f2f525..353712a 100644
--- a/interpretor/lexer.mll
+++ b/interpretor/lexer.mll
@@ -10,12 +10,11 @@ rule token = parse
 | "-"                                   { IDENT Sub}
 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}
-| "^"					{ IDENT Power}
 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}
 | "&"					{ IDENT And}
 | "|"					{ IDENT Or}
-| "xor"					{ IDENT Xor}
+| "^"					{ IDENT Xor}
 | "mem"                                 { IDENT Mem}
 | "@"                                   { IDENT Delay}
 | "floor"                               { IDENT Floor}
@@ -33,22 +32,24 @@ rule token = parse
 | "exp"					{ IDENT Exp}
 | "sqrt"                                { IDENT Sqrt}
 | "log"					{ IDENT Ln}
-| "logten"				{ IDENT Log10}
-| "pow"					{ IDENT Power}
+| "logten"				{ IDENT Lg}
+| "powf"				{ IDENT Power}
 | "abs"					{ IDENT Abs}
-| "fmod"				{ IDENT Fmod}
+| "fmodf"				{ IDENT Fmod}
 | "%"                                   { IDENT Mod}
 | "remainder"				{ IDENT Remainder}
 | "vectorize"                           { IDENT Vectorize}
 | "#"                                   { IDENT Vconcat}
 | "[]"                                  { IDENT Vpick }
 | "serialize"                           { IDENT Serialize}
-| '>'                                   { IDENT Greater}
-| '<'                                   { IDENT Less}
-| ">="					{ IDENT Gore}
-| "<="					{ IDENT Lore}
-| "=="					{ IDENT Equal}
-| "!="					{ IDENT Different}
+| '>'                                   { IDENT Gt}
+| '<'                                   { IDENT Lt}
+| ">="					{ IDENT Geq}
+| "<="					{ IDENT Leq}
+| "=="					{ IDENT Eq}
+| "!="					{ IDENT Neq}
+| "<<"					{ IDENT Shl}
+| ">>"					{ IDENT Shr}
 | "max"					{ IDENT Max}
 | "min"					{ IDENT Min}
 | "prefix"                              { IDENT Prefix}
@@ -57,11 +58,9 @@ rule token = parse
 | "rdtable"                             { IDENT Rdtable}
 | "rwtable"				{ IDENT Rwtable}
 
-
 | ['0'-'9']+ as a		        { CONST a }
 | '.'                                   { POINT }
 
-
 | '('               	       	        { LPAR }
 | ')'         		                { RPAR }
 | ','					{ PAR }