diff options
| author | Matthieu Sozeau | 2014-08-28 19:49:16 +0200 |
|---|---|---|
| committer | Matthieu Sozeau | 2014-08-28 19:55:01 +0200 |
| commit | 32c83676c96ae4a218de0bec75d2f3353381dfb3 (patch) | |
| tree | 0fef7e62e0e7271406da9733fd14c33cb711eb70 /kernel/inductive.ml | |
| parent | 469c5bfc849e06d5a32d7aaabdf9b2fa3f451f4a (diff) | |
Change the way primitive projections are declared to the kernel.
Now kernel/indtypes builds the corresponding terms (has to be trusted)
while translate_constant just binds a constant name to the
already entered projection body, avoiding the dubious "check"
of user given terms. "case" Pattern-matching on primitive records is
now disallowed, and the default scheme is implemented using
projections and eta (all elimination tactics now use projections
as well). Elaborate "let (x, y) := p in t" using let bindings
for the projections of p too.
Diffstat (limited to 'kernel/inductive.ml')
| -rw-r--r-- | kernel/inductive.ml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/inductive.ml b/kernel/inductive.ml index 6ddddeb05d..189c2f4d2d 100644 --- a/kernel/inductive.ml +++ b/kernel/inductive.ml @@ -294,6 +294,12 @@ let get_instantiated_arity (ind,u) (mib,mip) params = let elim_sorts (_,mip) = mip.mind_kelim +let is_private (mib,_) = mib.mind_private = Some true +let is_primitive_record (mib,_) = + match mib.mind_record with + | Some (projs, _) when Array.length projs > 0 -> true + | _ -> false + let extended_rel_list n hyps = let rec reln l p = function | (_,None,_) :: hyps -> reln (mkRel (n+p) :: l) (p+1) hyps @@ -391,12 +397,13 @@ let type_case_branches env (pind,largs) pj c = (* Checking the case annotation is relevent *) let check_case_info env (indsp,u) ci = - let (mib,mip) = lookup_mind_specif env indsp in + let (mib,mip as spec) = lookup_mind_specif env indsp in if not (eq_ind indsp ci.ci_ind) || not (Int.equal mib.mind_nparams ci.ci_npar) || not (Array.equal Int.equal mip.mind_consnrealdecls ci.ci_cstr_ndecls) || - not (Array.equal Int.equal mip.mind_consnrealargs ci.ci_cstr_nargs) + not (Array.equal Int.equal mip.mind_consnrealargs ci.ci_cstr_nargs) || + is_primitive_record spec then raise (TypeError(env,WrongCaseInfo((indsp,u),ci))) (************************************************************************) |
