Merge branch 'OOP'

[Faustine.git] / interpretor / lexer.mll

diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll
index c6a7cb5..1c427a9 100644 (file)
--- a/interpretor/lexer.mll
+++ b/interpretor/lexer.mll
@@ -7,7 +7,7 @@ rule token = parse
   [' ' '\t' '\n' ]                     { token lexbuf }
 
 | "+"                                   { IDENT Add}
   [' ' '\t' '\n' ]                     { token lexbuf }
 
 | "+"                                   { IDENT Add}

-| "-"                                   { IDENT Sup}
+| "-"                                   { IDENT Sub}

 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}
 | "_"                                   { IDENT Pass}
 | "*"                                   { IDENT Mul}
 | "/"                                   { IDENT Div}
 | "_"                                   { IDENT Pass}


@@ -19,7 +19,7 @@ rule token = parse
 | "sin"                                 { IDENT Sin}
 | "cos"                                 { IDENT Cos}
 | "atan"                                { IDENT Atan}
 | "sin"                                 { IDENT Sin}
 | "cos"                                 { IDENT Cos}
 | "atan"                                { IDENT Atan}

-| "atantwo"                             { IDENT Atantwo}
+| "atantwo"                             { IDENT Atan2}

 | "sqrt"                                { IDENT Sqrt}
 | "rdtable"                             { IDENT Rdtable}
 | "%"                                   { IDENT Mod}
 | "sqrt"                                { IDENT Sqrt}
 | "rdtable"                             { IDENT Rdtable}
 | "%"                                   { IDENT Mod}


@@ -30,8 +30,8 @@ rule token = parse
 | ">"                                   { IDENT Larger}
 | "<"                                   { IDENT Smaller}
 | "prefix"                              { IDENT Prefix}
 | ">"                                   { IDENT Larger}
 | "<"                                   { IDENT Smaller}
 | "prefix"                              { IDENT Prefix}

-| "selecttwo"                           { IDENT Selecttwo}
-| "selectthree"                         { IDENT Selectthree}  
+| "selecttwo"                           { IDENT Select2}
+| "selectthree"                         { IDENT Select3}  

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