ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_notation / cicNotationRew.ml

diff --git a/helm/ocaml/cic_notation/cicNotationRew.ml b/helm/ocaml/cic_notation/cicNotationRew.ml
index 27040d5ae8d41138bb098001bb395ea377eb487a..8bbc22e24344819e37e7758abe8c5dc6f54f8f40 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationRew.ml
+++ b/helm/ocaml/cic_notation/cicNotationRew.ml
@@ -330,7 +330,8 @@ let ast_of_acic0 term_info acic k =
     | Cic.ASort (id,Cic.Set) -> idref id (Ast.Sort `Set)
     | Cic.ASort (id,Cic.Type u) -> idref id (Ast.Sort (`Type u))
     | Cic.ASort (id,Cic.CProp) -> idref id (Ast.Sort `CProp)
-    | Cic.AImplicit _ -> assert false
+    | Cic.AImplicit (id, Some `Hole) -> idref id Ast.UserInput
+    | Cic.AImplicit (id, _) -> idref id Ast.Implicit
     | Cic.AProd (id,n,s,t) ->
         let binder_kind =
           match sort_of_id id with
@@ -644,6 +645,9 @@ let rec ast_of_acic1 term_info annterm =
       Ast.AttributedTerm (`IdRef (CicUtil.id_of_annterm annterm), ast)
 
 let load_patterns32 t =
+  let t =
+    HExtlib.filter_map (function (true, ap, id) -> Some (ap, id) | _ -> None) t
+  in
   set_compiled32 (lazy (CicNotationMatcher.Matcher32.compiler t))
 
 let load_patterns21 t =
@@ -672,7 +676,7 @@ 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);
-  pattern32_matrix := (appl_pattern, id) :: !pattern32_matrix;
+  pattern32_matrix := (true, appl_pattern, id) :: !pattern32_matrix;
   load_patterns32 !pattern32_matrix;
   (try
     let ids = Hashtbl.find interpretations symbol in
@@ -680,6 +684,32 @@ let add_interpretation dsc (symbol, args) appl_pattern =
   with Not_found -> Hashtbl.add interpretations symbol (ref [id]));
   id
 
+let get_all_interpretations () =
+  List.map
+    (function (_, _, id) ->
+      let (dsc, _, _, _) =
+        try
+          Hashtbl.find level2_patterns32 id
+        with Not_found -> assert false
+      in
+      (id, dsc))
+    !pattern32_matrix
+
+let get_active_interpretations () =
+  HExtlib.filter_map (function (true, _, id) -> Some id | _ -> None)
+    !pattern32_matrix
+
+let set_active_interpretations ids =
+  let pattern32_matrix' =
+    List.map
+      (function 
+        | (_, ap, id) when List.mem id ids -> (true, ap, id)
+        | (_, ap, id) -> (false, ap, id))
+      !pattern32_matrix
+  in
+  pattern32_matrix := pattern32_matrix';
+  load_patterns32 !pattern32_matrix
+
 exception Interpretation_not_found
 exception Pretty_printer_not_found
 
@@ -733,7 +763,8 @@ let remove_interpretation id =
     ids := List.filter ((<>) id) !ids;
     Hashtbl.remove level2_patterns32 id;
   with Not_found -> raise Interpretation_not_found);
-  pattern32_matrix := List.filter (fun (_, id') -> id <> id') !pattern32_matrix;
+  pattern32_matrix :=
+    List.filter (fun (_, _, id') -> id <> id') !pattern32_matrix;
   load_patterns32 !pattern32_matrix
 
 let remove_pretty_printer id =