patched and new Gen constructor added

[helm.git] / helm / ocaml / mathql_interpreter / mQueryIO.ml

diff --git a/helm/ocaml/mathql_interpreter/mQueryIO.ml b/helm/ocaml/mathql_interpreter/mQueryIO.ml
index f220a270de5694cb1f4f0a33fe3b24f022bf2484..a8fe2006eeb4faaccc08ac8c86d3eb340379c2f2 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQueryIO.ml
+++ b/helm/ocaml/mathql_interpreter/mQueryIO.ml
@@ -115,7 +115,7 @@ let rec text_of_query out sep x =
                  L.query = text_of_query; L.result = text_of_result
                 } 
         in
-        L.txt_out o p pl xl 
+        L.fun_txt_out o p pl xl 
       | M.Const [s, []] -> txt_str out s
       | M.Const r       -> text_of_result out " " r
       | M.Dot av p      -> txt_avar av; out "."; txt_path out p
@@ -136,6 +136,9 @@ let rec text_of_query out sep x =
                            txt_set x; txt_gen k; txt_set y
       | M.Add d g x     -> out "add "; txt_distr d; txt_grp g; 
                            out " in "; txt_set x
+      | M.Gen p [x]     -> out "gen "; txt_path out p; out " in "; txt_set x
+      | M.Gen p l       -> out "gen "; txt_path out p; out " {";
+                           P.flat_list out txt_set ", " l; out "}"
    in 
    txt_set x; out sep