added support for enabling/disabling (pretty printing) notation

diff --git a/helm/ocaml/cic_notation/cicNotation.ml b/helm/ocaml/cic_notation/cicNotation.ml
index 9ed0c5038e07c5c5d28792c4bf17233144a0df6e..cbad3391f3e01f8f67acec183780c5a748a58b00 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotation.ml
+++ b/helm/ocaml/cic_notation/cicNotation.ml
@@ -70,3 +70,21 @@ let load_notation fname =
     done
   with End_of_file -> close_in ic
 
+let get_all_notations () =
+  List.map
+    (fun (interp_id, dsc) ->
+      InterpretationId interp_id, "interpretation: " ^ dsc)
+    (CicNotationRew.get_all_interpretations ())
+
+let get_active_notations () =
+  List.map (fun id -> InterpretationId id)
+    (CicNotationRew.get_active_interpretations ())
+
+let set_active_notations ids =
+  let interp_ids =
+    HExtlib.filter_map
+      (function InterpretationId interp_id -> Some interp_id | _ -> None)
+      ids
+  in
+  CicNotationRew.set_active_interpretations interp_ids
+

diff --git a/helm/ocaml/cic_notation/cicNotation.mli b/helm/ocaml/cic_notation/cicNotation.mli
index 082f08b0589345b978681c9eab2c4d3554ed718b..1c6e95385a352f67072b094f4b5b677051d30bb5 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotation.mli
+++ b/helm/ocaml/cic_notation/cicNotation.mli
@@ -33,3 +33,12 @@ val remove_notation: notation_id -> unit
 (** @param fname file from which load notation *)
 val load_notation: string -> unit
 
+(** {2 Notation enabling/disabling}
+ * Right now, only disabling of notation during pretty printing is supporting.
+ * If it is useful to disable it also for the input phase is still to be
+ * understood ... *)
+
+val get_all_notations: unit -> (notation_id * string) list  (* id, dsc *)
+val get_active_notations: unit -> notation_id list
+val set_active_notations: notation_id list -> unit
+

diff --git a/helm/ocaml/cic_notation/cicNotationRew.ml b/helm/ocaml/cic_notation/cicNotationRew.ml
index 27040d5ae8d41138bb098001bb395ea377eb487a..919a07fab2190e270f767fdf1f8aae0508c9dfb4 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationRew.ml
+++ b/helm/ocaml/cic_notation/cicNotationRew.ml
@@ -644,6 +644,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 +675,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 +683,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 +762,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 =

diff --git a/helm/ocaml/cic_notation/cicNotationRew.mli b/helm/ocaml/cic_notation/cicNotationRew.mli
index 2d3b09afb1dcc58384ab13c77b4ee92513115e3b..f587291aa5452e006dfc25c54c216eeba0e09c31 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationRew.mli
+++ b/helm/ocaml/cic_notation/cicNotationRew.mli
@@ -66,3 +66,9 @@ val remove_interpretation: interpretation_id -> unit
   (** @raise Pretty_printer_not_found *)
 val remove_pretty_printer: pretty_printer_id -> unit
 
+(** {2 Interpretations toggling} *)
+
+val get_all_interpretations: unit -> (interpretation_id * string) list
+val get_active_interpretations: unit -> interpretation_id list
+val set_active_interpretations: interpretation_id list -> unit
+