refactoring ...

[helm.git] / matita / matita / contribs / lambda-delta / Basic-2 / notation.ma

diff --git a/matita/matita/contribs/lambda-delta/Basic-2/notation.ma b/matita/matita/contribs/lambda-delta/Basic-2/notation.ma
index d4dd5a5de69b5e24dfddf9e47fe6a5ffe6bfe1be..a84fa8ff8cc25dd3138aa0e1eb1ecfe468a9f9fb 100644 (file)
--- a/matita/matita/contribs/lambda-delta/Basic-2/notation.ma
+++ b/matita/matita/contribs/lambda-delta/Basic-2/notation.ma
@@ -24,27 +24,35 @@ notation "hvbox( ⋆ term 90 k )"
  non associative with precedence 90
  for @{ 'Star $k }.
 
-notation "hvbox( 𝕚 { I } break (term 90 T1) . break (term 90 T) )"
+notation "hvbox( # term 90 k )"
+ non associative with precedence 90
+ for @{ 'LRef $k }.
+
+notation "hvbox( 𝕒 { I } )"
+ non associative with precedence 90
+ for @{ 'SItem $I }.
+
+notation "hvbox( 𝕔 { I } break term 90 T1 . break term 90 T )"
  non associative with precedence 90
  for @{ 'SItem $I $T1 $T }.
 
-notation "hvbox( 𝕓 { I } break (term 90 T1) . break (term 90 T) )"
+notation "hvbox( 𝕓 { I } break term 90 T1 . break term 90 T )"
  non associative with precedence 90
  for @{ 'SBind $I $T1 $T }.
 
-notation "hvbox( 𝕗 { I } break (term 90 T1) . break (term 90 T) )"
+notation "hvbox( 𝕗 { I } break term 90 T1 . break term 90 T )"
  non associative with precedence 90
  for @{ 'SFlat $I $T1 $T }.
 
-notation "hvbox( T . break 𝕓 { I } break (term 90 T1) )"
+notation "hvbox( T . break 𝕓 { I } break term 90 T1 )"
  non associative with precedence 89
  for @{ 'DBind $T $I $T1 }.
 (*
-notation "hvbox( |  L  | )"
- non associative with precedence 70
- for @{ 'Length $L }.
-*)
-notation "hvbox( # term 90 x )"
+notation > "hvbox( T . break 𝕔 { I } break term 90 T1 )"
+ non associative with precedence 89
+ for @{ 'DBind $T $I $T1 }.
+*) (**) (* this breaks all parsing *)
+notation "hvbox( # [ x ] )"
  non associative with precedence 90
  for @{ 'Weight $x }.
 
@@ -52,34 +60,66 @@ notation "hvbox( # [ x , break y ] )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
-(* Substitution *************************************************************)
+notation "hvbox( 𝕊 [ T ] )"
+   non associative with precedence 45
+   for @{ 'Simple $T }.
 
 notation "hvbox( T1 break [ d , break e ] ≈ break T2 )"
    non associative with precedence 45
    for @{ 'Eq $T1 $d $e $T2 }.
 
+(* Substitution *************************************************************)
+
 notation "hvbox( ↑ [ d , break e ] break T1 ≡ break T2 )"
    non associative with precedence 45
-   for @{ 'RLift $T1 $d $e $T2 }.
+   for @{ 'RLift $d $e $T1 $T2 }.
 
 notation "hvbox( ↓ [ d , break e ] break L1 ≡ break L2 )"
    non associative with precedence 45
-   for @{ 'RDrop $L1 $d $e $L2 }.
+   for @{ 'RDrop $d $e $L1 $L2 }.
+
+notation "hvbox( T1 break [ d , break e ] ≫ break T2 )"
+   non associative with precedence 45
+   for @{ 'PSubst $T1 $d $e $T2 }.
 
 notation "hvbox( L ⊢ break term 90 T1 break [ d , break e ] ≫ break T2 )"
    non associative with precedence 45
    for @{ 'PSubst $L $T1 $d $e $T2 }.
 
+(* Unfold *******************************************************************)
+
+notation "hvbox( T1 break [ d , break e ] ≫* break T2 )"
+   non associative with precedence 45
+   for @{ 'PSubstStar $T1 $d $e $T2 }.
+
+notation "hvbox( L ⊢ break term 90 T1 break [ d , break e ] ≫* break T2 )"
+   non associative with precedence 45
+   for @{ 'PSubstStar $L $T1 $d $e $T2 }.
+
 (* Reduction ****************************************************************)
 
 notation "hvbox( T1 ⇒ break T2 )"
    non associative with precedence 45
    for @{ 'PRed $T1 $T2 }.
 
-notation "hvbox( L ⊢ break (term 90 T1) ⇒ break T2 )"
+notation "hvbox( L ⊢ break term 90 T1 ⇒ break T2 )"
    non associative with precedence 45
    for @{ 'PRed $L $T1 $T2 }.
 
 notation "hvbox( L1 ⊢ ⇒ break L2 )"
    non associative with precedence 45
    for @{ 'CPRed $L1 $L2 }.
+
+(* Computation **************************************************************)
+
+notation "hvbox( T1 ⇒* break T2 )"
+   non associative with precedence 45
+   for @{ 'PRedStar $T1 $T2 }.
+
+notation "hvbox( L ⊢ break term 90 T1 ⇒* break T2 )"
+   non associative with precedence 45
+   for @{ 'PRedStar $L $T1 $T2 }.
+
+notation "hvbox( L1 ⊢ ⇒* break L2 )"
+   non associative with precedence 45
+   for @{ 'CPRedStar $L1 $L2 }.