some refactoring

[helm.git] / matita / matita / lib / lambda-delta / notation.ma

diff --git a/matita/matita/lib/lambda-delta/notation.ma b/matita/matita/lib/lambda-delta/notation.ma
index 368053f5c7d36ec92472a345cfb4658fd1cf9147..375d06abc776e6af2eb9c444c7619bbd50053caf 100644 (file)
--- a/matita/matita/lib/lambda-delta/notation.ma
+++ b/matita/matita/lib/lambda-delta/notation.ma
@@ -11,24 +11,36 @@
 
 (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************)
 
-(* language *****************************************************************)
+(* Syntax *******************************************************************)
 
 notation "hvbox( ⋆ )"
  non associative with precedence 90
  for @{ 'Star }.
 
-notation "hvbox( ⋆ k )"
+notation "hvbox( ⋆ term 90 k )"
  non associative with precedence 90
  for @{ 'Star $k }.
 
-notation "hvbox( ♭ (term 90 I) break (term 90 T1) . break T )"
+notation "hvbox( 𝕚 { I } break (term 90 T1) . break (term 90 T) )"
  non associative with precedence 90
- for @{ 'SCon $I $T1 $T }.
+ for @{ 'SItem $I $T1 $T }.
 
-notation "hvbox( T . break ♭ (term 90 I) break (term 90 T1) )"
- non associative with precedence 89
- for @{ 'DCon $T $I $T1 }.
+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) )"
+ non associative with precedence 90
+ for @{ 'SFlat $I $T1 $T }.
+
+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 )"
  non associative with precedence 90
  for @{ 'Weight $x }.
@@ -37,7 +49,11 @@ notation "hvbox( # [ x , break y ] )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
-(* substitution *************************************************************)
+(* Substitution *************************************************************)
+
+notation "hvbox( T1 break [ d , break e ] ≈ break T2 )"
+   non associative with precedence 45
+   for @{ 'Eq $T1 $d $e $T2 }.
 
 notation "hvbox( ↑ [ d , break e ] break T1 ≡ break T2 )"
    non associative with precedence 45
@@ -45,14 +61,18 @@ notation "hvbox( ↑ [ d , break e ] break T1 ≡ break T2 )"
 
 notation "hvbox( ↓ [ d , break e ] break L1 ≡ break L2 )"
    non associative with precedence 45
-   for @{ 'RSubst $L1 $d $e $L2 }.
+   for @{ 'RDrop $L1 $d $e $L2 }.
 
-notation "hvbox( L ⊢ break ↓ [ d , break e ] break T1 ≡ break T2 )"
+notation "hvbox( L ⊢ break term 90 T1 break [ d , break e ] ≫ break T2 )"
    non associative with precedence 45
-   for @{ 'RSubst $L $T1 $d $e $T2 }.
+   for @{ 'PSubst $L $T1 $d $e $T2 }.
 
-(* reduction ****************************************************************)
+(* Reduction ****************************************************************)
+
+notation "hvbox( T1 ⇒ break T2 )"
+   non associative with precedence 45
+   for @{ 'PRed $T1 $T2 }.
 
-notation "hvbox( L ⊢ break T1 ⇒ break T2 )"
+notation "hvbox( L ⊢ break (term 90 T1) ⇒ break T2 )"
    non associative with precedence 45
-   for @{ 'PR $L $T1 $T2 }.
+   for @{ 'PRed $L $T1 $T2 }.