mathQL and mqint updated

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

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index 2169564e42e33f817cc599fffd98b920f5554ffd..97f94f727d073a015b47f47f2c97d4a32582b321 100644 (file)
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -102,9 +102,15 @@ 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
+
+let rec out_sequence f = function
+  | []        -> sep "."
+  | [s]       -> f s
+  | s :: tail -> f s ^ sep "," ^ out_sequence f tail
 
 let out_order = function
    | MQAsc  -> sub2 "asc"
@@ -134,12 +140,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"
@@ -156,26 +162,30 @@ and out_list = function
       key "select" ^ out_rvar r ^ sub "in" ^ out_list l ^ sub "where" ^ out_bool b
    | MQUse (l, v) -> key "use" ^ out_list l ^ sub "position" ^ out_svar v
    | MQUsedBy (l, v) -> key "usedby" ^ out_list l ^ sub "position" ^ out_svar v
-   | MQPattern p -> key "pattern" ^ out_pat p
+   | MQPattern p -> key "pattern" ^ out_sequence out_tref p
    | 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" ^ out_sequence str s
+   | MQMinimize l -> key "minimize" ^ out_list l
 
 let out_query = function
    | MQList l -> out_list l
 
 (* HTML representation of a query result *)
 
-let rec out_list = function 
+let rec out_res_list = function 
    | []     -> ""
-   | u :: l -> res u ^ nl () ^ out_list l 
+   | u :: l -> res u ^ nl () ^ out_res_list l 
 
 let out_result qr =
    par () ^ "Result:" ^ nl () ^
    match qr with
-      | MQRefs l -> out_list l
+      | MQRefs l -> out_res_list l
 
 (* Converting functions *)
 
@@ -186,3 +196,32 @@ let tref_uref u =
 let parse_text ch =
    let lexbuf = Lexing.from_channel ch in
    MQueryTParser.query MQueryTLexer.qtoken lexbuf
+
+(* implementazione manuale di tref_uref da controllare 
+
+let split s =
+   try 
+      let i = Str.search_forward (Str.regexp_string ":/") s 0 in
+      let p = Str.string_before s i in
+      let q = Str.string_after s (i + 2) in
+         (p, q)
+   with 
+      Not_found -> (s, "")
+
+let encode = function
+   | Str.Text s  -> MQBC s
+   | Str.Delim s ->  
+      if s = "?"  then MQBQ else
+      if s = "*"  then MQBS else
+      if s = "**" then MQBSS else
+      if s = "/"  then MQBD  else MQBC s
+
+let tref_uref (u, i) =
+   let s = UriManager.string_of_uri u in
+   match split s with
+      | (p, q) -> 
+         let rx = Str.regexp "\?\|\*\*\|\*\|/" in
+         let l = Str.full_split rx q in
+         (Some p, List.map encode l, i) 
+
+*)