From e7c9f5f130f5187e5d9b43c8f0ed15deb49e4b2c Mon Sep 17 00:00:00 2001
From: pboutill
Date: Tue, 18 May 2010 15:57:18 +0000
Subject: Applicative commutative cuts in Fixpoint guard condition

In "(match ... with |... -> fun x -> t end) u", "x" has now the subterm
property of "u" in the analysis of "t".

Commutative cuts aren't compatible with typing so we need to ensure that
term of "x"'s type and term of "u"'s have the same subterm_spec.
Consequently,declaration.MRec argument has changed to the inductive name
instead of only the number of the inductive in the mutual_inductive
family.

In subterm_specif and check_rec_call, arguments are stored in a stack.
At each lambda, one element is popped to add in renv a smarter
subterm_spec for the variable. subterm_spec of constructor's argument
was added this way, the job is now done more often.

Some eta contracted match branches are now accepted but enforcing
eta-expansion of branches might be anyway a recommended invariant.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13012 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 kernel/safe_typing.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kernel/safe_typing.ml')

diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml
index 6a18f72d5c..7e910c3602 100644
--- a/kernel/safe_typing.ml
+++ b/kernel/safe_typing.ml
@@ -294,9 +294,9 @@ let add_mind dir l mie senv =
   check_label l senv.labset;
     (* TODO: when we will allow reorderings we will have to verify
        all labels *)
-  let mib = translate_mind senv.env mie in
-  let senv' = add_constraints mib.mind_constraints senv in
   let kn = make_mind senv.modinfo.modpath dir l in
+  let mib = translate_mind senv.env kn mie in
+  let senv' = add_constraints mib.mind_constraints senv in
   let env'' = Environ.add_mind kn mib senv'.env in
   kn, { old = senv'.old;
 	env = env'';
-- 
cgit v1.2.3