- degree-based equivalene for terms

[helm.git] / matita / matita / contribs / lambdadelta / basic_2 / relocation / lexs.ma

diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma
index 3a779a649182b05ca4917e1aa643e21f6ec2c6c4..e99ea0393c3c992e54cf8c82c91ddeec2c4869ab 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma
@@ -14,7 +14,7 @@
 
 include "ground_2/relocation/rtmap_sle.ma".
 include "basic_2/notation/relations/relationstar_5.ma".
-include "basic_2/grammar/lenv.ma".
+include "basic_2/syntax/lenv.ma".
 
 (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****)
 
@@ -32,12 +32,14 @@ inductive lexs (RN,RP:relation3 lenv term term): rtmap → relation lenv ≝
 interpretation "generic entrywise extension (local environment)"
    'RelationStar RN RP f L1 L2 = (lexs RN RP f L1 L2).
 
-definition lexs_confluent: relation6 (relation3 lenv term term)
-                                     (relation3 lenv term term) … ≝
-                           λR1,R2,RN1,RP1,RN2,RP2.
-                           ∀f,L0,T0,T1. R1 L0 T0 T1 → ∀T2. R2 L0 T0 T2 →
-                           ∀L1. L0 ⦻*[RN1, RP1, f] L1 → ∀L2. L0 ⦻*[RN2, RP2, f] L2 →
-                           ∃∃T. R2 L1 T1 T & R1 L2 T2 T.
+definition R_pw_confluent2_lexs: relation3 lenv term term → relation3 lenv term term →
+                                 relation3 lenv term term → relation3 lenv term term →
+                                 relation3 lenv term term → relation3 lenv term term →
+                                 relation3 rtmap lenv term ≝
+                                 λR1,R2,RN1,RP1,RN2,RP2,f,L0,T0.
+                                 ∀T1. R1 L0 T0 T1 → ∀T2. R2 L0 T0 T2 →
+                                 ∀L1. L0 ⦻*[RN1, RP1, f] L1 → ∀L2. L0 ⦻*[RN2, RP2, f] L2 →
+                                 ∃∃T. R2 L1 T1 T & R1 L2 T2 T.
 
 definition lexs_transitive: relation5 (relation3 lenv term term)
                                       (relation3 lenv term term) … ≝