diff options
Diffstat (limited to 'interp')
| -rw-r--r-- | interp/constrintern.ml | 2 | ||||
| -rw-r--r-- | interp/reserve.ml | 4 | ||||
| -rw-r--r-- | interp/reserve.mli | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml index 0964370901..fad3c49105 100644 --- a/interp/constrintern.ml +++ b/interp/constrintern.ml @@ -315,7 +315,7 @@ let check_capture loc ty = function let locate_if_isevar loc na = function | RHole _ -> (try match na with - | Name id -> Reserve.find_reserved_type id + | Name id -> rawconstr_of_aconstr loc (Reserve.find_reserved_type id) | Anonymous -> raise Not_found with Not_found -> RHole (loc, Evd.BinderType na)) | x -> x diff --git a/interp/reserve.ml b/interp/reserve.ml index 3bcd6b1e78..2d36f24099 100644 --- a/interp/reserve.ml +++ b/interp/reserve.ml @@ -15,6 +15,7 @@ open Nameops open Summary open Libobject open Lib +open Topconstr let reserve_table = ref Idmap.empty @@ -81,7 +82,8 @@ let rec unloc = function let anonymize_if_reserved na t = match na with | Name id as na -> (try - if not !Flags.raw_print & unloc t = find_reserved_type id + if not !Flags.raw_print & + aconstr_of_rawconstr [] [] t = find_reserved_type id then RHole (dummy_loc,Evd.BinderType na) else t with Not_found -> t) diff --git a/interp/reserve.mli b/interp/reserve.mli index a72aa8ec90..3bcba719ca 100644 --- a/interp/reserve.mli +++ b/interp/reserve.mli @@ -9,7 +9,8 @@ open Util open Names open Rawterm +open Topconstr -val declare_reserved_type : identifier located -> rawconstr -> unit -val find_reserved_type : identifier -> rawconstr +val declare_reserved_type : identifier located -> aconstr -> unit +val find_reserved_type : identifier -> aconstr val anonymize_if_reserved : name -> rawconstr -> rawconstr |