diff options
author | 2000-11-28 16:32:08 +0000 | |
---|---|---|
committer | 2000-11-28 16:32:08 +0000 | |
commit | 7da58295173715d6de518516e2653dac90dd2d5c (patch) | |
tree | 2cba748ef7c3c437fb527fe15214d02b2f546e14 /kernel/univ.ml | |
parent | 14b236a0bcc5071c5048d87768437df0b30e387a (diff) |
Prise en compte du repertoire dans le section path; utilisation de dirpath pour les noms de modules
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1005 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel/univ.ml')
-rw-r--r-- | kernel/univ.ml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/univ.ml b/kernel/univ.ml index 76fc0b12a..4ea2ded00 100644 --- a/kernel/univ.ml +++ b/kernel/univ.ml @@ -16,7 +16,7 @@ open Pp open Util -type universe = { u_mod : string; u_num : int } +type universe = { u_mod : Names.dir_path; u_num : int } let universe_ord x y = let c = x.u_num - y.u_num in @@ -27,12 +27,13 @@ module UniverseOrdered = struct let compare = universe_ord end -let pr_uni u = [< 'sTR u.u_mod ; 'sTR"." ; 'iNT u.u_num >] +let pr_uni u = + [< 'sTR (Names.string_of_dirpath u.u_mod) ; 'sTR"." ; 'iNT u.u_num >] -let dummy_univ = { u_mod = "dummy univ"; u_num = 0 } (* for prover terms *) -let implicit_univ = { u_mod = "implicit univ"; u_num = 0 } +let dummy_univ = { u_mod = ["dummy univ"]; u_num = 0 } (* for prover terms *) +let implicit_univ = { u_mod = ["implicit univ"]; u_num = 0 } -let current_module = ref "" +let current_module = ref [] let set_module m = current_module := m @@ -68,7 +69,7 @@ let declare_univ u g = (* The universes of Prop and Set: Type_0, Type_1 and Type_2, and the resulting graph. *) let (initial_universes,prop_univ,prop_univ_univ,prop_univ_univ_univ) = - let prop_sp = "prop_univ" in + let prop_sp = ["prop_univ"] in let u = { u_mod = prop_sp; u_num = 0 } in let su = { u_mod = prop_sp; u_num = 1 } in let ssu = { u_mod = prop_sp; u_num = 2 } in |