X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambda_delta%2Fweb%2Fhome%2Fbasic_2_src.tbl;h=30591ab8905badf3574f0c46b25789b9029152ea;hb=c66eccc53d2b3000a905f9172b66cf6f9e2131a6;hp=efae39bf8f532dfe92738b07942d411a2bfcca4a;hpb=dc66c8d89a5147178ccdacb8341ed26c9c52f06b;p=helm.git

diff --git a/helm/www/lambda_delta/web/home/basic_2_src.tbl b/helm/www/lambda_delta/web/home/basic_2_src.tbl
index efae39bf8..30591ab89 100644
--- a/helm/www/lambda_delta/web/home/basic_2_src.tbl
+++ b/helm/www/lambda_delta/web/home/basic_2_src.tbl
@@ -5,112 +5,168 @@ table {
    [ { "component" * } {
         [ { "plane" * } { 
              [ "files" * ]
-	  }
+          }
         ]
      }
    ]
-   class "prune"
+(*
+   class "wine"
    [ { "examples" * } {
         [ { "" * } {
-	     [ "" * ]
-	  }
+             [ "" * ]
+          }
         ]
      }
    ]
-   class "blue"
+   class "magenta"
+   [ { "higher order dynamic typing" * } {
+        [ { "higher order native type assignment" * } {
+             [ "ntas ( ⦃?,?⦄ ⊢ ? :* ? )" "nta_lift" * ]
+          }
+        ]
+     }
+   ]
+*)
+   class "prune"
    [ { "dynamic typing" * } {
+(*        
+        [ { "local env. ref. for native type assignment" * } {
+             [ "lsubn ( ? ⊢ ? :⊑ ? )" "lsubn_ldrop" "lsubn_cpcs" "lsubn_nta" * ]
+          }
+        ]
         [ { "native type assignment" * } {
-	     [ "nta ( ⦃?,?⦄ ⊢ ? : ? )" "nta_lift" "nta_sta" * ]
-	  }
+             [ "nta ( ⦃?,?⦄ ⊢ ? : ? )" "nta_alt ( ⦃?,?⦄ ⊢ ? :: ? )" "nta_lift" "nta_ltpss" "nta_thin" "nta_aaa" "nta_sta" "nta_ltpr" "nta_nta" * ]
+          }
+        ]
+*)
+        [ { "stratified native validity" * } {
+             [ "snv ( ⦃?,?⦄ ⊩ ? :[?] )" "snv_lift" "snv_aaa" * ]
+          }
         ]
      }
    ]
-   class "sky"
+   class "blue"
    [ { "equivalence" * } {
         [ { "context-sensitive equivalence" * } {
- 	     [ "lcpcs ( ? ⊢ ⬌* ? )" "lcpcs_aaa" "lcpcs_lcprs" "lcpcs_lcpcs" * ]
- 	     [ "cpcs ( ? ⊢ ? ⬌* ? )" "cpcs_cprs" "cpcs_cpcs" * ]
-	  }
+             [ "lcpcs ( ? ⊢ ⬌* ? )" "lcpcs_aaa" "lcpcs_lcprs" "lcpcs_lcpcs" * ]
+             [ "cpcs ( ? ⊢ ? ⬌* ? )" "cpcs_ltpss" "cpcs_delift" "cpcs_ltpr" "cpcs_cprs" "cpcs_cpcs" * ]
+          }
         ]
      }
    ]
-   class "cyan"
+   class "sky"
    [ { "conversion" * } {
         [ { "context-sensitive conversion" * } {
-	     [ "lcpc ( ? ⊢ ⬌ ? )" "lcpc_lcpc" * ]	     
-	     [ "cpc ( ? ⊢ ? ⬌ ? )" "cpc_cpc" * ]
-	  }
+             [ "lcpc ( ? ⊢ ⬌ ? )" "lcpc_lcpc" * ]        
+             [ "cpc ( ? ⊢ ? ⬌ ? )" "cpc_cpc" * ]
+          }
         ]
      }
    ]
-   class "water"
+   class "cyan"
    [ { "computation" * } {
+        [ { "extended computation" * } {
+             [ "xprs ( ⦃?,?⦄ ⊢ ? ➸*[?] ? )" "xprs_lift" "xprs_aaa" "xprs_cprs" * ]
+          }
+        ]
         [ { "weakly normalizing computation" * } {
-	     [ "cpe ( ? ⊢ ? ⊢ ➡* 𝐍[?] )" "cpe_cpe" * ]
-	  }
-	]
-	[ { "strongly normalizing computation" * } {
-	     [ "csn_vector ( ⬇* ? )" "csn_cpr_vector" "csn_tstc_vector" "csn_aaa" * ]
-	     [ "csn ( ⬇* ? )" "csn_lift" "csn_cpr" "csn_cprs ( ⬇** ? )" "csn_lcpr" * ]
-	  }
+             [ "cpe ( ? ⊢ ➡* 𝐍⦃?⦄ )" "cpe_cpe" * ]
+          }
+        ]
+        [ { "strongly normalizing computation" * } {
+             [ "csn_vector ( ? ⊢ ⬊* ? )" "csn_cpr_vector" "csn_tstc_vector" "csn_aaa" * ]
+             [ "csn ( ? ⊢ ⬊* ? )" "csn_alt ( ? ⊢ ⬊⬊* ? )" "csn_lift" "csn_cpr" "csn_lcpr" * ]
+          }
         ]
         [ { "context-sensitive computation" * } {
-	     [ "lcprs ( ? ⊢ ➡* ? )" "lcprs_aaa" "lcprs_cprs" "lcprs_lcprs" * ]
-	     [ "cprs (? ⊢ ? ➡* ?)" "cprs_lift" "cprs_ltpr" "cprs_lcpr" "cprs_cprs" "cprs_lcprs" "cprs_tstc" "cprs_tstc_vector" * ]
-	  }
+             [ "lcprs ( ? ⊢ ➡* ? )" "lcprs_aaa" "lcprs_cprs" "lcprs_lcprs" * ]
+             [ "cprs (? ⊢ ? ➡* ?)" "cprs_lift" "cprs_delift" "cprs_ltpr" "cprs_lcpr" "cprs_cprs" "cprs_lcprs" "cprs_tstc" "cprs_tstc_vector" * ]
+          }
+        ]
+        [ { "context-free computation" * } {
+             [ "ltprs ( ? ➡* ? )" "ltprs_alt ( ? ➡➡* ? )" "ltprs_ldrop" "ltprs_ltprs" * ]
+             [ "tprs ( ? ➡* ?)" "tprs_lift" "tprs_tprs" * ]
+          }
         ]
         [ { "local env. ref. for abstract candidates of reducibility" * } {
-	     [ "lsubc ( ? [?] ⊑ ? )" "lsubc_ldrop" "lsubc_ldrops" "lsubc_lsuba" * ]
-	  }
+             [ "lsubc ( ? ⊑[?] ? )" "lsubc_ldrop" "lsubc_ldrops" "lsubc_lsuba" * ]
+          }
         ]
         [ { "support for abstract computation properties" * } {
-	     [ "acp" "acp_cr ( ⦃?,?⦄ ϵ 〚?〛 )" "acp_aaa" * ]
+             [ "acp" "acp_cr ( ⦃?,?⦄ ϵ[?] 〚?〛 )" "acp_aaa" * ]
           }
-	]
+        ]
      }
    ]
-   class "green"
+   class "water"
    [ { "reducibility" * } {
+        [ { "extended reduction" * } {
+             [ "xpr ( ⦃?,?⦄ ⊢ ? ➸[?] ? )" "xpr_lift" "xpr_aaa" * ]
+          }
+        ]
         [ { "context-sensitive normal forms" * } {
-	     [ "cnf ( ? ⊢ 𝐍[?] )" "cnf_lift" * ]
+             [ "cnf ( ? ⊢ 𝐍⦃?⦄ )" "cnf_lift" *"cnf_cif" * ]
+          }
+        ]       
+        [ { "context-sensitive reduction" * } {
+             [ "lcpr ( ? ⊢ ➡ ? )" "lcpr_aaa" "lcpr_cpr" "lcpr_lcpr" * ]
+             [ "cpr ( ? ⊢ ? ➡ ? )" "cpr_lift" "cpr_ltpss" "cpr_delift" "cpr_ltpr" "cpr_cpr" * ]
+          }
+        ]
+        [ { "context-sensitive reducible forms" * } {
+             [ "crf ( ? ⊢ 𝐑⦃?⦄ )" "crf_append" "cif ( ? ⊢ 𝐈⦃?⦄ )" "cif_append" * ]
+          }
+        ]
+        [ { "focalized reduction" * } {
+             [ "lfpr_alt ( ⦃?⦄ ➡➡ ⦃?⦄ )" * ]
+             [ "fpr ( ⦃?,?⦄ ➡ ⦃?,?⦄ )" * ]
           }
-	]	
-	[ { "context-sensitive reduction" * } {
-	     [ "lcpr ( ? ⊢ ➡ ? )" "lcpr_aaa" "lcpr_cpr" "lcpr_lcpr" * ]
-	     [ "cpr ( ? ⊢ ? ➡ ? )" "cpr_lift" "cpr_ltpss" "cpr_ltpr" "cpr_cpr" * ]
-	  }
         ]
         [ { "context-free normal forms" * } {
-	     [ "twhnf ( 𝐖𝐇𝐍[?] )" "tnf ( 𝐍[?] )" "tnf_tif" * ]
+             [ "thnf ( 𝐇𝐍⦃?⦄ )"   * ]
           }
-	]
+        ]
         [ { "context-free reduction" * } {
-	     [ "ltpr ( ? ➡ ? )" "ltpr_ldrop" "ltpr_tps" "ltpr_ltpss" "ltpr_aaa" "ltpr_ltpr" * ]
-	     [ "tpr ( ? ➡ ? )"  "tpr_lift" "tpr_tpss" "tpr_tpr" * ]
+             [ "ltpr ( ? ➡ ? )" "ltpr_ldrop" "ltpr_tps" "ltpr_ltpss_dx" "ltpr_ltpss_sn" "ltpr_aaa" "ltpr_ltpr" * ]
+             [ "tpr ( ? ➡ ? )"  "tpr_lift" "tpr_tpss" "tpr_delift" "tpr_tpr" * ]
           }
-	]
-        [ { "context-free reducible forms" * } {
-	     [ "trf ( 𝐑[?] )" "tif ( 𝐈[?] )" * ]
+        ]
+     }
+   ]
+   class "green"
+   [ { "unwind" * } {
+        [ { "" * } {
+             [ "" * ]
           }
-	]
+        ]
      }
    ]
+(*
+        [ { "stratified unwind" * } {
+             [ "sstas ( ⦃?,?⦄ ⊢ ? •*[?] ? )" "sstas_lift" "sstas_ltpss" "sstas_sstas" * ]
+          }
+        ]
+*)
    class "grass"
    [ { "static typing" * } {
-        [ { "static type assignment" * } {
-	     [ "sta ( ⦃?,?⦄ ⊢ ? • ? )" "sta_lift" "sta_sta" * ]
+        [ { "local env. ref. for stratified static type assignment" * } {
+             [ "lsubss ( ? ⁝⊑ ? )" "lsubss_ldrop" "lsubss_ssta" "lsubss_lsubss" * ]
           }
-	]
+        ]
+        [ { "stratified static type assignment" * } {
+             [ "ssta ( ⦃?,?⦄ ⊢ ? •[?,?] ? )" "ssta_lift" "ssta_ltpss_dx" "ssta_ltpss_sn" "ssta_aaa" "ssta_ssta" * ]
+          }
+        ]
         [ { "local env. ref. for atomic arity assignment" * } {
-	     [ "lsuba ( ? ÷⊑ ? )" "lsuba_ldrop" "lsuba_aaa" "lsuba_lsuba" * ]
-	  }
+             [ "lsuba ( ? ⁝⊑ ? )" "lsuba_ldrop" "lsuba_aaa" "lsuba_lsuba" * ]
+          }
         ]
         [ { "atomic arity assignment" * } {
-	     [ "aaa ( ? ⊢ ? ÷ ? )" "aaa_lift" "aaa_lifts" "aaa_ltpss" "aaa_aaa" * ]
-	  }
+             [ "aaa ( ? ⊢ ? ⁝ ? )" "aaa_lift" "aaa_lifts" "aaa_ltpss_dx" "aaa_ltpss_sn" "aaa_aaa" * ]
+          }
         ]
         [ { "parameters" * } {
-             [ "sh" * ]
+             [ "sh" "sd" * ]
           }
         ]
      }
@@ -118,49 +174,54 @@ table {
    class "yellow"
    [ { "unfold" * } {
         [ { "basic local env. thinning" * } {
-	     [ "thin ( ? [?,?] ≡ ? )" "thin_delift" * ]
+             [ "thin ( ? ▼*[?,?] ≡ ? )" "thin_ldrop" "thin_delift" * ]
           }
-	]        
-	[ { "inverse basic term relocation" * } {
-	     [ "delift ( ? ⊢ ? [?,?] ≡ ? )" "delift_lift" "delift_delift" "delift_alt ( ? ⊢ ? [?,?] ≡≡ ? )" * ]
+        ]        
+        [ { "inverse basic term relocation" * } {
+             [ "delift ( ? ⊢ ? ▼*[?,?] ≡ ? )" "delift_alt ( ? ⊢ ? ▼▼*[?,?] ≡ ? )" "delift_lift" "delift_tpss" "delift_ltpss" "delift_delift" * ]
           }
-	]
-	[ { "partial unfold" * } {
-             [ "ltpss ( ? [?,?] ▶* ? )" "ltpss_ldrop" "ltpss_tps" "ltpss_tpss" "ltpss_ltpss" * ] 
-	     [ "tpss ( ? ⊢ ? [?,?] ▶* ? )" "tpss_lift" "tpss_tpss" "tpss_alt ( ? ⊢ ? [?,?] ▶▶* ? )" * ]
+        ]
+        [ { "partial unfold" * } {
+             [ "ltpss_sn ( ? ⊢ ▶*[?,?] ? )" "ltpss_sn_ldrop" "ltpss_sn_tps" "ltpss_sn_tpss" "ltpss_sn_ltpss_sn" "ltpss_sn_alt ( ? ⊢ ▶▶*[?,?] ? )" * ]
+             [ "ltpss_dx ( ? ▶*[?,?] ? )" "ltpss_dx_ldrop" "ltpss_dx_tps" "ltpss_dx_tpss" "ltpss_dx_ltpss_dx" * ]
+             [ "tpss ( ? ⊢ ? ▶*[?,?] ? )" "tpss_alt ( ? ⊢ ? ▶▶*[?,?] ? )" "tpss_lift" "tpss_tpss" * ]
           }
-	]
-	[ { "generic local env. slicing" * } { 
-	     [ "ldrops ( ⇩*[?] ? ≡ ? )" "ldrops_ldrop" "ldrops_ldrops" * ]
+        ]
+        [ { "generic local env. slicing" * } { 
+             [ "ldrops ( ⇩*[?] ? ≡ ? )" "ldrops_ldrop" "ldrops_ldrops" * ]
           }
-	]
-	[ { "generic term relocation" * } {
-	     [ "lifts_vector ( ⇧*[?] ? ≡ ? )" "lifts_lift_vector" * ]
-	     [ "lifts ( ⇧*[?] ? ≡ ? )" "lifts_lift" "lifts_lifts" * ] 
+        ]
+        [ { "generic term relocation" * } {
+             [ "lifts_vector ( ⇧*[?] ? ≡ ? )" "lifts_lift_vector" * ]
+             [ "lifts ( ⇧*[?] ? ≡ ? )" "lifts_lift" "lifts_lifts" * ] 
           }
-	]
-	[ { "support for generic relocation" * } { 
-	     [ "gr2 ( @ [ ? ] ? ≡ ? )" "gr2_plus ( ? + ? )" "gr2_minus ( ? ▭ ? ≡ ? )" "gr2_gr2" * ]
+        ]
+        [ { "support for generic relocation" * } { 
+             [ "gr2 ( @⦃?,?⦄ ≡ ? )" "gr2_plus ( ? + ? )" "gr2_minus ( ? ▭ ? ≡ ? )" "gr2_gr2" * ]
           }
-	]
+        ]
      }
    ]
    class "orange"   
    [ { "substitution" * } { 
         [ { "parallel substitution" * } {
-	     [ "tps ( ? ⊢ ? [?,?] ▶ ? )" "tps_lift" "tps_tps" * ]
+             [ "tps ( ? ⊢ ? ▶[?,?] ? )" "tps_lift" "tps_tps" * ]
           }
-	]
-	[ { "global env. slicing" * } {
+        ]
+        [ { "global env. slicing" * } {
              [ "gdrop ( ⇩[?] ? ≡ ? )" "gdrop_gdrop" * ]
           }
-	]
-	[ { "basic local env. slicing" * } {
-             [ "ldrop ( ⇩[?,?] ? ≡ ? )" "ldrop_ldrop" * ]
+        ]
+        [ { "basic local env. slicing" * } {
+             [ "ldrop ( ⇩[?,?] ? ≡ ? )" "ldrop_append" "ldrop_lpx" "ldrop_sfr" "ldrop_ldrop" * ]
+          }
+        ]
+        [ { "local env. ref. for substitution" * } {
+             [ "lsubs ( ? ≼[?,?] ? )" "(lsubs_lsubs)" "lsubs_sfr ( ≽[?,?] ? )" * ]
           }
-	]
+        ]
         [ { "basic term relocation" * } {
-	     [ "lift_vector ( ⇧[?,?] ? ≡ ? )" "lift_lift_vector" * ]
+             [ "lift_vector ( ⇧[?,?] ? ≡ ? )" "lift_lift_vector" * ]
              [ "lift ( ⇧[?,?] ? ≡ ? )" "lift_lift" * ]
           }
         ]
@@ -168,33 +229,29 @@ table {
    ]
    class "red"   
    [ { "grammar" * } {
-        [ { "local env. ref. for substitution" * } {
-             [ "lsubs ( ? [?,?] ≼ ? )" "lsubs_lsubs" * ]
+        [ { "same head term form" * } {
+             [ "tshf ( ? ≈ ? )" "(tshf_tshf)" * ]
           }
-	]
-	[ { "same head term form" * } {
-             [ "tshf ( ? ≈ ? )" "tshf_tshf" * ]
-          }
-	]
-	[ { "same top term constructor" * } {
+        ]
+        [ { "same top term constructor" * } {
              [ "tstc ( ? ≃ ? )" "tstc_tstc" "tstc_vector" * ]
           }
-	]
-	[ { "closures" * } {
-             [ "cl_shift ( ? @ ? )" "cl_weight ( #[?,?] )" * ]
+        ]
+        [ { "closures" * } {
+             [ "cl_shift ( ? @@ ? )" "cl_weight ( #{?,?} )" * ]
           }
-	]
+        ]
         [ { "internal syntax" * } {
              [ "genv" * ]
-	     [ "lenv" "lenv_weight ( #[?] )" "lenv_length ( |?| )" * ]
-             [ "term" "term_weight ( #[?] )" "term_simple ( 𝐒[?] )" "term_vector" * ]
-	     [ "item" * ]
-	  }
-	] 
+             [ "lenv" "lenv_weight ( #{?} )" "lenv_length ( |?| )" "lenv_append ( ? @@ ? )" "lenv_px" "lenv_px_bi" * ]
+             [ "term" "term_weight ( #{?} )" "term_simple ( 𝐒⦃?⦄ )" "term_vector" * ]
+             [ "item" * ]
+          }
+        ] 
         [ { "external syntax" * } {
              [ "aarity" * ]
-	  }
-	] 
+          }
+        ] 
      }
    ]
 }