X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmathql_test%2Fmqgtop.ml;h=ae06bc752b317f4f865d473e2afddba9400dc7b0;hb=efdc3184ccd0738fe48aa0056fc444fba23329e8;hp=aba3bb3d4e85846ec70f31f2ca1725713cb48627;hpb=506b4b7597021c98e34fb65cf9d0bb7879f06e92;p=helm.git diff --git a/helm/mathql_test/mqgtop.ml b/helm/mathql_test/mqgtop.ml index aba3bb3d4..ae06bc752 100644 --- a/helm/mathql_test/mqgtop.ml +++ b/helm/mathql_test/mqgtop.ml @@ -38,6 +38,7 @@ let int_options = ref "" let nl = "

\n" +module IO = MQueryIO module U = MQueryUtil module I = MQueryInterpreter module C = MQIConn @@ -73,14 +74,14 @@ let issue handle q = let out = output_string och in if ! query_num = 1 then out (time () ^ nl); out ("Query: " ^ string_of_int ! query_num ^ nl); - U.text_of_query out q nl; + IO.text_of_query out nl q; out ("Result: " ^ nl); - U.text_of_result out r nl; + IO.text_of_result out nl r; close_out och in - if ! show_queries then U.text_of_query (output_string stdout) q nl; + if ! show_queries then IO.text_of_query (output_string stdout) nl q; let r = I.execute handle q in - U.text_of_result (output_string stdout) r nl; + IO.text_of_result (output_string stdout) nl r; if ! log_file <> "" then log q r; incr query_num; flush stdout @@ -139,7 +140,7 @@ let execute ich = let handle = get_handle () in let rec execute_aux () = try - let q = U.query_of_text lexbuf in + let q = IO.query_of_text lexbuf in issue handle q; execute_aux () with End_of_file -> () in @@ -232,7 +233,7 @@ let mbackward n m l = let inductive l = let queries = ref [] in - let univ = Some C3.universe in + let univ = None in let handle = get_handle () in let rec aux = function | [] -> ()