Bug fixed in preprocessor for new primitives.

[Faustine.git] / interpretor / lexer.mll

diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll
index 46ce90d..353712a 100644 (file)
--- a/interpretor/lexer.mll
+++ b/interpretor/lexer.mll
@@ -10,12 +10,11 @@ rule token = parse
 | "-"                                   { IDENT Sub}
 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}
 | "-"                                   { IDENT Sub}
 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}

-| "^"                                  { IDENT Power}

 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}
 | "&"                                  { IDENT And}
 | "|"                                  { IDENT Or}
 | "_"                                   { IDENT Pass}
 | "!"                                   { IDENT Stop}
 | "&"                                  { IDENT And}
 | "|"                                  { IDENT Or}

-| "xor"                                        { IDENT Xor}
+| "^"                                  { IDENT Xor}

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


@@ -34,9 +33,9 @@ rule token = parse
 | "sqrt"                                { IDENT Sqrt}
 | "log"                                        { IDENT Ln}
 | "logten"                             { IDENT Lg}
 | "sqrt"                                { IDENT Sqrt}
 | "log"                                        { IDENT Ln}
 | "logten"                             { IDENT Lg}

-| "pow"                                        { IDENT Power}
+| "powf"                               { IDENT Power}

 | "abs"                                        { IDENT Abs}
 | "abs"                                        { IDENT Abs}

-| "fmod"                               { IDENT Fmod}
+| "fmodf"                              { IDENT Fmod}

 | "%"                                   { IDENT Mod}
 | "remainder"                          { IDENT Remainder}
 | "vectorize"                           { IDENT Vectorize}
 | "%"                                   { IDENT Mod}
 | "remainder"                          { IDENT Remainder}
 | "vectorize"                           { IDENT Vectorize}