diff options
author | 2017-05-15 11:13:31 +0200 | |
---|---|---|
committer | 2017-05-15 11:36:07 +0200 | |
commit | c98ed6692d16784e531f7eb8dbb1460fa20c7766 (patch) | |
tree | d81b81f1f613692ff4a33a8ad895b834c506bdb9 /toplevel | |
parent | 3b6d89acf4f233d0ed33f89c4e60bcd68e0e2820 (diff) |
Fix #5255: [Context (x : T := y)] should mean [Let x := y].
Diffstat (limited to 'toplevel')
-rw-r--r-- | toplevel/classes.ml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/toplevel/classes.ml b/toplevel/classes.ml index 8142d48d8..d3da263dd 100644 --- a/toplevel/classes.ml +++ b/toplevel/classes.ml @@ -383,7 +383,13 @@ let context poly l = let ctx = Univ.ContextSet.to_context !uctx in (* Declare the universe context once *) let () = uctx := Univ.ContextSet.empty in - let decl = (ParameterEntry (None,poly,(t,ctx),None), IsAssumption Logical) in + let decl = match b with + | None -> + (ParameterEntry (None,poly,(t,ctx),None), IsAssumption Logical) + | Some b -> + let entry = Declare.definition_entry ~poly ~univs:ctx ~types:t b in + (DefinitionEntry entry, IsAssumption Logical) + in let cst = Declare.declare_constant ~internal:Declare.InternalTacticRequest id decl in match class_of_constr t with | Some (rels, ((tc,_), args) as _cl) -> @@ -399,9 +405,17 @@ let context poly l = in let impl = List.exists test impls in let decl = (Discharge, poly, Definitional) in - let nstatus = + let nstatus = match b with + | None -> pi3 (Command.declare_assumption false decl (t, !uctx) [] [] impl Vernacexpr.NoInline (Loc.ghost, id)) + | Some b -> + let ctx = Univ.ContextSet.to_context !uctx in + let decl = (Discharge, poly, Definition) in + let entry = Declare.definition_entry ~poly ~univs:ctx ~types:t b in + let hook = Lemmas.mk_hook (fun _ gr -> gr) in + let _ = Command.declare_definition id decl entry [] [] hook in + Lib.sections_are_opened () || Lib.is_modtype_strict () in let () = uctx := Univ.ContextSet.empty in status && nstatus |