X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FtermAcicContent.ml;h=508411d2847b1b84083141efa5bbe14aed16a8fa;hb=ca5c21576ebd9a7bc9569cb8d713a9220392f2cf;hp=edb22c9442c5aaa53c9e43c7ea8b7a54b728c2e1;hpb=910c252965fe17d6b5af92e4658e7d02bac82d58;p=helm.git

diff --git a/helm/software/components/acic_content/termAcicContent.ml b/helm/software/components/acic_content/termAcicContent.ml
index edb22c944..508411d28 100644
--- a/helm/software/components/acic_content/termAcicContent.ml
+++ b/helm/software/components/acic_content/termAcicContent.ml
@@ -109,7 +109,7 @@ let ast_of_acic0 ~output_type term_info acic k =
     | Cic.AProd (id,n,s,t) ->
         let binder_kind =
           match sort_of_id id with
-          | `Set | `Type _ -> `Pi
+          | `Set | `Type _ | `NType _ -> `Pi
           | `Prop | `CProp _ -> `Forall
         in
         idref id (Ast.Binder (binder_kind,
@@ -281,11 +281,38 @@ let ast_of_acic0 ~output_type term_info acic k =
 
   (* persistent state *)
 
-let level2_patterns32 = Hashtbl.create 211
-let interpretations = Hashtbl.create 211  (* symb -> id list ref *)
+let initial_level2_patterns32 () = Hashtbl.create 211
+let initial_interpretations () = Hashtbl.create 211
 
+let level2_patterns32 = ref (initial_level2_patterns32 ())
+(* symb -> id list ref *)
+let interpretations = ref (initial_interpretations ())
 let compiled32 = ref None
 let pattern32_matrix = ref []
+let counter = ref ~-1 
+
+let stack = ref []
+
+let push () =
+ stack := (!counter,!level2_patterns32,!interpretations,!compiled32,!pattern32_matrix)::!stack;
+ counter := ~-1;
+ level2_patterns32 := initial_level2_patterns32 ();
+ interpretations := initial_interpretations ();
+ compiled32 := None;
+ pattern32_matrix := []
+;;
+
+let pop () =
+ match !stack with
+    [] -> assert false
+  | (ocounter,olevel2_patterns32,ointerpretations,ocompiled32,opattern32_matrix)::old ->
+   stack := old;
+   counter := ocounter;
+   level2_patterns32 := olevel2_patterns32;
+   interpretations := ointerpretations;
+   compiled32 := ocompiled32;
+   pattern32_matrix := opattern32_matrix
+;;
 
 let get_compiled32 () =
   match !compiled32 with
@@ -351,7 +378,7 @@ let rec ast_of_acic1 ~output_type term_info annterm =
       in
       let _, symbol, args, _ =
         try
-          Hashtbl.find level2_patterns32 pid
+          Hashtbl.find !level2_patterns32 pid
         with Not_found -> assert false
       in
       let ast = instantiate32 term_info idrefs env' symbol args in
@@ -371,12 +398,6 @@ let ast_of_acic ~output_type id_to_sort annterm =
   debug_print (lazy ("ast_of_acic -> " ^ CicNotationPp.pp_term ast));
   ast, term_info.uri
 
-let counter = ref ~-1 
-let reset () =
- counter := ~-1;
- Hashtbl.clear level2_patterns32;
- Hashtbl.clear interpretations
-;;
 let fresh_id =
   fun () ->
     incr counter;
@@ -384,13 +405,13 @@ let fresh_id =
 
 let add_interpretation dsc (symbol, args) appl_pattern =
   let id = fresh_id () in
-  Hashtbl.add level2_patterns32 id (dsc, symbol, args, appl_pattern);
+  Hashtbl.add !level2_patterns32 id (dsc, symbol, args, appl_pattern);
   pattern32_matrix := (true, appl_pattern, id) :: !pattern32_matrix;
   load_patterns32 !pattern32_matrix;
   (try
-    let ids = Hashtbl.find interpretations symbol in
+    let ids = Hashtbl.find !interpretations symbol in
     ids := id :: !ids
-  with Not_found -> Hashtbl.add interpretations symbol (ref [id]));
+  with Not_found -> Hashtbl.add !interpretations symbol (ref [id]));
   id
 
 let get_all_interpretations () =
@@ -398,7 +419,7 @@ let get_all_interpretations () =
     (function (_, _, id) ->
       let (dsc, _, _, _) =
         try
-          Hashtbl.find level2_patterns32 id
+          Hashtbl.find !level2_patterns32 id
         with Not_found -> assert false
       in
       (id, dsc))
@@ -429,19 +450,19 @@ let lookup_interpretations symbol =
       (fun id ->
         let (dsc, _, args, appl_pattern) =
           try
-            Hashtbl.find level2_patterns32 id
+            Hashtbl.find !level2_patterns32 id
           with Not_found -> assert false 
         in
         dsc, args, appl_pattern)
-      !(Hashtbl.find interpretations symbol)))
+      !(Hashtbl.find !interpretations symbol)))
   with Not_found -> raise Interpretation_not_found
 
 let remove_interpretation id =
   (try
-    let dsc, symbol, _, _ = Hashtbl.find level2_patterns32 id in
-    let ids = Hashtbl.find interpretations symbol in
+    let dsc, symbol, _, _ = Hashtbl.find !level2_patterns32 id in
+    let ids = Hashtbl.find !interpretations symbol in
     ids := List.filter ((<>) id) !ids;
-    Hashtbl.remove level2_patterns32 id;
+    Hashtbl.remove !level2_patterns32 id;
   with Not_found -> raise Interpretation_not_found);
   pattern32_matrix :=
     List.filter (fun (_, _, id') -> id <> id') !pattern32_matrix;
@@ -449,7 +470,9 @@ let remove_interpretation id =
 
 let _ = load_patterns32 []
 
-let instantiate_appl_pattern env appl_pattern =
+let instantiate_appl_pattern 
+  ~mk_appl ~mk_implicit ~term_of_uri env appl_pattern 
+=
   let lookup name =
     try List.assoc name env
     with Not_found ->
@@ -457,10 +480,10 @@ let instantiate_appl_pattern env appl_pattern =
       assert false
   in
   let rec aux = function
-    | Ast.UriPattern uri -> CicUtil.term_of_uri uri
-    | Ast.ImplicitPattern -> Cic.Implicit None
+    | Ast.UriPattern uri -> term_of_uri uri
+    | Ast.ImplicitPattern -> mk_implicit false
     | Ast.VarPattern name -> lookup name
-    | Ast.ApplPattern terms -> Cic.Appl (List.map aux terms)
+    | Ast.ApplPattern terms -> mk_appl (List.map aux terms)
   in
   aux appl_pattern