- lambdadelta: third recursive part of preservation finally proved!

[helm.git] / matita / matita / contribs / lambdadelta / basic_2 / notation.ma

diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation.ma b/matita/matita/contribs/lambdadelta/basic_2/notation.ma
index 3ff8f21e555ec1a47cc980c76bf5585c50911562..c17f8bc2db6f69c7538d9d146db6d4e3ed289d91 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/notation.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/notation.ma
@@ -17,27 +17,27 @@
 (* Grammar ******************************************************************)
 
 notation "⓪"
- non associative with precedence 90
+ non associative with precedence 55
  for @{ 'Item0 }.
 
 notation "hvbox( ⓪ { term 46 I } )"
- non associative with precedence 90
+ non associative with precedence 55
  for @{ 'Item0 $I }.
 
 notation "⋆"
- non associative with precedence 90
+ non associative with precedence 46
  for @{ 'Star }.
 
 notation "hvbox( ⋆ term 90 k )"
- non associative with precedence 90
+ non associative with precedence 55
  for @{ 'Star $k }.
 
 notation "hvbox( # term 90 i )"
- non associative with precedence 90
+ non associative with precedence 55
  for @{ 'LRef $i }.
 
 notation "hvbox( § term 90 p )"
- non associative with precedence 90
+ non associative with precedence 55
  for @{ 'GRef $p }.
 
 notation "hvbox( ② term 55 T1 . break term 55 T )"
@@ -120,11 +120,11 @@ notation "hvbox( T . break ④ { term 46 I } break { term 46 T1 , break term 46
  non associative with precedence 50
  for @{ 'DxItem4 $T $I $T1 $T2 $T3 }.
 
-notation "hvbox( # { term 46 x } )"
+notation "hvbox( ♯ { term 46 x } )"
  non associative with precedence 90
  for @{ 'Weight $x }.
 
-notation "hvbox( # { term 46 x , break term 46 y } )"
+notation "hvbox( ♯ { term 46 x , break term 46 y } )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
@@ -264,6 +264,10 @@ notation "hvbox( h ⊢ break term 46 L1 • ⊑ [ term 46 g ] break term 46 L2 )
 
 (* Unwind *******************************************************************)
 
+notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ break term 46 T1 •* break [ term 46 g ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'StaticTypeStar $h $g $L $T1 $T2 }.
+
 notation "hvbox( L1 ⊢ ⧫ * break term 46 T ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'Unwind $L1 $T $L2 }.
@@ -336,10 +340,6 @@ notation "hvbox( ⦃ term 46 L1 ⦄ ➡ ➡ break ⦃ term 46 L2 ⦄ )"
    non associative with precedence 45
    for @{ 'FocalizedPRedAlt $L1 $L2 }.
 
-notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ break term 46 T1 • ➡ break [ term 46 g ] break term 46 T2 )"
-   non associative with precedence 45
-   for @{ 'XPRed $h $g $L $T1 $T2 }.
-
 (* Computation **************************************************************)
 
 notation "hvbox( T1 ➡ * break term 46 T2 )"
@@ -370,7 +370,7 @@ notation "hvbox( ⦃ term 46 L1 , term 46 T1 ⦄ ➡ ➡ * break ⦃ term 46 L2
    non associative with precedence 45
    for @{ 'FocalizedPRedStarAlt $L1 $T1 $L2 $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 ➡ * break 𝐍 ⦃ Tterm 46 2 ⦄ )"
+notation "hvbox( L ⊢ break term 46 T1 ➡ * break 𝐍 ⦃ term 46 T2 ⦄ )"
    non associative with precedence 45
    for @{ 'PEval $L $T1 $T2 }.
 
@@ -394,13 +394,13 @@ notation "hvbox( T1 ⊑ break [ term 46 R ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'CrSubEq $T1 $R $T2 }.
 
-notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ break term 46 T1 • ➡ * break [ term 46 g ] break term 46 T2 )"
+notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ break term 46 T1 • * ➡ * break [ term 46 g ] break term 46 T2 )"
    non associative with precedence 45
-   for @{ 'XPRedStar $h $g $L $T1 $T2 }.
+   for @{ 'DecomposedXPRedStar $h $g $L $T1 $T2 }.
 
-notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ • ⬊ * break [ term 46 g ] break term 46 T2 )"
+notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ • * ⬊ * break [ term 46 g ] break term 46 T2 )"
    non associative with precedence 45
-   for @{ 'XSN $h $g $L $T }.
+   for @{ 'DecomposedXSN $h $g $L $T }.
 
 (* Conversion ***************************************************************)
 
@@ -460,6 +460,22 @@ notation "hvbox( h ⊢ break term 46 L1 ⊩ : ⊑ [ term 46 g ] break term 46 L2
    non associative with precedence 45
    for @{ 'CrSubEqV $h $g $L1 $L2 }.
 
+notation "hvbox( h ⊢ break ⦃ term 46 L1, break term 46 T1 ⦄ ≽ break [ term 46 g ] break ⦃ term 46 L2 , break term 46 T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'BTPRed $h $g $L1 $T1 $L2 $T2 }.
+
+notation "hvbox( h ⊢ break ⦃ term 46 L1, break term 46 T1 ⦄ ≻ break [ term 46 g ] break ⦃ term 46 L2 , break term 46 T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'BTPRedProper $h $g $L1 $T1 $L2 $T2 }.
+
+notation "hvbox( h ⊢ break ⦃ term 46 L1, break term 46 T1 ⦄  ≥ break [ term 46 g ] break ⦃ term 46 L2 , break term 46 T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'BTPRedStar $h $g $L1 $T1 $L2 $T2 }.
+
+notation "hvbox( h ⊢ break ⦃ term 46 L1, break term 46 T1 ⦄ > break [ term 46 g ] break ⦃ term 46 L2 , break term 46 T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'BTPRedStarProper $h $g $L1 $T1 $L2 $T2 }.
+
 notation "hvbox( ⦃ term 46 h , break term 46 L ⦄ ⊢ break term 46 T1 : break term 46 T2 )"
    non associative with precedence 45
    for @{ 'NativeType $h $L $T1 $T2 }.