aboutsummaryrefslogtreecommitdiff
path: root/toplevel
diff options
context:
space:
mode:
authormsozeau2011-10-07 13:57:13 +0000
committermsozeau2011-10-07 13:57:13 +0000
commit1f84b509851f3eead190eac2300ee77611ed9ff4 (patch)
tree8b64f8de1bd1b12aeb91c88fc4e14fb4f5799efe /toplevel
parent8ab1c0c6d12c22e25d3ec309610106d2bfdb7ff4 (diff)
Fix bug #2557 and an issue with Propers for complement
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14523 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/autoinstance.ml2
-rw-r--r--toplevel/classes.ml2
2 files changed, 2 insertions, 2 deletions
diff --git a/toplevel/autoinstance.ml b/toplevel/autoinstance.ml
index d6e88ed2c5..34ecab2d5e 100644
--- a/toplevel/autoinstance.ml
+++ b/toplevel/autoinstance.ml
@@ -190,7 +190,7 @@ let declare_class_instance gr ctx params =
let ident = make_instance_ident gr in
let cl = Typeclasses.class_info gr in
let (def,typ) = Typeclasses.instance_constructor cl params in
- let (def,typ) = it_mkLambda_or_LetIn def ctx, it_mkProd_or_LetIn typ ctx in
+ let (def,typ) = it_mkLambda_or_LetIn (Option.get def) ctx, it_mkProd_or_LetIn typ ctx in
let def = deep_refresh_universes def in
let typ = deep_refresh_universes typ in
let ce = Entries.DefinitionEntry
diff --git a/toplevel/classes.ml b/toplevel/classes.ml
index 46dea6dc0f..55c68d3cef 100644
--- a/toplevel/classes.ml
+++ b/toplevel/classes.ml
@@ -243,7 +243,7 @@ let new_instance ?(abstract=false) ?(global=false) ctx (instid, bk, cl) props
in
let app, ty_constr = instance_constructor k subst in
let termtype = it_mkProd_or_LetIn ty_constr (ctx' @ ctx) in
- let term = Termops.it_mkLambda_or_LetIn app (ctx' @ ctx) in
+ let term = Termops.it_mkLambda_or_LetIn (Option.get app) (ctx' @ ctx) in
Some term, termtype
| Some (Inr (def, subst)) ->
let termtype = it_mkProd_or_LetIn cty ctx in