refactoring completed

diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/tc_lfxs.ma b/matita/matita/contribs/lambdadelta/basic_2/i_static/tc_lfxs.ma
index 54fdb711989e12710b7e6042e115b870d5165e65..b8976cbd9d46eded64124ba74a948acfb61244db 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/i_static/tc_lfxs.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/i_static/tc_lfxs.ma
@@ -12,6 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "ground_2/lib/star.ma".
 include "basic_2/notation/relations/relationstarstar_4.ma".
 include "basic_2/static/lfxs.ma".
 

diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lstar.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lstar.ma
index b3785339f6e3f2f6b2822d23ab2835927d58c424..1c109075a7b2988822739f8da205f604d2d43023 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lstar.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lstar.ma
@@ -12,6 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "ground_2/lib/star.ma".
 include "ground_2/lib/lstar.ma".
 include "basic_2/relocation/lreq_lreq.ma".
 

diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs.ma
index e13e044c327802523e73aa6282839a040cd6a4cc..f1bb3e025a3b26707f53f040b8394ea8a2952244 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs.ma
@@ -12,6 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "ground_2/lib/star.ma".
 include "basic_2/notation/relations/predtystar_5.ma".
 include "basic_2/rt_transition/cpx.ma".
 

diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma b/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma
index 808164b69c8f9c445634073b1ffa285fd3f0cdb4..e7ce5449c2aa6a4b0cf8af6db67da9ba99881369 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma
@@ -12,6 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "ground_2/lib/star.ma".
 include "basic_2/notation/relations/suptermplus_6.ma".
 include "basic_2/s_transition/fqu.ma".
 

diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma b/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma
index 8f37fd071142597a3d1621b92c14507ab7d757ed..3fa8e4a65f4b0933d41f723c14298d70b63b504c 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma
@@ -12,6 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "ground_2/lib/star.ma".
 include "basic_2/notation/relations/suptermstar_6.ma".
 include "basic_2/s_transition/fquq.ma".
 

diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/relations.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/relations.ma
index 3f5c3b409f4b4babdf50a69f9fe3fe98fd8312a1..e62b1fcda1ce190f22d436cdfe068d65a72cde32 100644 (file)
--- a/matita/matita/contribs/lambdadelta/ground_2/lib/relations.ma
+++ b/matita/matita/contribs/lambdadelta/ground_2/lib/relations.ma
@@ -94,3 +94,12 @@ lemma NF_to_SN_sn: ∀A,R,S,a. NF_sn A R S a → SN_sn A R S a.
 @SN_sn_intro #a1 #HRa12 #HSa12
 elim HSa12 -HSa12 /2 width=1 by/
 qed.
+
+(* Relations on unboxed triples *********************************************)
+
+definition tri_RC: ∀A,B,C. tri_relation A B C → tri_relation A B C ≝
+                   λA,B,C,R,a1,b1,c1,a2,b2,c2. R … a1 b1 c1 a2 b2 c2 ∨
+                   ∧∧ a1 = a2 & b1 = b2 & c1 = c2.
+
+lemma tri_RC_reflexive: ∀A,B,C,R. tri_reflexive A B C (tri_RC … R).
+/3 width=1 by and3_intro, or_intror/ qed.

diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/star.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/star.ma
index fdf2ae5a4e648bfcac7fe3ba5a3c6ad37889587f..cc8a4318c61628d6882fa9b8ea3ebd1edfff4f4f 100644 (file)
--- a/matita/matita/contribs/lambdadelta/ground_2/lib/star.ma
+++ b/matita/matita/contribs/lambdadelta/ground_2/lib/star.ma
@@ -192,13 +192,6 @@ qed-.
 
 (* Relations on unboxed triples *********************************************)
 
-definition tri_RC: ∀A,B,C. tri_relation A B C → tri_relation A B C ≝
-                   λA,B,C,R,a1,b1,c1,a2,b2,c2. R … a1 b1 c1 a2 b2 c2 ∨
-                   ∧∧ a1 = a2 & b1 = b2 & c1 = c2.
-
-lemma tri_RC_reflexive: ∀A,B,C,R. tri_reflexive A B C (tri_RC … R).
-/3 width=1 by and3_intro, or_intror/ qed.
-
 definition tri_star: ∀A,B,C,R. tri_relation A B C ≝
                      λA,B,C,R. tri_RC A B C (tri_TC … R).