X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmQueryTLexer.mll;h=770f4d86d1313652244afcc3556d23e55dc15e42;hb=89262281b6e83bd2321150f81f1a0583645eb0c8;hp=0075f3ac1bb4ad1ff882cc96b743eabd1850387d;hpb=6c04191a9045120d3cf5f6046eee627d6499e5c9;p=helm.git

diff --git a/helm/ocaml/mathql/mQueryTLexer.mll b/helm/ocaml/mathql/mQueryTLexer.mll
index 0075f3ac1..770f4d86d 100644
--- a/helm/ocaml/mathql/mQueryTLexer.mll
+++ b/helm/ocaml/mathql/mQueryTLexer.mll
@@ -35,54 +35,78 @@
 
 { 
    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 DQ    = '"'
-let SQ    = '''
-let QSTR  = [^ ''']*
-let USTR  = [^ '"' ':' '/' '#' '?' '*']+
-
-rule rtoken = parse
-   | DQ               { DQT   }
-   | ":/"             { PROT  }
-   | "/"              { SLASH }
-   | "#1"             { FRAG  }
-   | "?"              { QUEST }
-   | "**"             { SSTAR }
-   | "*"              { STAR  }
-   | USTR             { STR (Lexing.lexeme lexbuf) }
-and stoken = parse
-   | SQ               { SQT   }
-   | QSTR             { STR (Lexing.lexeme lexbuf) }
-and qtoken = parse
-   | SPC              { qtoken lexbuf }
-   | '('              { LPR    }
-   | ')'              { RPR    }
-   | '$'              { DLR    }
-   | SQ               { STR (qstr stoken lexbuf) }
-   | DQ               { REF (ref rtoken lexbuf) }
-   | "name"           { NAME   }
-   | "mainconclusion" { MCONCL }
-   | "conclusion"     { CONCL  }
-   | "true"           { TRUE   }
-   | "false"          { FALSE  }
-   | "and"            { AND    }
-   | "or"             { OR     }
-   | "not"            { NOT    }
-   | "is"             { IS     }
-   | "select"         { SELECT }
-   | "in"             { IN     }
-   | "where"          { WHERE  }
-   | "use"            { USE    }
-   | "position"       { POS    }
-   | "usedby"         { USEDBY }
-   | "pattern"        { PATT   }
-   | "union"          { UNION  }
-   | "intersect"      { INTER  }
-   | IDEN             { ID (Lexing.lexeme lexbuf) }
-   | eof              { EOF   }
+let QSTR  = [^ '"' '\\']+
 
+rule comm_token = parse
+   | "*)"        { query_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 }
+   | SPC         { query_token lexbuf }
+   | '"'         { 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 "SL"; SL }
+   | "<-"        { out "GETS"  ; GETS   }
+   | "and"       { out "AND"   ; AND    }
+   | "attr"      { out "ATTR"  ; ATTR   }
+   | "be"        { out "BE"    ; BE     }
+   | "diff"      { out "DIFF"  ; DIFF   }
+   | "eq"        { out "EQ"    ; EQ     }
+   | "ex"        { out "EX"    ; EX     }
+   | "false"     { out "FALSE" ; FALSE  }
+   | "fun"       { out "FUN"   ; FUN    }
+   | "in"        { out "IN"    ; IN     }
+   | "intersect" { out "INTER" ; INTER  }
+   | "inverse"   { out "INV"   ; INV    }
+   | "let"       { out "LET"   ; LET    }
+   | "meet"      { out "MEET"  ; MEET   }
+   | "not"       { out "NOT"   ; NOT    }
+   | "or"        { out "OR"    ; OR     }
+   | "pattern"   { out "PAT"   ; PAT    }
+   | "property"  { out "PROP"  ; PROP   }
+   | "ref"       { out "REF"   ; REF    }
+   | "refof"     { out "REFOF" ; REFOF  }
+   | "relation"  { out "REL"   ; REL    }
+   | "select"    { out "SELECT"; SELECT }
+   | "sub"       { out "SUB"   ; SUB    }
+   | "super"     { out "SUPER" ; SUPER  }
+   | "true"      { out "TRUE"  ; TRUE   }
+   | "union"     { out "UNION" ; UNION  }
+   | "where"     { out "WHERE" ; WHERE  }
+   | IDEN        { let id = Lexing.lexeme lexbuf in 
+                   out ("ID " ^ id); ID id }
+   | eof         { out "EOF"   ; EOF    }
+and result_token = parse
+   | SPC         { result_token lexbuf }
+   | '"'         { STR (qstr string_token lexbuf) }
+   | '{'         { LC }
+   | '}'         { RC }
+   | ','         { CM }
+   | ';'         { SC }
+   | '='         { IS }
+   | "attr"      { ATTR }
+   | eof         { EOF  }