X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/f3ad8b46ca1621f4a90db91ed6f9c1eceac96c4c..42d607127a467ca737dd903ad007d50a54533cf0:/interpretor/lexer.mll?ds=sidebyside diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll index 4f2f525..46ce90d 100644 --- a/interpretor/lexer.mll +++ b/interpretor/lexer.mll @@ -33,7 +33,7 @@ rule token = parse | "exp" { IDENT Exp} | "sqrt" { IDENT Sqrt} | "log" { IDENT Ln} -| "logten" { IDENT Log10} +| "logten" { IDENT Lg} | "pow" { IDENT Power} | "abs" { IDENT Abs} | "fmod" { IDENT Fmod} @@ -43,12 +43,14 @@ rule token = parse | "#" { 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 +59,9 @@ rule token = parse | "rdtable" { IDENT Rdtable} | "rwtable" { IDENT Rwtable} - | ['0'-'9']+ as a { CONST a } | '.' { POINT } - | '(' { LPAR } | ')' { RPAR } | ',' { PAR }