X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbin%2Froles%2FrolesEngine.ml;h=6af2b3fbd1b5adecc4dc5bd257c54cf7a9728887;hb=cfccf434a57e10848d74d06674af4ec9cef0f0ca;hp=0c03968b927ef5a8628feedb26acb04bbddc067f;hpb=f5bc9206835d61109a72c7b973dad8dd21914950;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/bin/roles/rolesEngine.ml b/matita/matita/contribs/lambdadelta/bin/roles/rolesEngine.ml
index 0c03968b9..6af2b3fbd 100644
--- a/matita/matita/contribs/lambdadelta/bin/roles/rolesEngine.ml
+++ b/matita/matita/contribs/lambdadelta/bin/roles/rolesEngine.ml
@@ -19,7 +19,7 @@ let st = EU.new_status
 
 let new_stage v =
   if st.ET.w = [] then st.ET.s <- v
-  else EU.raise_error ET.ENews
+  else EU.raise_error ET.EWaiting
 
 let toggle_entry = function
   | [0]       -> st.ET.r <- EU.list_toggle_all st.ET.r
@@ -57,16 +57,36 @@ let add_role () =
   end;
   st.ET.t <- ts; st.ET.w <- ws
 
+let add_tops v =
+  if EU.exists_role_deleted st.ET.s st.ET.r || st.ET.t <> []
+  then EU.raise_error ET.ETops else
+  let ds, ts = EU.get_tops v st.ET.r in
+  if ds <> [] then begin
+    let r = {ET.v = st.ET.s; ET.o = ds; ET.n = []} in
+    st.ET.r <- EU.roles_union [false, r] st.ET.r
+  end;
+  if ts <> [] then st.ET.t <- ts
+
+let rec add_matching () =
+  match EU.match_names 0 0 st.ET.t st.ET.w with
+  | None          -> ()
+  | Some  (ti,wi) ->
+    toggle_entry [1;ti];
+    toggle_entry [2;wi];
+    add_role ();
+    add_matching ()
+
 let read_waiting fname =
   if st.ET.s = [] then EU.raise_error ET.ENoStage else
   let ich = Scanf.Scanning.open_in fname in
-  let w = EI.read_names ich [] in
+  let ws = EI.read_rev_names ich [] in
   Scanf.Scanning.close_in ich;
-  st.ET.w <- EU.names_union st.ET.w (List.rev w)
+  let map ws w = EU.names_union ws [w] in
+  st.ET.w <- List.fold_left map st.ET.w ws
 
 let read_status () =
   if st.ET.s <> [] then EU.raise_error (ET.EStage st.ET.s) else
-  let fname = Filename.concat !EG.wd "roles.osn" in
+  let fname = Filename.concat !EG.cwd "roles.osn" in
   let ich = open_in fname in
   let tmp = EI.read_status ich in
   close_in ich;
@@ -76,7 +96,25 @@ let read_status () =
   st.ET.w <- tmp.ET.w
 
 let write_status () =
-  let fname = Filename.concat !EG.wd "roles.osn" in
+  let fname = Filename.concat !EG.cwd "roles.osn" in
   let och = open_out fname in
   EO.out_status och st;
   close_out och
+
+let print_status () =
+  EO.out_status stdout st
+
+let visit_status
+  before_r each_r before after after_r stage
+  before_t each_t after_t before_w each_w after_w =
+  let visit_tw _ _ = () in
+  let visit_r p r =
+    before (EU.string_of_pointer (List.rev p));
+    EU.list_visit before_t each_t visit_tw after_t EU.string_of_obj (1::p) r.ET.o;
+    EU.list_visit before_w each_w visit_tw after_w EU.string_of_name (2::p) r.ET.n;
+    after ()
+  in
+  EU.list_visit before_r each_r visit_r after_r EU.string_of_role [0] st.ET.r;
+  stage (EU.string_of_version st.ET.s);
+  EU.list_visit before_t each_t visit_tw after_t EU.string_of_obj [1] st.ET.t;
+  EU.list_visit before_w each_w visit_tw after_w EU.string_of_name [2] st.ET.w