diff options
| author | pboutill | 2012-07-20 14:22:40 +0000 |
|---|---|---|
| committer | pboutill | 2012-07-20 14:22:40 +0000 |
| commit | b78925e69d3e8b0ff2567bf0574e1bd55b33aa93 (patch) | |
| tree | ef12e124ffef426bae708c94d9c2e4709fd6272a /printing | |
| parent | 2285dae8af54043090ce5f8a59aa4162679714c6 (diff) | |
Fixing test-suite
- bug in r15614: hnf was identity
- fix Print Assumptions
- bug in r15624: Dump glob of Print About only for Glob
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15630 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/prettyp.ml | 10 | ||||
| -rw-r--r-- | printing/printer.ml | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/printing/prettyp.ml b/printing/prettyp.ml index 5e65bde250..31a42d132f 100644 --- a/printing/prettyp.ml +++ b/printing/prettyp.ml @@ -670,9 +670,10 @@ let print_opaque_name qid = let (_,c,ty) = lookup_named id env in print_named_decl (id,c,ty) -let print_about_any k = +let print_about_any loc k = match k with | Term ref -> + Dumpglob.add_glob loc ref; pr_infos_list (print_ref false ref :: blankline :: print_name_infos ref @ @@ -680,6 +681,9 @@ let print_about_any k = print_opacity ref @ [hov 0 (str "Expands to: " ++ pr_located_qualid k)]) | Syntactic kn -> + let () = match Syntax_def.search_syntactic_definition kn with + | [],Notation_term.NRef ref -> Dumpglob.add_glob loc ref + | _ -> () in v 0 ( print_syntactic_def kn ++ fnl () ++ hov 0 (str "Expands to: " ++ pr_located_qualid k)) @@ -688,11 +692,11 @@ let print_about_any k = let print_about = function | ByNotation (loc,ntn,sc) -> - print_about_any + print_about_any loc (Term (Notation.interp_notation_as_global_reference loc (fun _ -> true) ntn sc)) | AN ref -> - print_about_any (locate_any_name ref) + print_about_any (loc_of_reference ref) (locate_any_name ref) (* for debug *) let inspect depth = diff --git a/printing/printer.ml b/printing/printer.ml index bae75011b7..a820f997a2 100644 --- a/printing/printer.ml +++ b/printing/printer.ml @@ -612,7 +612,7 @@ let pr_assumptionset env s = opt_list (str "Axioms:") axioms; opt_list (str "Opaque constants:") opaque; ] in - prlist_with_sep fnl (pr_opt_no_spc (fun x -> x)) assums + prlist_with_sep fnl (fun x -> x) (Option.List.flatten assums) let cmap_to_list m = Cmap.fold (fun k v acc -> v :: acc) m [] |