Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / interpretor / lexer.mll

diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll
index 1c427a9..353712a 100644 (file)
--- a/interpretor/lexer.mll
+++ b/interpretor/lexer.mll
@@ -12,32 +12,55 @@ rule token = parse
 | "/"                                   { IDENT Div}
 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}
 | "/"                                   { IDENT Div}
 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}

+| "&"                                  { IDENT And}
+| "|"                                  { IDENT Or}
+| "^"                                  { IDENT Xor}

 | "mem"                                 { IDENT Mem}
 | "@"                                   { IDENT Delay}
 | "floor"                               { IDENT Floor}
 | "mem"                                 { IDENT Mem}
 | "@"                                   { IDENT Delay}
 | "floor"                               { IDENT Floor}

+| "ceil"                               { IDENT Ceil}
+| "rint"                               { IDENT Rint}

 | "int"                                 { IDENT Int}
 | "int"                                 { IDENT Int}

+| "float"                              { IDENT Float}

 | "sin"                                 { IDENT Sin}
 | "sin"                                 { IDENT Sin}

+| "asin"                               { IDENT Asin}

 | "cos"                                 { IDENT Cos}
 | "cos"                                 { IDENT Cos}

+| "acos"                               { IDENT Acos}
+| "tan"                                        { IDENT Tan}

 | "atan"                                { IDENT Atan}
 | "atan"                                { IDENT Atan}

-| "atantwo"                             { IDENT Atan2}
+| "atantwo"                                    { IDENT Atan2}
+| "exp"                                        { IDENT Exp}

 | "sqrt"                                { IDENT Sqrt}
 | "sqrt"                                { IDENT Sqrt}

-| "rdtable"                             { IDENT Rdtable}
+| "log"                                        { IDENT Ln}
+| "logten"                             { IDENT Lg}
+| "powf"                               { IDENT Power}
+| "abs"                                        { IDENT Abs}
+| "fmodf"                              { IDENT Fmod}

 | "%"                                   { IDENT Mod}
 | "%"                                   { IDENT Mod}

+| "remainder"                          { IDENT Remainder}

 | "vectorize"                           { IDENT Vectorize}
 | "#"                                   { IDENT Vconcat}
 | "[]"                                  { IDENT Vpick }
 | "serialize"                           { IDENT Serialize}
 | "vectorize"                           { IDENT Vectorize}
 | "#"                                   { IDENT Vconcat}
 | "[]"                                  { IDENT Vpick }
 | "serialize"                           { IDENT Serialize}

-| ">"                                   { IDENT Larger}
-| "<"                                   { IDENT Smaller}
+| '>'                                   { 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}
 | "selecttwo"                           { IDENT Select2}
 | "selectthree"                         { IDENT Select3}  
 | "prefix"                              { IDENT Prefix}
 | "selecttwo"                           { IDENT Select2}
 | "selectthree"                         { IDENT Select3}  

-
+| "rdtable"                             { IDENT Rdtable}
+| "rwtable"                            { IDENT Rwtable}

 
 | ['0'-'9']+ as a                      { CONST a }
 | '.'                                   { POINT }
 
 
 | ['0'-'9']+ as a                      { CONST a }
 | '.'                                   { POINT }
 

-

 | '('                                  { LPAR }
 | ')'                                  { RPAR }
 | ','                                  { PAR }
 | '('                                  { LPAR }
 | ')'                                  { RPAR }
 | ','                                  { PAR }