aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar coq <coq@85f007b7-540e-0410-9357-904b9bb8a0f7>2003-01-27 18:13:32 +0000
committerGravatar coq <coq@85f007b7-540e-0410-9357-904b9bb8a0f7>2003-01-27 18:13:32 +0000
commit5816479511c4702d9e7159a9045718565bb62545 (patch)
tree60354d6ec809baf5c1c1bd52f61427da5b7ab786
parent1c33be3447e435b8bbe561f3bb5766ab25f153c9 (diff)
Deux p\'tits trucs ;)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3614 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--library/declaremods.ml4
-rw-r--r--parsing/prettyp.ml4
2 files changed, 5 insertions, 3 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml
index 58e672433..814d408bf 100644
--- a/library/declaremods.ml
+++ b/library/declaremods.ml
@@ -517,6 +517,8 @@ let end_module id =
Not_found -> anomaly "Module objects not found..."
in
+ (* must be called after get_modtype_substobjs, because of possible
+ dependencies on functor arguments *)
Summary.unfreeze_other_summaries fs;
let substituted = subst_substobjs dir mp substobjs in
@@ -575,7 +577,7 @@ let register_library dir cenv objs digest =
Hashtbl.add library_cache dir modobjs;
modobjs
in
- do_module false "register_compilation" load_objects 1 dir mp substobjs objects
+ do_module false "register_library" load_objects 1 dir mp substobjs objects
let start_library dir =
diff --git a/parsing/prettyp.ml b/parsing/prettyp.ml
index 0587bd921..fd728111d 100644
--- a/parsing/prettyp.ml
+++ b/parsing/prettyp.ml
@@ -296,9 +296,9 @@ let print_constant with_values sep sp =
let print_inductive sp = (print_mutual sp)
let print_syntactic_def sep kn =
- let l = label kn in
+ let qid = Nametab.shortest_qualid_of_syndef kn in
let c = Syntax_def.search_syntactic_definition dummy_loc kn in
- (str" Syntactic Definition " ++ pr_lab l ++ str sep ++
+ (str" Syntactic Definition " ++ pr_qualid qid ++ str sep ++
Constrextern.without_symbols pr_rawterm c ++ fnl ())
(*let print_module with_values kn =