raise (ET.Error e)
let list_union error compare l1 l2 =
- let rec aux l1 l2 = match l1 with
+ let rec aux l1 l2 = match l1 with
| [] -> l2
| hd1::tl1 -> match l2 with
| [] -> l1
| hd2::tl2 ->
- let b = compare (snd hd1) (snd hd2) in
+ let b = compare hd1 hd2 in
if b > 0 then hd2 :: aux l1 tl2
- else if b < 0 then hd1 :: aux tl1 l2
- else raise_error (error (snd hd1))
+ else if b < 0 then hd1 :: aux tl1 l2
+ else raise_error (error hd1)
in
aux l1 l2
let list_compare compare l1 l2 =
- let rec aux l1 l2 = match l1 with
+ let rec aux l1 l2 = match l1 with
| [] ->
if l2 = [] then 0 else -1
| hd1::tl1 -> match l2 with
in
aux l1 l2
-let rec list_nth n = function
- | [] -> raise_error ET.ENoEntry
- | (_,hd)::tl -> if n = 0 then hd else list_nth (pred n) tl
+let rec list_apply prop map n = function
+ | [] -> false
+ | hd :: tl ->
+ if prop n hd then begin map hd; true end
+ else list_apply prop map (succ n) tl
+
+let list_nth map n l =
+ let prop m _ = m = n in
+ if list_apply prop map 0 l then () else raise_error ET.ENoEntry
-let rec list_toggle n = function
- | [] -> raise_error ET.ENoEntry
- | (b,hd)::tl -> if n = 0 then (not b,hd)::tl else (b,hd)::list_toggle (pred n) tl
+let list_split prop map l =
+ let lt, lf = List.partition prop l in
+ List.iter map lt; lf, lt
-let rec list_toggle_all = function
- | [] -> []
- | (b,hd)::tl -> (not b,hd)::list_toggle_all tl
+let rec list_count p s c = function
+ | [] -> s, c
+ | x :: tl -> list_count p (s + if p x then 1 else 0) (succ c) tl
-let string_of_version v =
+(* stage *)
+
+let string_of_stage v =
String.concat "." (List.map string_of_int v)
-let version_of_string s =
+let stage_of_string s =
List.map int_of_string (String.split_on_char '.' s)
+let stage_compare v1 v2 =
+ list_compare compare v1 v2
+
+(* name *)
+
let string_of_name n =
String.concat "_" n
let name_of_string s =
String.split_on_char '_' s
-let compare_names n1 n2 =
+let name_compare n1 n2 =
list_compare compare n1 n2
-let string_of_obj (v,n) =
- Printf.sprintf "%s/%s" (string_of_version v) (string_of_name n)
+(* nobj *)
+
+let string_of_nobj n =
+ string_of_name n.ET.nn
+
+let nobj_of_string s = {
+ ET.nb = false; ET.nn = name_of_string s;
+}
+
+let key_of_nobj n = string_of_nobj n
+
+let nobj_selected n = n.ET.nb
+
+let nobj_select n =
+ n.ET.nb <- not n.ET.nb
+
+let nobj_compare n1 n2 =
+ name_compare n1.ET.nn n2.ET.nn
-let obj_of_string s =
+let nobj_union ns1 ns2 =
+ let error n = ET.ENClash n in
+ list_union error nobj_compare ns1 ns2
+
+(* oobj *)
+
+let string_of_oobj o =
+ Printf.sprintf "%s/%s" (string_of_stage o.ET.os) (string_of_name o.ET.on)
+
+let oobj_of_string s =
match String.split_on_char '/' s with
- | [sv;sn] -> version_of_string sv, name_of_string sn
- | _ -> failwith "obj_of_string"
+ | [ss;sn] -> {ET.ob = false; ET.os = stage_of_string ss; ET.on = name_of_string sn}
+ | _ -> failwith "oobj_of_string"
+
+let key_of_oobj o = string_of_name o.ET.on
+
+let oobj_selected o = o.ET.ob
+
+let oobj_select o =
+ o.ET.ob <- not o.ET.ob
+
+let oobj_compare o1 o2 =
+ let b = stage_compare o1.ET.os o2.ET.os in
+ if b = 0 then name_compare o1.ET.on o2.ET.on else b
+
+let oobj_union os1 os2 =
+ let error o = ET.EOClash o in
+ list_union error oobj_compare os1 os2
+
+let oobj_of_nobj v n =
+ {ET.ob = n.ET.nb; ET.os = v; ET.on = n.ET.nn}
+
+let rec oobj_match oi ni os ns =
+ match os, ns with
+ | _ , [] -> None
+ | [] , _ -> None
+ | o :: otl, n :: ntl ->
+ let b = name_compare o.ET.on n.ET.nn in
+ if b > 0 then oobj_match oi (succ ni) os ntl else
+ if b < 0 then oobj_match (succ oi) ni otl ns else
+ Some (oi, ni)
+
+(* robj *)
+
+let oobj_of_robj r =
+ let n = match r.ET.rn with
+ | [] -> []
+ | n :: _ -> n.ET.nn
+ in
+ {ET.ob = r.ET.rb; ET.os = r.ET.rs; ET.on = n}
+
+let string_of_robj r =
+ string_of_oobj (oobj_of_robj r)
+
+let key_of_robj r = key_of_oobj (oobj_of_robj r)
+
+let robj_selected r = r.ET.rb
+
+let robj_select r =
+ r.ET.rb <- not r.ET.rb
+
+let robj_expand r =
+ r.ET.rx <- not r.ET.rx
+
+let robj_compare r1 r2 =
+ oobj_compare (oobj_of_robj r1) (oobj_of_robj r2)
+
+let robj_union rs1 rs2 =
+ let error r = ET.ERClash r in
+ list_union error robj_compare rs1 rs2
+
+let rec robj_tops v = function
+ | [] -> [], []
+ | r :: tl ->
+ let ds, ts = robj_tops v tl in
+ if stage_compare v r.ET.rs = 0 then begin
+ if r.ET.rn = [] then oobj_union r.ET.ro ds, ts else
+ let tops = List.rev_map (oobj_of_nobj v) r.ET.rn in
+ ds, oobj_union (List.rev tops) ts
+ end else
+ ds, ts
+
+let robj_split s rs =
+ let rec aux rs os ns = function
+ | [] -> List.rev rs, os, ns
+ | r :: tl ->
+ if stage_compare s r.ET.rs <> 0 then aux (r :: rs) os ns tl else
+ if r.ET.rb then aux rs (oobj_union os r.ET.ro) (nobj_union ns r.ET.rn) tl else
+ let ro, so = list_split oobj_selected oobj_select r.ET.ro in
+ let rn, sn = list_split nobj_selected nobj_select r.ET.rn in
+ if ro = [] && rn = [] then aux rs (oobj_union os so) (nobj_union ns sn) tl else begin
+ r.ET.ro <- ro; r.ET.rn <- rn;
+ aux (r :: rs) (oobj_union os so) (nobj_union ns sn) tl
+ end
+ in
+ aux [] [] [] rs
+
+(* status *)
let new_status = {
- ET.r = []; ET.s = []; ET.t = []; ET.w = [];
+ ET.sm = false; ET.sr = []; ET.ss = []; ET.so = []; ET.sn = [];
}
-let pointer_of_string = version_of_string
+(* pointer *)
+
+let string_of_pointer = string_of_stage
+
+let pointer_of_string = stage_of_string
+
+let list_visit before each visit after selected key_of string_of p l =
+ let ptr p = string_of_pointer (List.rev p) in
+ let rec aux i = function
+ | [] -> ()
+ | x :: tl ->
+ each (ptr p) (ptr (i::p)) (selected x) (key_of x) (string_of x);
+ visit (i::p) x;
+ aux (succ i) tl
+ in
+ let s, c = list_count selected 0 0 l in
+ let count = Printf.sprintf "%u/%u" s c in
+ before (ptr p) count;
+ aux 0 l;
+ after ()
+
+(* error *)
let string_of_error = function
- | ET.EExt x ->
+ | ET.EWrongExt x ->
Printf.sprintf "unknown input file type %S" x
- | ET.EStage v ->
- Printf.sprintf "current stage %S" (string_of_version v)
- | ET.ENoStage ->
+ | ET.EStage v ->
+ Printf.sprintf "current stage %S" (string_of_stage v)
+ | ET.ENoStage ->
Printf.sprintf "current stage not defined"
- | ET.ENews ->
+ | ET.EWaiting ->
Printf.sprintf "current stage not finished"
- | ET.ENameClash n ->
- Printf.sprintf "name clash %S" (string_of_name n)
- | ET.ENoEntry ->
+ | ET.ENClash n ->
+ Printf.sprintf "name clash %S" (string_of_nobj n)
+ | ET.EOClash o ->
+ Printf.sprintf "object clash %S" (string_of_oobj o)
+ | ET.ERClash r ->
+ Printf.sprintf "role clash %S" (string_of_robj r)
+ | ET.ENoEntry ->
Printf.sprintf "entry not found"
+ | ET.EWrongSelect ->
+ Printf.sprintf "selected role is not unique"
+ | ET.EWrongVersion ->
+ Printf.sprintf "selected role is not in the current stage"
+ | ET.ETops ->
+ Printf.sprintf "top objects already computed"
+ | ET.EWrongRequest (r,a) ->
+ Printf.sprintf "unknown request \"%s=%s\"" r a
projects / helm.git / blobdiff