standard library and while construction inserted

[helm.git] / helm / ocaml / mathql_interpreter / mQueryTLexer.mll

diff --git a/helm/ocaml/mathql_interpreter/mQueryTLexer.mll b/helm/ocaml/mathql_interpreter/mQueryTLexer.mll
index d5f2fe10f8316c5d1ff3489d7f780255e30c5d1d..c4abce8e8bb74ba28dac48047fb32d6e203d3d1f 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQueryTLexer.mll
+++ b/helm/ocaml/mathql_interpreter/mQueryTLexer.mll
@@ -75,6 +75,7 @@ and query_token = parse
                    out ("AVAR " ^ id); AVAR (strip id) }
    | "$" IDEN    { let id = Lexing.lexeme lexbuf in 
                    out ("SVAR " ^ id); SVAR (strip id) } 
+   | ";;"        { out ";;"    ; SEQ    }
    | "add"       { out "ADD"   ; ADD    }
    | "align"     { out "ALIGN" ; ALIGN  }
    | "allbut"    { out "BUT"   ; BUT    }
@@ -118,7 +119,6 @@ and query_token = parse
    | "read"      { out "READ"  ; READ   }
    | "render"    { out "RENDER"; RENDER }
    | "select"    { out "SELECT"; SELECT }
-   | "seq"       { out "SEQ"   ; SEQ    }
    | "source"    { out "SOURCE"; SOURCE }
    | "stat"      { out "STAT"  ; STAT   }
    | "sub"       { out "SUB"   ; SUB    }
@@ -128,6 +128,7 @@ and query_token = parse
    | "true"      { out "TRUE"  ; TRUE   }
    | "union"     { out "UNION" ; UNION  }
    | "where"     { out "WHERE" ; WHERE  }
+   | "while"     { out "WHILE" ; WHILE  }
    | "xor"       { out "XOR"   ; XOR    }
    | eof         { out "EOF"   ; EOF    }
    | "="         { out "BE"    ; BE     }
@@ -140,7 +141,6 @@ and query_token = parse
    | "||"        { out "OR"    ; OR     }
    | "\\/"       { out "UNION" ; UNION  }
    | "/\\"       { out "INTER" ; INTER  }
-   | ";;"        { out "SEQ"   ; SEQ    }
    | "begin"     { out "LP"    ; LP     }
    | "end"       { out "RP"    ; RP     }
 and result_token = parse