MathQL textual lexer patched

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

diff --git a/helm/ocaml/mathql/mQueryTLexer.mll b/helm/ocaml/mathql/mQueryTLexer.mll
index 5dbb3d1b9641aa44c02ab43c89b40a0c0dd69adb..770f4d86d1313652244afcc3556d23e55dc15e42 100644 (file)
--- a/helm/ocaml/mathql/mQueryTLexer.mll
+++ b/helm/ocaml/mathql/mQueryTLexer.mll
@@ -36,13 +36,13 @@
 { 
    open MQueryTParser
    
-   let debug = true
+   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  = [^ '"' '\\']+
@@ -53,7 +53,7 @@ rule comm_token = parse
 and string_token = parse
    | '"'         { DQ  }
    | '\\' _      { STR (String.sub (Lexing.lexeme lexbuf) 1 1) }
-   | QSTR        { prerr_endline "STR"; STR (Lexing.lexeme lexbuf) }
+   | QSTR        { STR (Lexing.lexeme lexbuf) }
    | eof         { EOF }
 and query_token = parse
    | "(*"        { comm_token lexbuf }
@@ -87,7 +87,7 @@ and query_token = parse
    | "not"       { out "NOT"   ; NOT    }
    | "or"        { out "OR"    ; OR     }
    | "pattern"   { out "PAT"   ; PAT    }
-   | "ptoperty"  { out "PROP"  ; PROP   }
+   | "property"  { out "PROP"  ; PROP   }
    | "ref"       { out "REF"   ; REF    }
    | "refof"     { out "REFOF" ; REFOF  }
    | "relation"  { out "REL"   ; REL    }