From f28ada124237ae2f481c8ed625de80dab5f55dbf Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Fri, 18 Nov 2005 16:51:47 +0000 Subject: [PATCH] added support for enabling/disabling (pretty printing) notation --- helm/ocaml/cic_notation/cicNotation.ml | 18 ++++++++++++ helm/ocaml/cic_notation/cicNotation.mli | 9 ++++++ helm/ocaml/cic_notation/cicNotationRew.ml | 34 ++++++++++++++++++++-- helm/ocaml/cic_notation/cicNotationRew.mli | 6 ++++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/helm/ocaml/cic_notation/cicNotation.ml b/helm/ocaml/cic_notation/cicNotation.ml index 9ed0c5038..cbad3391f 100644 --- 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 082f08b05..1c6e95385 100644 --- 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 27040d5ae..919a07fab 100644 --- 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 2d3b09afb..f587291aa 100644 --- 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 + -- 2.39.2