X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmQueryTLexer.mll;h=abccb46264d2053927ded64beec8bb60169eefd5;hb=1c7fb836e2af4f2f3d18afd0396701f2094265ff;hp=a0884e79dd21a7a6ec2f23da7380875a6639d4d6;hpb=ba824e867afc3eaf081ed1a1d6526d421242a6a0;p=helm.git

diff --git a/helm/ocaml/mathql/mQueryTLexer.mll b/helm/ocaml/mathql/mQueryTLexer.mll
index a0884e79d..abccb4626 100644
--- a/helm/ocaml/mathql/mQueryTLexer.mll
+++ b/helm/ocaml/mathql/mQueryTLexer.mll
@@ -23,82 +23,110 @@
  * http://cs.unibo.it/helm/.
  *)
 
-(******************************************************************************)
-(*                                                                            *)
-(*                               PROJECT HELM                                 *)
-(*                                                                            *)
-(*                     Ferruccio Guidi <fguidi@cs.unibo.it>                   *)
-(*                                 23/05/2002                                 *)
-(*                                                                            *)
-(*                                                                            *)
-(******************************************************************************)
+(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
+ *)
 
 { 
    open MQueryTParser
+   
+   let debug = false
+   
+   let out s = if debug then prerr_endline s
 }
 
 let SPC   = [' ' '\t' '\n']+
-let ALPHA = ['A'-'Z' 'a'-'z']
+let ALPHA = ['A'-'Z' 'a'-'z' '_']
 let NUM   = ['0'-'9']
 let IDEN  = ALPHA (NUM | ALPHA)*
 let QSTR  = [^ '"' '\\']+
 
 rule comm_token = parse
-   | "*)"        { query_token lexbuf }
-   | [^ '*']*    { comm_token lexbuf }
+   | "(*"         { comm_token lexbuf; comm_token lexbuf }
+   | "*)"         { () }
+   | ['*' '(']    { 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 }
 and query_token = parse
-   | "(*"        { comm_token lexbuf }
+   | "(*"        { comm_token lexbuf; query_token lexbuf }
    | SPC         { query_token lexbuf }
-   | '"'         { STR (qstr string_token lexbuf) }
-   | '('         { LP }
-   | ')'         { RP }
-   | '{'         { LC }
-   | '}'         { RC }
-   | '@'         { AT }
-   | '%'         { PC }
-   | '$'         { DL }
-   | '.'         { FS }
-   | ','         { CM }
-   | '/'         { SL }
-   | "and"       { AND    }
-   | "attr"      { ATTR   }
-   | "attribute" { ATTRIB }
-   | "be"        { BE     }
-   | "diff"      { DIFF   }
-   | "eq"        { EQ     }
-   | "ex"        { EX     }
-   | "false"     { FALSE  }
-   | "fun"       { FUN    }
-   | "in"        { IN     }
-   | "intersect" { INTER  }
-   | "let"       { LET    }
-   | "meet"      { MEET   }
-   | "not"       { NOT    }
-   | "or"        { OR     }
-   | "pattern"   { PAT    }
-   | "ref"       { REF    }
-   | "refof"     { REFOF  }
-   | "relation"  { REL    }
-   | "select"    { SELECT }
-   | "sub"       { SUB    }
-   | "super"     { SUPER  }
-   | "true"      { TRUE   }
-   | "union"     { UNION  }
-   | "where"     { WHERE  }
-   | IDEN        { ID (Lexing.lexeme lexbuf) }
-   | eof         { EOF    }
+   | '"'         { let str = qstr string_token lexbuf in
+                   out ("STR " ^ str); STR str }
+   | '('         { out "LP"; LP }
+   | ')'         { out "RP"; RP }
+   | '{'         { out "LC"; LC }
+   | '}'         { out "RC"; RC }
+   | '@'         { out "AT"; AT }
+   | '%'         { out "PC"; PC }
+   | '$'         { out "DL"; DL }
+   | '.'         { out "FS"; FS }
+   | ','         { out "CM"; CM }
+   | ';'         { out "SC"; SC }
+   | '/'         { out "SL"; SL }
+   | "add"       { out "ADD"   ; ADD    }
+   | "align"     { out "ALIGN" ; ALIGN  }
+   | "allbut"    { out "BUT"   ; BUT    }
+   | "and"       { out "AND"   ; AND    }
+   | "as"        { out "AS"    ; AS     }
+   | "attr"      { out "ATTR"  ; ATTR   }
+   | "be"        { out "BE"    ; BE     }
+   | "count"     { out "COUNT" ; COUNT  }
+   | "diff"      { out "DIFF"  ; DIFF   }
+   | "distr"     { out "DISTR" ; DISTR  }
+   | "else"      { out "ELSE"  ; ELSE   }
+   | "empty"     { out "EMPTY" ; EMPTY  }
+   | "eq"        { out "EQ"    ; EQ     }
+   | "ex"        { out "EX"    ; EX     }
+   | "false"     { out "FALSE" ; FALSE  }
+   | "for"       { out "FOR"   ; FOR    }
+   | "from"      { out "FROM"  ; FROM   }
+   | "if"        { out "IF"    ; IF     }
+   | "in"        { out "IN"    ; IN     }
+   | "inf"       { out "INF"   ; INF    }   
+   | "intersect" { out "INTER" ; INTER  }
+   | "inverse"   { out "INV"   ; INV    }   
+   | "istrue"    { out "IST"   ; IST    }
+   | "isfalse"   { out "ISF"   ; ISF    }
+   | "keep"      { out "KEEP"  ; KEEP   }
+   | "le"        { out "LE"    ; LE     }
+   | "let"       { out "LET"   ; LET    }
+   | "log"       { out "LOG"   ; LOG    }
+   | "lt"        { out "LT"    ; LT     }
+   | "main"      { out "MAIN"  ; MAIN   }
+   | "match"     { out "MATCH" ; MATCH  }
+   | "meet"      { out "MEET"  ; MEET   }
+   | "not"       { out "NOT"   ; NOT    }
+   | "of"        { out "OF"    ; OF     }
+   | "or"        { out "OR"    ; OR     }
+   | "pattern"   { out "PAT"   ; PAT    }
+   | "proj"      { out "PROJ"  ; PROJ   }
+   | "property"  { out "PROP"  ; PROP   }
+   | "select"    { out "SELECT"; SELECT }
+   | "source"    { out "SOURCE"; SOURCE }
+   | "stat"      { out "STAT"  ; STAT   }
+   | "sub"       { out "SUB"   ; SUB    }
+   | "subj"      { out "SUBJ"  ; SUBJ   }
+   | "sup"       { out "SUP"   ; SUP    }
+   | "super"     { out "SUPER" ; SUPER  }
+   | "then"      { out "THEN"  ; THEN   }
+   | "true"      { out "TRUE"  ; TRUE   }
+   | "union"     { out "UNION" ; UNION  }
+   | "where"     { out "WHERE" ; WHERE  }
+   | "xor"       { out "XOR"   ; XOR    }
+   | IDEN        { let id = Lexing.lexeme lexbuf in 
+                   out ("ID " ^ id); ID id }
+   | eof         { out "EOF"   ; EOF    }
 and result_token = parse
    | SPC         { result_token lexbuf }
+   | "(*"        { comm_token lexbuf; result_token lexbuf }
    | '"'         { STR (qstr string_token lexbuf) }
    | '{'         { LC }
    | '}'         { RC }
    | ','         { CM }
    | ';'         { SC }
    | '='         { IS }
-   | "attr"      { ATTR   }
-   | eof         { EOF    }
+   | "attr"      { ATTR }
+   | eof         { EOF  }