diff options
| author | Pierre-Marie Pédrot | 2016-03-30 11:15:40 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-03-30 11:18:41 +0200 |
| commit | 5b412e9968d93f6f52ed738fd01a74e7021d1dd4 (patch) | |
| tree | 61190a49e43a750a4147b2b748ae78fb0e21374b /toplevel | |
| parent | d670c6b6ceab80f1c3b6b74ffb53579670c0e621 (diff) | |
| parent | dc36fd7fe118136277d8dc525c528fef38b46d70 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/record.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toplevel/record.ml b/toplevel/record.ml index 96cafb0721..93429da5ac 100644 --- a/toplevel/record.ml +++ b/toplevel/record.ml @@ -140,8 +140,8 @@ let typecheck_params_and_fields def id pl t ps nots fs = let _, univ = compute_constructor_level evars env_ar newfs in let ctx, aritysort = Reduction.dest_arity env0 arity in assert(List.is_empty ctx); (* Ensured by above analysis *) - if Sorts.is_prop aritysort || - (Sorts.is_set aritysort && is_impredicative_set env0) then + if not def && (Sorts.is_prop aritysort || + (Sorts.is_set aritysort && is_impredicative_set env0)) then arity, evars else let evars = Evd.set_leq_sort env_ar evars (Type univ) aritysort in @@ -419,9 +419,9 @@ let declare_class finite def poly ctx id idbuild paramimpls params arity match fields with | [LocalAssum (Name proj_name, field) | LocalDef (Name proj_name, _, field)] when def -> let class_body = it_mkLambda_or_LetIn field params in - let _class_type = it_mkProd_or_LetIn arity params in + let class_type = it_mkProd_or_LetIn arity params in let class_entry = - Declare.definition_entry (* ?types:class_type *) ~poly ~univs:ctx class_body in + Declare.definition_entry ~types:class_type ~poly ~univs:ctx class_body in let cst = Declare.declare_constant (snd id) (DefinitionEntry class_entry, IsDefinition Definition) in |