MathQL 1.3 ready for use

[helm.git] / helm / ocaml / mathql_test / mQGTopLexer.mll

diff --git a/helm/ocaml/mathql_test/mQGTopLexer.mll b/helm/ocaml/mathql_test/mQGTopLexer.mll
index 47646064690db314ac77bc92bf8c6177b18b8882..da69710285e34f38ec601446d2ee7ef1760e2bab 100644 (file)
--- a/helm/ocaml/mathql_test/mQGTopLexer.mll
+++ b/helm/ocaml/mathql_test/mQGTopLexer.mll
@@ -23,8 +23,15 @@
  * http://cs.unibo.it/helm/.
  *)
 
-(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
- *)
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                     Ferruccio Guidi <fguidi@cs.unibo.it>                   *)
+(*                                 23/05/2002                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
 
 { 
    open MQGTopParser
@@ -46,28 +53,26 @@ rule comm_token = parse
    | ['*' '(']    { comm_token lexbuf }
    | [^ '*' '(']* { comm_token lexbuf }
 and string_token = parse
-   | '"'         { DQ  }
-   | '\\' _      { STR (String.sub (Lexing.lexeme lexbuf) 1 1) }
-   | QSTR        { STR (Lexing.lexeme lexbuf) }
-   | eof         { EOF }
+   | '"'          { DQ  }
+   | '\\' _       { STR (String.sub (Lexing.lexeme lexbuf) 1 1) }
+   | QSTR         { STR (Lexing.lexeme lexbuf) }
+   | eof          { EOF }
 and spec_token = parse
-   | "(*"        { comm_token lexbuf; spec_token lexbuf }
-   | SPC         { spec_token lexbuf }
-   | '"'         { let str = qstr string_token lexbuf in
-                   out ("STR " ^ str); STR str }
-   | '{'         { out "LC"; LC }
-   | '}'         { out "RC"; RC }
-   | ','         { out "CM"; CM }
-   | '$'         { out "DL"; DL }
-   | "not"       { out "NOT"   ; NOT    }
-   | "mustobj"   { out "MOBJ"  ; MOBJ   }
-   | "mustsort"  { out "MSORT" ; MSORT  }
-   | "mustrel"   { out "MREL"  ; MREL   }
-   | "sonlyobj"  { out "SOBJ"  ; SOBJ   }
-   | "sonlysort" { out "SSORT" ; SSORT  }
-   | "onlyrel"   { out "OREL"  ; OREL   }
-   | "wonlyobj"  { out "WOBJ"  ; WOBJ   }
-   | "wonlysort" { out "WSORT" ; WSORT  }
-   | IDEN        { let id = Lexing.lexeme lexbuf in 
-                   out ("ID " ^ id); ID id }
-   | eof         { EOF }
+   | "(*"         { comm_token lexbuf; spec_token lexbuf }
+   | SPC          { spec_token lexbuf }
+   | '"'          { let str = qstr string_token lexbuf in
+                    out ("STR " ^ str); STR str }
+   | '{'          { out "LC"; LC }
+   | '}'          { out "RC"; RC }
+   | ','          { out "CM"; CM }
+   | '$'          { out "DL"; DL }
+   | "mustobj"    { out "MOBJ"  ; MOBJ   }
+   | "mustsort"   { out "MSORT" ; MSORT  }
+   | "mustrel"    { out "MREL"  ; MREL   }
+   | "onlyobj"    { out "OOBJ"  ; OOBJ   }
+   | "onlysort"   { out "OSORT" ; OSORT  }
+   | "onlyrel"    { out "OREL"  ; OREL   }
+   | "universe"   { out "UNIV"  ; UNIV   } 
+   | IDEN         { let id = Lexing.lexeme lexbuf in 
+                    out ("ID " ^ id); ID id }
+   | eof          { EOF }