diff options
| author | Matej Kosik | 2016-02-15 19:11:42 +0100 |
|---|---|---|
| committer | Matej Kosik | 2016-02-15 19:11:42 +0100 |
| commit | 97d6583a0b9a65080639fb02deba4200f6276ce6 (patch) | |
| tree | 7e3407649be5fc1f9d47c891b0591ffd4e468468 /plugins/derive | |
| parent | 5180ab68819f10949cd41a2458bff877b3ec3204 (diff) | |
| parent | 4f041384cb27f0d24fa14b272884b4b7f69cacbe (diff) | |
merging conflicts with the original "trunk__CLEANUP__Context__2" branch
Diffstat (limited to 'plugins/derive')
| -rw-r--r-- | plugins/derive/derive.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/derive/derive.ml b/plugins/derive/derive.ml index a47dc5b2fa..5d1551106f 100644 --- a/plugins/derive/derive.ml +++ b/plugins/derive/derive.ml @@ -6,6 +6,8 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) +open Context.Named.Declaration + let map_const_entry_body (f:Term.constr->Term.constr) (x:Safe_typing.private_constants Entries.const_entry_body) : Safe_typing.private_constants Entries.const_entry_body = Future.chain ~pure:true x begin fun ((b,ctx),fx) -> @@ -32,7 +34,7 @@ let start_deriving f suchthat lemma = let open Proofview in TCons ( env , sigma , f_type_type , (fun sigma f_type -> TCons ( env , sigma , f_type , (fun sigma ef -> - let env' = Environ.push_named (f , (Some ef) , f_type) env in + let env' = Environ.push_named (LocalDef (f, ef, f_type)) env in let evdref = ref sigma in let suchthat = Constrintern.interp_type_evars env' evdref suchthat in TCons ( env' , !evdref , suchthat , (fun sigma _ -> |