(******************************************************************************)
open MathQL
+open MQueryHTML
-(* string linearization of a reference *)
+(* string linearization of a reference **************************************)
let str_btoken = function
| MQBC s -> s
| MQBSS -> "**"
let str_ftoken = function
- | MQFC i -> "/" ^ string_of_int i
- | MQFS -> "/*"
- | MQFSS -> "/**"
+ | MQFC i -> string_of_int i
+ | MQFS -> "*"
+ | MQFSS -> "**"
let str_prot = function
| Some s -> s
| [] -> ""
| head :: tail -> str_btoken head ^ str_body tail
-let str_frag l =
- let rec str_fi start = function
- | [] -> ""
- | t :: l ->
- (if start then "#1" else "") ^ str_ftoken t ^ str_fi false l
- in str_fi true l
+let str_frag xpointer f l =
+ let sfi = List.fold_left (fun l0 t0 -> l0 ^ "/" ^ f t0) "" l in
+ if sfi = "" then "" else
+ if xpointer then "#xpointer(1" ^ sfi ^ ")" else
+ "#1" ^ sfi
let str_tref (p, b, i) =
- str_prot p ^ ":/" ^ str_body b ^ str_frag i
+ str_prot p ^ ":/" ^ str_body b ^ str_frag false str_ftoken i
-let str_uref (u, i) =
- let rec str_fi start = function
- | [] -> ""
- | i :: l ->
- (if start then "#1" else "") ^ string_of_int i ^ str_fi false l
- in UriManager.string_of_uri u ^ str_fi true i
-
-(* raw HTML representation *)
-
-let key s = "<font color=\"blue\">" ^ s ^ " </font>"
-
-let sub s = "<font color=\"blue\"> " ^ s ^ " </font>"
-
-let sub2 s = "<font color=\"blue\">" ^ s ^ "</font>"
-
-let sym s = s
-
-let sep s = s
+let xp_str_tref (p, b, i) =
+ str_prot p ^ ":/" ^ str_body b ^ str_frag true str_ftoken i
-let str s = "<font color=\"red\">'" ^ s ^ "'</font>"
-
-let pat s = "<font color=\"red\">\"" ^ s ^ "\"</font>"
-
-let res s = "<font color=\"brown\">\"" ^ s ^ "\"</font>"
-
-let nl () = "<br>"
+let str_uref (u, i) =
+ UriManager.string_of_uri u ^ str_frag false string_of_int i
-let par () = "<p>"
+let xp_str_uref (u, i) =
+ UriManager.string_of_uri u ^ str_frag true string_of_int i
-(* HTML representation of a query *)
+(* HTML representation of a query ********************************************)
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"
| 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"
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_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
let out_query = function
| MQList l -> out_list l
-(* HTML representation of a query result *)
+(* 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 *)
+(* Converting functions *****************************************************)
let tref_uref u =
let s = str_uref u in
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)
+
+*)
projects / helm.git / blobdiff