diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-10-20 11:05:25 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-10-20 11:05:25 +0200 |
| commit | 7e5a0e348e9686b7d75285f1ae71406a82a19170 (patch) | |
| tree | 2e54113fbfeb2c70860e78e5f3e503f41bc7c804 /interp | |
| parent | 8492fa8d2aa0e77b7c571956ee21097977b1df15 (diff) | |
| parent | 26f216653aed171a70513d3f5ece059ab30bcd73 (diff) | |
Merge PR #1120: Fixing BZ#5762 (supporting implicit arguments in "where" clause of an inductive definitions
Diffstat (limited to 'interp')
| -rw-r--r-- | interp/constrintern.ml | 4 | ||||
| -rw-r--r-- | interp/constrintern.mli | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml index 1cea307d7..a0a749bfb 100644 --- a/interp/constrintern.ml +++ b/interp/constrintern.ml @@ -2132,8 +2132,7 @@ let intern_constr_pattern env ?(as_type=false) ?(ltacvars=empty_ltac_sign) c = ~pattern_mode:true ~ltacvars env c in pattern_of_glob_constr c -let interp_notation_constr ?(impls=empty_internalization_env) nenv a = - let env = Global.env () in +let interp_notation_constr env ?(impls=empty_internalization_env) nenv a = (* [vl] is intended to remember the scope of the free variables of [a] *) let vl = Id.Map.map (fun typ -> (ref true, ref None, typ)) nenv.ninterp_var_type in let c = internalize (Global.env()) {ids = extract_ids env; unb = false; @@ -2212,4 +2211,3 @@ let interp_context_evars ?(global_level=false) ?(impl_env=empty_internalization_ let int_env,bl = intern_context global_level env impl_env params in let x = interp_glob_context_evars env evdref shift bl in int_env, x - diff --git a/interp/constrintern.mli b/interp/constrintern.mli index 0a4eaf838..75e99dd9b 100644 --- a/interp/constrintern.mli +++ b/interp/constrintern.mli @@ -182,7 +182,7 @@ val global_reference_in_absolute_module : DirPath.t -> Id.t -> Globnames.global_ (** Interprets a term as the left-hand side of a notation. The returned map is guaranteed to have the same domain as the input one. *) -val interp_notation_constr : ?impls:internalization_env -> +val interp_notation_constr : env -> ?impls:internalization_env -> notation_interp_env -> constr_expr -> (bool * subscopes * notation_var_internalization_type) Id.Map.t * notation_constr * reversibility_flag |