From 786284e9dfb25a31aad2161d59cdc5f36657e94a Mon Sep 17 00:00:00 2001
From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Fri, 10 Oct 2003 14:37:56 +0000
Subject: [PATCH] patched

---
 helm/mathql_test/.depend   |  2 --
 helm/mathql_test/Makefile  |  6 ++++--
 helm/mathql_test/mqitop.ml | 11 ++++++-----
 helm/mathql_test/mqtop.ml  |  9 +++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/helm/mathql_test/.depend b/helm/mathql_test/.depend
index b8d9e578a..851d52dd6 100644
--- 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 04fea5185..8dd07889e 100644
--- 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 7dd43888c..aca13b9cb 100644
--- 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 48ffb1e74..f0e0dc877 100644
--- 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)
-- 
2.39.2