mathQL.ml updated

[helm.git] / helm / ocaml / mathql / mQueryUtil.ml

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index 2169564e42e33f817cc599fffd98b920f5554ffd..89bd335e154859e59ea4df09832cfbf93db7cd6c 100644 (file)
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -102,6 +102,8 @@ let out_rvar s = sym s
 
 let out_svar s = sep "$" ^ sym s
 
+let out_lvar s = sep "%" ^ sym s
+
 let out_tref r = pat (str_tref r) 
 
 let out_pat p = out_tref p
@@ -134,12 +136,12 @@ let out_func = function
    | MQModified     -> key "modified"
 
 let out_str = function
-   | MQCons s      -> str s
-   | MQSRVar s     -> out_rvar s
-   | MQSSVar s     -> out_svar s
-   | MQFunc (f, r) -> out_func f ^ out_rvar r
-   | MQMConclusion -> key "mainconclusion" 
-   | MQConclusion  -> key "inconclusion" 
+   | MQCons s       -> str s
+   | MQStringRVar s -> out_rvar s
+   | MQStringSVar s -> out_svar s
+   | MQFunc (f, r)  -> out_func f ^ out_rvar r
+   | MQMConclusion  -> key "mainconclusion" 
+   | MQConclusion   -> key "inconclusion" 
 
 let rec out_bool = function
    | MQTrue -> key "true"
@@ -160,8 +162,12 @@ and out_list = function
    | MQUnion (l1, l2) -> sep "(" ^ out_list l1 ^ sub "union" ^ out_list l2 ^ sep ")"
    | MQIntersect (l1, l2) -> sep "(" ^ out_list l1 ^ sub "intersect" ^ out_list l2 ^ sep ")"
    | MQDiff (l1, l2) -> sep "(" ^ out_list l1 ^ sub "diff" ^ out_list l2 ^ sep ")"
-   | MQLRVar s -> out_rvar s
+   | MQListRVar v -> out_rvar v
    | MQSortedBy (l, o, f) -> sep "(" ^ out_list l ^ sub "sortedby" ^ out_func f ^ out_order o ^ sep ")"
+   | MQListLVar v -> out_lvar v
+   | MQLetIn (v, l1, l2) -> key "let" ^ out_lvar v ^ sub "be" ^ out_list l1 ^ sub "in" ^ out_list l2
+   | MQReference s -> key "reference" ^ str s
+   | MQMinimize l -> key "minimize" ^ out_list l
 
 let out_query = function
    | MQList l -> out_list l