aboutsummaryrefslogtreecommitdiff
path: root/pretyping
diff options
context:
space:
mode:
authorppedrot2012-12-18 17:09:31 +0000
committerppedrot2012-12-18 17:09:31 +0000
commitaa37087b8e7151ea96321a11012c1064210ef4ea (patch)
treefff9ed837668746545832e3bd9f0a6dd99936ee4 /pretyping
parentf61e682857596f0274b956295efd2bfba63bc8c0 (diff)
Modulification of Label
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16097 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
-rw-r--r--pretyping/indrec.ml2
-rw-r--r--pretyping/namegen.ml2
-rw-r--r--pretyping/tacred.ml4
3 files changed, 4 insertions, 4 deletions
diff --git a/pretyping/indrec.ml b/pretyping/indrec.ml
index e42013b33e..b01a463a17 100644
--- a/pretyping/indrec.ml
+++ b/pretyping/indrec.ml
@@ -559,7 +559,7 @@ let lookup_eliminator ind_sp s =
(* Try first to get an eliminator defined in the same section as the *)
(* inductive type *)
try
- let cst =Global.constant_of_delta_kn (make_kn mp dp (label_of_id id)) in
+ let cst =Global.constant_of_delta_kn (make_kn mp dp (Label.of_id id)) in
let _ = Global.lookup_constant cst in
mkConst cst
with Not_found ->
diff --git a/pretyping/namegen.ml b/pretyping/namegen.ml
index a7b49fbe2f..cbfd78deb4 100644
--- a/pretyping/namegen.ml
+++ b/pretyping/namegen.ml
@@ -77,7 +77,7 @@ let hdchar env c =
| LetIn (_,_,_,c) -> hdrec (k+1) c
| Cast (c,_,_) -> hdrec k c
| App (f,l) -> hdrec k f
- | Const kn -> lowercase_first_char (id_of_label (con_label kn))
+ | Const kn -> lowercase_first_char (Label.to_id (con_label kn))
| Ind x -> lowercase_first_char (basename_of_global (IndRef x))
| Construct x -> lowercase_first_char (basename_of_global (ConstructRef x))
| Var id -> lowercase_first_char id
diff --git a/pretyping/tacred.ml b/pretyping/tacred.ml
index 1a4bd3877b..78b01a42ab 100644
--- a/pretyping/tacred.ml
+++ b/pretyping/tacred.ml
@@ -227,7 +227,7 @@ let invert_name labs l na0 env sigma ref = function
| EvalRel _ | EvalEvar _ -> None
| EvalVar id' -> Some (EvalVar id)
| EvalConst kn ->
- Some (EvalConst (con_with_label kn (label_of_id id))) in
+ Some (EvalConst (con_with_label kn (Label.of_id id))) in
match refi with
| None -> None
| Some ref ->
@@ -502,7 +502,7 @@ let reduce_mind_case_use_function func env sigma mia =
mutual inductive, try to reuse the global name if
the block was indeed initially built as a global
definition *)
- let kn = con_with_label (destConst func) (label_of_id id)
+ let kn = con_with_label (destConst func) (Label.of_id id)
in
try match constant_opt_value env kn with
| None -> None