-let common f (a, u, _) = f a u
-
-let rec name err f = function
- | Name (n, r) :: _ -> f n r
- | _ :: tl -> name err f tl
- | [] -> err ()
-
-let names f map l a =
- let rec aux f i a = function
- | [] -> f a
- | Name (n, r) :: tl -> aux (map f i n r) false a tl
- | _ :: tl -> aux f i a tl
- in
- aux f true a l
-
-let rec get_name err f j = function
- | [] -> err ()
- | Name (n, r) :: _ when j = 0 -> f n r
- | Name _ :: tl -> get_name err f (pred j) tl
- | _ :: tl -> get_name err f j tl
-
-let rec get_names f = function
- | [] -> f [] []
- | Name _ as n :: tl ->
- let f a ns = f a (n :: ns) in get_names f tl
- | e :: tl ->
- let f a = f (e :: a) in get_names f tl
-
-let count_names a =
- let rec aux k = function
- | [] -> k
- | Name _ :: tl -> aux (succ k) tl
- | _ :: tl -> aux k tl
- in
- aux 0 a
-
-let rec apix err f = function
- | Apix i :: _ -> f i
- | _ :: tl -> apix err f tl
- | [] -> err ()
-
-let rec mark err f = function
- | Mark i :: _ -> f i
- | _ :: tl -> mark err f tl
- | [] -> err ()
-
-let rec meta err f = function
- | Meta ms :: _ -> f ms
- | _ :: tl -> meta err f tl
- | [] -> err ()
-
-let rec info err f = function
- | Info (lg, tx) :: _ -> f lg tx
- | _ :: tl -> info err f tl
- | [] -> err ()
-
-let resolve err f name a =
- let rec aux i = function
- | Name (n, true) :: _ when n = name -> f i
- | _ :: tl -> aux (succ i) tl
- | [] -> err i
- in
- aux 0 a
-
-let rec rev_append_names ns = function
- | [] -> ns
- | Name n :: tl -> rev_append_names (n :: ns) tl
- | _ :: tl -> rev_append_names ns tl
+let node_attrs ?(apix=0) () = {
+ n_apix = apix;
+}
+
+let appl_attrs ?(main=(0,0)) ?(side=(0,0)) rest = {
+ a_rest = rest; a_main = main; a_side = side;
+}
+
+let bind_attrs ?name ?(main=(0,0)) ?(side=(0,0)) () = {
+ b_name = name; b_main = main; b_side = side;
+}
+
+let root_attrs ?(meta=[]) ?info () = {
+ r_meta = meta; r_info = info;
+}
+
+let env_attrs ?(side=(0,0)) () = {
+ e_side = side;
+}
+
+let empty_node = node_attrs ()
+
+let empty_bind = bind_attrs ()
+
+let empty_root = root_attrs ()
+
+let empty_env = env_attrs ()
+
+let abst a t = Abst (a, t)
+
+let abbr a t = Abbr (a, t)
+
+let common f (ra, na, u, _) = f ra na u
+
+let succ (sort, degr) = sort, succ degr
+
+let compose av yt = {av with b_main = yt}
+
+let rec name err f a = match a.b_name with
+ | Some (n, r) -> f n r
+ | None -> err ()
+
+let rec info err f a = match a.r_info with
+ | Some (lg, tx) -> f lg tx
+ | None -> err ()