diff options
author | 2013-11-13 11:58:38 +0000 | |
---|---|---|
committer | 2013-11-13 11:58:38 +0000 | |
commit | 5cea75bd0f028fcea20b7cb4a058202187f5ddcd (patch) | |
tree | 2e3986b2a4594bcff404892a3e7a614b1895d9db /printing | |
parent | 9e8ca0130a3741586ccbe6edc48720194cf8b898 (diff) |
Synchronizing the printer of tactic notations.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@17084 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'printing')
-rw-r--r-- | printing/pptactic.ml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/printing/pptactic.ml b/printing/pptactic.ml index f52e10979..e1324c3ee 100644 --- a/printing/pptactic.ml +++ b/printing/pptactic.ml @@ -38,13 +38,13 @@ type pp_tactic = { let prtac_tab = Hashtbl.create 17 (* Tactic notations *) -let prnotation_tab = Hashtbl.create 17 +let prnotation_tab = Summary.ref ~name:"pptactic-notation" KNmap.empty let declare_ml_tactic_pprule key pt = Hashtbl.add prtac_tab (key, pt.pptac_args) pt.pptac_prods let declare_notation_tactic_pprule kn pt = - Hashtbl.add prnotation_tab (kn, pt.pptac_args) pt.pptac_prods + prnotation_tab := KNmap.add kn pt !prnotation_tab type 'a raw_extra_genarg_printer = (constr_expr -> std_ppcmds) -> @@ -271,14 +271,14 @@ let pr_extend_gen pr_gen lev s l = with Not_found -> str s ++ spc() ++ pr_sequence pr_gen l ++ str" (* Generic printer *)" -let pr_alias_gen pr_gen lev s l = +let pr_alias_gen pr_gen lev key l = try - let tags = List.map genarg_tag l in - let (lev',pl) = Hashtbl.find prnotation_tab (s,tags) in - let p = pr_tacarg_using_rule pr_gen (pl,l) in + let pp = KNmap.find key !prnotation_tab in + let (lev', pl) = pp.pptac_prods in + let p = pr_tacarg_using_rule pr_gen (pl, l) in if lev' > lev then surround p else p with Not_found -> - KerName.print s ++ spc() ++ pr_sequence pr_gen l ++ str" (* Generic printer *)" + KerName.print key ++ spc() ++ pr_sequence pr_gen l ++ str" (* Generic printer *)" let pr_raw_extend prc prlc prtac prpat = pr_extend_gen (pr_raw_generic prc prlc prtac prpat pr_reference) |