- begin match EU.list_find_selected None st.ET.r with
- | None ->
- let r = {ET.x = false; ET.v = st.ET.s; ET.o = os; ET.n = ns} in
- st.ET.r <- EU.roles_union [false, r] st.ET.r
- | Some r ->
- if r.ET.v <> st.ET.s then EU.raise_error ET.EWrongVersion else
- r.ET.o <- EU.objs_union os r.ET.o;
- r.ET.n <- EU.names_union ns r.ET.n;
+ let add r =
+ r.ET.ro <- EU.oobj_union os r.ET.ro;
+ r.ET.rn <- EU.nobj_union ns r.ET.rn;
+ r.ET.rb <- false
+ in
+ let is_selected _ r = r.ET.rb && EU.stage_compare r.ET.rs st.ET.ss = 0 in
+ let is_new _ r = r.ET.ro = [] && EU.stage_compare r.ET.rs st.ET.ss = 0 in
+ let is_deleted _ r = r.ET.rn = [] && EU.stage_compare r.ET.rs st.ET.ss = 0 in
+ begin
+ if EU.list_apply is_selected add 0 st.ET.sr then () else
+ if os = [] && EU.list_apply is_new add 0 st.ET.sr then () else
+ if ns = [] && EU.list_apply is_deleted add 0 st.ET.sr then () else
+ let r = {ET.rb = false; ET.rx = false; ET.rs = st.ET.ss; ET.ro = os; ET.rn = ns} in
+ st.ET.sr <- EU.robj_union st.ET.sr [r]