patch

diff --git a/helm/ocaml/mathql/mQueryTLexer.mll b/helm/ocaml/mathql/mQueryTLexer.mll
index 770f4d86d1313652244afcc3556d23e55dc15e42..f677ef688e77c3edc2076bb2e9997f607766bddb 100644 (file)
--- a/helm/ocaml/mathql/mQueryTLexer.mll
+++ b/helm/ocaml/mathql/mQueryTLexer.mll
@@ -48,15 +48,17 @@ 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 }
    | '"'         { let str = qstr string_token lexbuf in
                    out ("STR " ^ str); STR str }

diff --git a/helm/ocaml/mathql/mQueryTParser.mly b/helm/ocaml/mathql/mQueryTParser.mly
index 1ebadd29a53ea356fe8f283a4a3d26c18e35b208..390c214b4a725cdcefc7e3a16a851f65b242444c 100644 (file)
--- a/helm/ocaml/mathql/mQueryTParser.mly
+++ b/helm/ocaml/mathql/mQueryTParser.mly
@@ -172,7 +172,9 @@
       | LET vvar BE val_exp IN set_exp         { MathQL.LetVVar ($2, $4, $6)      }      
    ;
    query:
-      | set_exp EOF { $1 }
+      | set_exp       { $1                }
+      | set_exp error { $1                }
+      | EOF           { raise End_of_file }
    ;
    attr:
       | vvar IS strs { (path_of_vvar $1, $3) }
@@ -199,4 +201,5 @@
       |                       { []       }
    ;   
    result:
-      | resources EOF { $1 }
+      | resources { $1                }
+      | EOF       { raise End_of_file }

diff --git a/helm/ocaml/mathql_test/.cvsignore b/helm/ocaml/mathql_test/.cvsignore
index fa6e3504159923f5673e0d774ff5e1af5bc4ee6d..bf48dbb5b9f33b200ba673451664a4ed956f817a 100644 (file)
--- a/helm/ocaml/mathql_test/.cvsignore
+++ b/helm/ocaml/mathql_test/.cvsignore
@@ -1 +1 @@
-*.cm[aiox] *.cmxa *.opt mqtop mqitop
+*.cm[aiox] *.cmxa *.opt mqtop mqitop examples