update in basic_2

[helm.git] / matitaB / components / content_pres / content2presMatcher.ml

diff --git a/matitaB/components/content_pres/content2presMatcher.ml b/matitaB/components/content_pres/content2presMatcher.ml
index cf5d66b6a9bd9c5f3c911d83194334efc2a248af..0020f8170cdcb836d5ccb0cfd43a4706f00fec4b 100644 (file)
--- a/matitaB/components/content_pres/content2presMatcher.ml
+++ b/matitaB/components/content_pres/content2presMatcher.ml
@@ -40,6 +40,7 @@ let get_tag term0 =
   in
   let rec aux t = 
     NotationUtil.visit_ast 
+      ~clear_interpretation:true
       ~map_xref_option:(fun _ -> None)
       ~map_case_indty:(fun _ -> None)
       ~map_case_outtype:(fun _ _ -> None)
@@ -70,8 +71,9 @@ struct
 
     (* Debugging only *)
     (*CSC: new NCicPp.status is the best I can do now *)
-    let string_of_term = NotationPp.pp_term (new NCicPp.status)
-    let string_of_pattern = NotationPp.pp_term (new NCicPp.status)
+    (*WR: can't guess a user id so I must use None *)
+    let string_of_term = NotationPp.pp_term (new NCicPp.status None)
+    let string_of_pattern = NotationPp.pp_term (new NCicPp.status None)
   end
 
   module M = PatternMatcher.Matcher (Pattern21)
@@ -181,19 +183,19 @@ struct
                        let env'' = Env.remove_name env' acc_name in
                         match aux acc with
                           | None -> aux_base term
-                          | Some (base_env, ctors', rec_envl) -> 
-                               let ctors'' = ctors' @ ctors in
+                          | Some (base_env, ctors_acc, rec_envl) -> 
+                               let ctors'' = ctors' @ ctors_acc (* @ ctors *)in
                               Some (base_env, ctors'',env'' :: rec_envl)
                      end
             in
                match aux term with
                 | None -> None
-                | Some (base_env, ctors, rec_envl) ->
+                | Some (base_env, ctors_term, rec_envl) ->
                      let env' =
                        base_env @ Env.coalesce_env p_rec_decls rec_envl @ env
                        (* @ env LUCA!!! *)
                      in
-                     Some (env', ctors))
+                     Some (env', ctors_term @ ctors))
 
     | Ast.Default (p_some, p_none) ->  (* p_none can't bound names *)
         let p_some_decls = Env.declarations_of_term p_some in