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 }
+ | '"' { 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 }
+and result_token = parse
+ | SPC { result_token lexbuf }
+ | '"' { STR (qstr string_token lexbuf) }
+ | '{' { LC }
+ | '}' { RC }
+ | ',' { CM }
+ | ';' { SC }
+ | '=' { IS }
+ | "attr" { ATTR }
+ | eof { EOF }