patched

diff --git a/helm/mathql_test/.depend b/helm/mathql_test/.depend
index b8d9e578a19ee87615fbd3a4e7bd4893be9c2742..851d52dd61c303c4cde4a667ac9e8d729d351291 100644 (file)
--- a/helm/mathql_test/.depend
+++ b/helm/mathql_test/.depend
@@ -1,5 +1,3 @@
-mqgtop.cmo: mQGTopLexer.cmo mQGTopParser.cmi 
-mqgtop.cmx: mQGTopLexer.cmx mQGTopParser.cmx 
 mQGTopParser.cmo: mQGTopParser.cmi 
 mQGTopParser.cmx: mQGTopParser.cmi 
 mQGTopLexer.cmo: mQGTopParser.cmi 

diff --git a/helm/mathql_test/Makefile b/helm/mathql_test/Makefile
index 04fea5185fd64a9b1b0c3d6989b309fbc19b402f..8dd07889eb872ef6d54b639e33b2dd7af81b234b 100644 (file)
--- a/helm/mathql_test/Makefile
+++ b/helm/mathql_test/Makefile
@@ -1,6 +1,7 @@
 BIN_DIR = /usr/local/bin
 REQUIRES = unix helm-cic_textual_parser \
-          helm-mathql helm-mathql_interpreter helm-mathql_generator
+          helm-mathql helm-mathql_interpreter 
+#helm-mathql_generator
 PREDICATES =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
@@ -16,7 +17,8 @@ MQTOP = mqtop.ml
 MQITOP = mqitop.ml
 MQGTOP = mqgtop.ml
 
-DEPOBJS = $(MQTOP) $(MQITOP) $(MQGTOP)
+DEPOBJS = $(MQTOP) $(MQITOP) 
+# $(MQGTOP)
 AUXOBJS = mQGTopParser.ml mQGTopParser.mli mQGTopLexer.ml 
 
 all: $(DEPOBJS:.ml=)

diff --git a/helm/mathql_test/mqitop.ml b/helm/mathql_test/mqitop.ml
index 7dd43888c0eb4165501fee6d532e81c55272097a..aca13b9cb5cf0522bd086fb45db8fcfd34f81d93 100644 (file)
--- a/helm/mathql_test/mqitop.ml
+++ b/helm/mathql_test/mqitop.ml
@@ -29,6 +29,7 @@
 module U = MQueryUtil
 module I = MQueryInterpreter
 module C = MQIConn
+module F = MQueryIO
 
 let _ =
    let t = U.start_time () in
@@ -41,12 +42,12 @@ let _ =
    end;
    let rec aux () =
       let t = U.start_time () in
-      let r = I.execute handle (U.query_of_text ich) in
-(*    U.text_of_result log r "\n";
-*)    Printf.printf "mqitop: query: %s,%i\n" (U.stop_time t) (List.length r);
-      flush stdout; aux()
+      let r = I.execute handle (F.query_of_text ich) in
+(*    F.text_of_result log r "\n";
+*)    Printf.eprintf "mqitop: query: %s,%i\n" (U.stop_time t) (List.length r);
+      flush stderr; aux()
       
    in
    begin try aux() with End_of_file -> () end;
    C.close handle;
-   Printf.printf "mqitop: done: %s\n" (U.stop_time t)
+   Printf.eprintf "mqitop: done: %s\n" (U.stop_time t)

diff --git a/helm/mathql_test/mqtop.ml b/helm/mathql_test/mqtop.ml
index 48ffb1e74078f227a3b78e582822fb8ffda168e5..f0e0dc877b6cfd28de4746c93142313f3ee0ad95 100644 (file)
--- a/helm/mathql_test/mqtop.ml
+++ b/helm/mathql_test/mqtop.ml
@@ -28,13 +28,14 @@
 
 let _ =
    let module U = MQueryUtil in
+   let module F = MQueryIO in
    let t = U.start_time () in
    let ich = Lexing.from_channel stdin in
    let rec aux () =
       let t = U.start_time () in
-      U.text_of_query print_string (U.query_of_text ich) "\n";
-      Printf.printf "mqtop: query: %s\n" (U.stop_time t);
-      flush stdout; aux()
+      F.text_of_query print_string "\n" (F.query_of_text ich); flush stdout;
+      Printf.eprintf "mqtop: query: %s\n" (U.stop_time t);
+      flush stderr; aux()
    in
    begin try aux() with End_of_file -> () end;
-   Printf.printf "mqtop: done: %s\n" (U.stop_time t)
+   Printf.eprintf "mqtop: done: %s\n" (U.stop_time t)