X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambda_delta%2Fbasic_2%2Fnotation.ma;h=eb3d61cac70b5bb21b87471c5141c32f6ff9a99e;hb=cb38da6095e3af84131a3ebf47a9f252f34a804c;hp=a9fca999c050e096e09b2b90f9e619d5dfcc01c0;hpb=eb918fc784eacd2094e3986ba321ef47690d9983;p=helm.git

diff --git a/matita/matita/contribs/lambda_delta/basic_2/notation.ma b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
index a9fca999c..eb3d61cac 100644
--- a/matita/matita/contribs/lambda_delta/basic_2/notation.ma
+++ b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
@@ -16,7 +16,7 @@
 
 (* Grammar ******************************************************************)
 
-notation "hvbox( ⓪ )"
+notation "⓪"
  non associative with precedence 90
  for @{ 'Item0 }.
 
@@ -24,7 +24,7 @@ notation "hvbox( ⓪ { I } )"
  non associative with precedence 90
  for @{ 'Item0 $I }.
 
-notation "hvbox( ⋆ )"
+notation "⋆"
  non associative with precedence 90
  for @{ 'Star }.
 
@@ -40,48 +40,48 @@ notation "hvbox( § term 90 p )"
  non associative with precedence 90
  for @{ 'GRef $p }.
 
-notation "hvbox( ② term 90 T1 . break term 90 T )"
- non associative with precedence 90
+notation "hvbox( ② term 55 T1 . break term 55 T )"
+ non associative with precedence 55
  for @{ 'SnItem2 $T1 $T }.
 
-notation "hvbox( ② { I } break term 90 T1 . break term 90 T )"
- non associative with precedence 90
+notation "hvbox( ② { I } break term 55 T1 . break term 55 T )"
+ non associative with precedence 55
  for @{ 'SnItem2 $I $T1 $T }.
 
-notation "hvbox( ⓑ { I } break term 90 T1 . break term 90 T )"
- non associative with precedence 90
+notation "hvbox( ⓑ { I } break term 55 T1 . break term 55 T )"
+ non associative with precedence 55
  for @{ 'SnBind2 $I $T1 $T }.
 
-notation "hvbox( ⓕ { I } break term 90 T1 . break term 90 T )"
- non associative with precedence 90
+notation "hvbox( ⓕ { I } break term 55 T1 . break term 55 T )"
+ non associative with precedence 55
  for @{ 'SnFlat2 $I $T1 $T }.
 
-notation "hvbox( ⓓ  term 90 T1 . break term 90 T2 )"
- non associative with precedence 90
+notation "hvbox( ⓓ  term 55 T1 . break term 55 T2 )"
+ non associative with precedence 55
  for @{ 'SnAbbr $T1 $T2 }.
 
-notation "hvbox( ⓛ  term 90 T1 . break term 90 T2 )"
- non associative with precedence 90
+notation "hvbox( ⓛ  term 55 T1 . break term 55 T2 )"
+ non associative with precedence 55
  for @{ 'SnAbst $T1 $T2 }.
 
-notation "hvbox( ⓐ  term 90 T1 . break term 90 T2 )"
- non associative with precedence 90
+notation "hvbox( ⓐ  term 55 T1 . break term 55 T2 )"
+ non associative with precedence 55
  for @{ 'SnAppl $T1 $T2 }.
 
-notation "hvbox( ⓣ  term 90 T1 . break term 90 T2 )"
- non associative with precedence 90
+notation "hvbox( ⓝ  term 55 T1 . break term 55 T2 )"
+ non associative with precedence 55
  for @{ 'SnCast $T1 $T2 }.
 
-notation "hvbox( Ⓐ term 90 T1 . break term 90 T )"
- non associative with precedence 90
+notation "hvbox( Ⓐ term 55 T1 . break term 55 T )"
+ non associative with precedence 55
  for @{ 'SnApplV $T1 $T }.
 
 notation > "hvbox( T . break ②{ I } break term 47 T1 )"
  non associative with precedence 46
  for @{ 'DxBind2 $T $I $T1 }.
 
-notation "hvbox( T . break ⓑ { I } break term 90 T1 )"
- non associative with precedence 89
+notation "hvbox( T . break ⓑ { I } break term 48 T1 )"
+ non associative with precedence 47
  for @{ 'DxBind2 $T $I $T1 }.
 
 notation "hvbox( T1 . break ⓓ T2 )"
@@ -93,7 +93,7 @@ notation "hvbox( T1 . break ⓛ T2 )"
  for @{ 'DxAbst $T1 $T2 }.
 
 notation "hvbox( T . break ④ { I } break { T1 , break T2 , break T3 } )"
- non associative with precedence 47
+ non associative with precedence 50
  for @{ 'DxItem4 $T $I $T1 $T2 $T3 }.
 
 notation "hvbox( # [ x ] )"
@@ -104,204 +104,264 @@ notation "hvbox( # [ x , break y ] )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
-notation "hvbox( 𝐒 [ T ] )"
+notation "hvbox( 𝐒  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Simple $T }.
 
-notation "hvbox( L ⊢ break term 90 T1 ≈ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ≈ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'Hom $L $T1 $T2 }.
 
-notation "hvbox( T1 ≃ break T2 )"
+notation "hvbox( T1 ≃ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'Iso $T1 $T2 }.
 
-notation "hvbox( T1 break [ d , break e ] ≼ break T2 )"
-   non associative with precedence 45
-   for @{ 'SubEq $T1 $d $e $T2 }.
-
 (* Substitution *************************************************************)
 
-notation "hvbox( L ⊢ break [ d , break e ] break 𝐑 [ T ] )"
+notation "hvbox( L ⊢ break 𝐑 [ d , break e ] break ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Reducible $L $d $e $T }.
 
-notation "hvbox( L ⊢ break [ d , break e ] break 𝐈 [ T ] )"
+notation "hvbox( L ⊢ break  𝐈 [ d , break e ] break ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotReducible $L $d $e $T }.
 
-notation "hvbox( L ⊢ break [ d , break e ] break 𝐍 [ T ] )"
+notation "hvbox( L ⊢ break 𝐍 [ d , break e ] break ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Normal $L $d $e $T }.
 
-notation "hvbox( ⇧ [ d , break e ] break T1 ≡ break T2 )"
+notation "hvbox( ⇧ [ d , break e ] break term 46 T1 ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RLift $d $e $T1 $T2 }.
 
-notation "hvbox( ⇩ [ e ] break L1 ≡ break L2 )"
+notation "hvbox( T1 break ≼ [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'SubEq $T1 $d $e $T2 }.
+
+notation "hvbox( ≼ [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'SubEqTop $d $e $T2 }.
+
+notation "hvbox( ⇩ [ e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDrop $e $L1 $L2 }.
 
-notation "hvbox( ⇩ [ d , break e ] break L1 ≡ break L2 )"
+notation "hvbox( ⇩ [ d , break e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDrop $d $e $L1 $L2 }.
 
-notation "hvbox( T1 break [ d , break e ] ▶ break T2 )"
+notation "hvbox( L ⊢ break ⌘ ⦃ T ⦄ ≡ break term 46 k )"
    non associative with precedence 45
-   for @{ 'PSubst $T1 $d $e $T2 }.
+   for @{ 'ICM $L $T $k }.
 
-notation "hvbox( L ⊢ break term 90 T1 break [ d , break e ] ▶ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶ [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubst $L $T1 $d $e $T2 }.
 
 (* Unfold *******************************************************************)
 
-notation "hvbox( @ [ T1 ] break f ≡ break T2 )"
+notation "hvbox( @ [ T1 ] break term 46 f ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RAt $T1 $f $T2 }.
 
-notation "hvbox( T1 ▭ break T2 ≡ break T )"
+notation "hvbox( T1 ▭ break term 46 T2 ≡ break term 46 T )"
    non associative with precedence 45
    for @{ 'RMinus $T1 $T2 $T }.
 
-notation "hvbox( ⇧ * [ e ] break T1 ≡ break T2 )"
+notation "hvbox( ⇧ * [ e ] break term 46 T1 ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RLiftStar $e $T1 $T2 }.
 
-notation "hvbox( ⇩ * [ e ] break L1 ≡ break L2 )"
+notation "hvbox( ⇩ * [ e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDropStar $e $L1 $L2 }.
 
-notation "hvbox( T1 break [ d , break e ] ▶* break T2 )"
+notation "hvbox( T1 break ▶* [ d , break e ] break term 46 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 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶* [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubstStar $L $T1 $d $e $T2 }.
 
-notation "hvbox( T1 break [ d , break e ] ≡ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶▶* [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'PSubstStarAlt $L $T1 $d $e $T2 }.
+
+notation "hvbox( T1 break ▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubst $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 90 T1 break [ d , break e ] ≡ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubst $L $T1 $d $e $T2 }.
 
-(* Static Typing ************************************************************)
+notation "hvbox( T1 break ▼▼* [ d , break e ] ≡ break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'TSubstAlt $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 90 T ÷ break A )"
+notation "hvbox( L ⊢ break term 46 T1 break ▼▼* [ d , break e ] ≡ break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'TSubstAlt $L $T1 $d $e $T2 }.
+
+(* Static typing ************************************************************)
+
+notation "hvbox( L ⊢ break term 46 T ⁝ break term 46 A )"
    non associative with precedence 45
    for @{ 'AtomicArity $L $T $A }.
 
-notation "hvbox( T1 ÷ ⊑ break T2 )"
+notation "hvbox( T1 ⁝ ⊑ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'CrSubEqA $T1 $T2 }.
 
+notation "hvbox( L ⊢ break term 46 T ÷ break term 46 A )"
+   non associative with precedence 45
+   for @{ 'BinaryArity $L $T $A }.
+
+notation "hvbox( T1 ÷ ⊑ break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqB $T1 $T2 }.
+
+notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 • break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'StaticType $h $L $T1 $T2 }.
+
+(* Unwind *******************************************************************)
+
+notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 •* break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'StaticTypeStar $h $L $T1 $T2 }.
+
 (* Reducibility *************************************************************)
 
-notation "hvbox( 𝐑 [ T ] )"
+notation "hvbox( 𝐑  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Reducible $T }.
 
-notation "hvbox( L ⊢ break 𝐑 [ T ] )"
+notation "hvbox( L ⊢ break 𝐑 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Reducible $L $T }.
 
-notation "hvbox( 𝐈 [ T ] )"
+notation "hvbox( 𝐈  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotReducible $T }.
 
-notation "hvbox( L ⊢ break 𝐈 [ T ] )"
+notation "hvbox( L ⊢ break 𝐈 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotReducible $L $T }.
 
-notation "hvbox( 𝐍 [ T ] )"
+notation "hvbox( 𝐍  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Normal $T }.
 
-notation "hvbox( L ⊢ break 𝐍 [ T ] )"
+notation "hvbox( L ⊢ break 𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Normal $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐑 [ T ] )"
+notation "hvbox( 𝐖𝐇𝐑 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'WHdReducible $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐑 [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐑  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'WHdReducible $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐈 [ T ] )"
+notation "hvbox( 𝐖𝐇𝐈  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotWHdReducible $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐈 [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐈 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotWHdReducible $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐍 [ T ] )"
+notation "hvbox( 𝐖𝐇𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'WHdNormal $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐍 [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'WHdNormal $L $T }.
 
-notation "hvbox( T1 ➡ break T2 )"
+notation "hvbox( T1 ➡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRed $T1 $T2 }.
 
-notation "hvbox( L ⊢ break term 90 T1 ➡ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ➡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRed $L $T1 $T2 }.
 
-notation "hvbox( L1 ⊢ ➡ break L2 )"
+notation "hvbox( L1 ⊢ ➡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'CPRed $L1 $L2 }.
 
 (* Computation **************************************************************)
 
-notation "hvbox( T1 ➡* break T2 )"
+notation "hvbox( T1 ➡* break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRedStar $T1 $T2 }.
 
-notation "hvbox( L ⊢ break term 90 T1 ➡* break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ➡* break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRedStar $L $T1 $T2 }.
 
-notation "hvbox( L1 ⊢ ➡* break L2 )"
+notation "hvbox( L1 ⊢ ➡* break term 46 L2 )"
    non associative with precedence 45
    for @{ 'CPRedStar $L1 $L2 }.
 
-notation "hvbox( ⬇ * T  )"
+notation "hvbox( L ⊢ break term 46 T1 ➡* break 𝐍 ⦃ T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'PEval $L $T1 $T2 }.
+
+notation "hvbox( ⬇ * term 46 T  )"
    non associative with precedence 45
    for @{ 'SN $T }.
 
-notation "hvbox( L ⊢ ⬇ * T )"
+notation "hvbox( L ⊢ break ⬇ * term 46 T )"
    non associative with precedence 45
    for @{ 'SN $L $T }.
 
-notation "hvbox( L ⊢ ⬇ * * T )"
+notation "hvbox( L ⊢ break ⬇ ⬇ * term 46 T )"
    non associative with precedence 45
-   for @{ 'SNStar $L $T }.
+   for @{ 'SNAlt $L $T }.
 
-notation "hvbox( ⦃ L, break T ⦄ break [ R ] ϵ break 〚 A 〛 )"
+notation "hvbox( ⦃ L, break T ⦄ ϵ break [ R ] break 〚 A 〛 )"
    non associative with precedence 45
    for @{ 'InEInt $R $L $T $A }.
 
-notation "hvbox( T1 break [ R ] ⊑ break T2 )"
+notation "hvbox( T1 ⊑ break [ R ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'CrSubEq $T1 $R $T2 }.
 
 (* Conversion ***************************************************************)
 
-notation "hvbox( L ⊢ break term 90 T1 ⬌ break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ⬌ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PConv $L $T1 $T2 }.
 
+notation "hvbox( T1 ⊢ ⬌ break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'CPConv $T1 $T2 }.
+
 (* Equivalence **************************************************************)
 
-notation "hvbox( L ⊢ break term 90 T1 ⬌* break T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ⬌* break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PConvStar $L $T1 $T2 }.
+
+notation "hvbox( T1 ⊢ ⬌* break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'CPConvStar $T1 $T2 }.
+
+(* Dynamic typing ***********************************************************)
+
+notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 : break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'NativeType $h $L $T1 $T2 }.
+
+notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 :: break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'NativeTypeAlt $h $L $T1 $T2 }.
+
+notation "hvbox( h ⊢ break term 46 L1 : ⊑ break term 46 L2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqN $h $L1 $L2 }.