Merge PR #6837: [located] Push inner locations in reference to a CAst.t node.

2 files changed, 10 insertions, 10 deletions

diff --git a/pretyping/detyping.ml b/pretyping/detyping.ml
index 8fab92779b..587892141c 100644
--- a/pretyping/detyping.ml
+++ b/pretyping/detyping.ml
@@ -71,17 +71,17 @@ let has_two_constructors lc =
 
 let isomorphic_to_tuple lc = Int.equal (Array.length lc) 1
 
-let encode_bool r =
+let encode_bool ({CAst.loc} as r) =
   let (x,lc) = encode_inductive r in
   if not (has_two_constructors lc) then
-    user_err ?loc:(loc_of_reference r) ~hdr:"encode_if"
+    user_err ?loc ~hdr:"encode_if"
       (str "This type has not exactly two constructors.");
   x
 
-let encode_tuple r =
+let encode_tuple ({CAst.loc} as r) =
   let (x,lc) = encode_inductive r in
   if not (isomorphic_to_tuple lc) then
-    user_err ?loc:(loc_of_reference r) ~hdr:"encode_tuple"
+    user_err ?loc ~hdr:"encode_tuple"
       (str "This type cannot be seen as a tuple type.");
   x
 
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml
index 4bcb7e459e..4962b89a09 100644
--- a/pretyping/pretyping.ml
+++ b/pretyping/pretyping.ml
@@ -180,20 +180,20 @@ let _ =
 (** Miscellaneous interpretation functions *)
 
 let interp_known_universe_level evd r =
-  let loc, qid = Libnames.qualid_of_reference r in
+  let qid = Libnames.qualid_of_reference r in
   try
-    match r with
-    | Libnames.Ident (loc, id) -> Evd.universe_of_name evd id
+    match r.CAst.v with
+    | Libnames.Ident id -> Evd.universe_of_name evd id
     | Libnames.Qualid _ -> raise Not_found
   with Not_found ->
-    let univ, k = Nametab.locate_universe qid in
+    let univ, k = Nametab.locate_universe qid.CAst.v in
     Univ.Level.make univ k
 
 let interp_universe_level_name ~anon_rigidity evd r =
   try evd, interp_known_universe_level evd r
   with Not_found ->
     match r with (* Qualified generated name *)
-    | Libnames.Qualid (loc, qid) ->
+    | {CAst.loc; v=Libnames.Qualid qid} ->
        let dp, i = Libnames.repr_qualid qid in
        let num =
          try int_of_string (Id.to_string i)
@@ -206,7 +206,7 @@ let interp_universe_level_name ~anon_rigidity evd r =
          try Evd.add_global_univ evd level
          with UGraph.AlreadyDeclared -> evd
        in evd, level
-    | Libnames.Ident (loc, id) -> (* Undeclared *)
+    | {CAst.loc; v=Libnames.Ident id} -> (* Undeclared *)
         if not (is_strict_universe_declarations ()) then
           new_univ_level_variable ?loc ~name:id univ_rigid evd
         else user_err ?loc ~hdr:"interp_universe_level_name"