X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambda_delta%2Fweb%2Fhome%2Fbasic_2_src.tbl;h=d93513b2bd1fae66f5dceb4a7262c30bf646d14a;hb=38a32a37e587326fb5c3b0c9130c13329ddac8e6;hp=7fd4437a18efc16cba5cea26efef968d1904fc8d;hpb=70e6a24c9505c950714f138506f3eedb293084c5;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 7fd4437a1..d93513b2b 100644
--- a/helm/www/lambda_delta/web/home/basic_2_src.tbl
+++ b/helm/www/lambda_delta/web/home/basic_2_src.tbl
@@ -18,9 +18,9 @@ table {
      }
    ]
    class "blue"
-   [ { "native typing" * } {
-        [ { "" * } {
-	     [ "nty" * ]
+   [ { "dynamic typing" * } {
+        [ { "native type assignment" * } {
+	     [ "nta ( ⦃?,?⦄ ⊢ ? : ? )" "nta_alt ( ⦃?,?⦄ ⊢ ? :: ? )" "nta_lift" "nta_ltpss" "nta_thin" "nta_sta" "nta_nta" * ]
 	  }
         ]
      }
@@ -28,7 +28,8 @@ table {
    class "sky"
    [ { "equivalence" * } {
         [ { "context-sensitive equivalence" * } {
-	     [ "cpcs ( ? ⊢ ? ⬌* ? )" * ]
+ 	     [ "lcpcs ( ? ⊢ ⬌* ? )" "lcpcs_aaa" "lcpcs_lcprs" "lcpcs_lcpcs" * ]
+ 	     [ "cpcs ( ? ⊢ ? ⬌* ? )" "cpcs_ltpss" "cpcs_delift" "cpcs_ltpr" "cpcs_cprs" "cpcs_cpcs" * ]
 	  }
         ]
      }
@@ -36,6 +37,7 @@ table {
    class "cyan"
    [ { "conversion" * } {
         [ { "context-sensitive conversion" * } {
+	     [ "lcpc ( ? ⊢ ⬌ ? )" "lcpc_lcpc" * ]	     
 	     [ "cpc ( ? ⊢ ? ⬌ ? )" "cpc_cpc" * ]
 	  }
         ]
@@ -43,22 +45,26 @@ table {
    ]
    class "water"
    [ { "computation" * } {
-        [ { "strongly normalizing computation" * } {
+        [ { "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" * ]
+	     [ "csn ( ⬇* ? )" "csn_alt ( ⬇⬇* ? )" "csn_lift" "csn_cpr" "csn_lcpr" * ]
 	  }
         ]
         [ { "context-sensitive computation" * } {
-	     [ "lcprs ( ? ⊢ ➡* ? )" "lcprs_cprs" "lcprs_lcprs" * ]
-	     [ "cprs (? ⊢ ? ➡* ?)" "cprs_lift" "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" * ]
 	  }
         ]
         [ { "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" * ]
           }
 	]
      }
@@ -66,25 +72,25 @@ table {
    class "green"
    [ { "reducibility" * } {
         [ { "context-sensitive normal forms" * } {
-	     [ "cnf ( ? ⊢ 𝐍[?] )" "cnf_lift" * ]
+	     [ "cnf ( ? ⊢ 𝐍⦃?⦄ )" "cnf_lift" * ]
           }
 	]	
 	[ { "context-sensitive reduction" * } {
-	     [ "lcpr ( ? ⊢ ➡ ? )" "lcpr_cpr" * ]
-	     [ "cpr ( ? ⊢ ? ➡ ? )" "cpr_lift" "cpr_ltpss" "cpr_ltpr" "cpr_cpr" * ]
+	     [ "lcpr ( ? ⊢ ➡ ? )" "lcpr_aaa" "lcpr_cpr" "lcpr_lcpr" * ]
+	     [ "cpr ( ? ⊢ ? ➡ ? )" "cpr_lift" "cpr_ltpss" "cpr_delift" "cpr_ltpr" "cpr_cpr" * ]
 	  }
         ]
         [ { "context-free normal forms" * } {
-	     [ "twhnf ( 𝐖𝐇𝐍[?] )" "tnf ( 𝐍[?] )" "tnf_tif" * ]
+	     [ "twhnf ( 𝐖𝐇𝐍⦃?⦄ )" "tnf ( 𝐍⦃?⦄ )" "tnf_tif" * ]
           }
 	]
         [ { "context-free reduction" * } {
-	     [ "ltpr ( ? ➡ ? )" "ltpr_ldrop" "ltpr_tps" * ]
-	     [ "tpr ( ? ➡ ? )"  "tpr_lift" "tpr_tpss" "tpr_tpr" * ]
+	     [ "ltpr ( ? ➡ ? )" "ltpr_ldrop" "ltpr_tps" "ltpr_ltpss" "ltpr_aaa" "ltpr_ltpr" * ]
+	     [ "tpr ( ? ➡ ? )"  "tpr_lift" "tpr_tpss" "tpr_delift" "tpr_tpr" * ]
           }
 	]
         [ { "context-free reducible forms" * } {
-	     [ "trf ( 𝐑[?] )" "tif ( 𝐈[?] )" * ]
+	     [ "trf ( 𝐑⦃?⦄ )" "tif ( 𝐈⦃?⦄ )" * ]
           }
 	]
      }
@@ -92,15 +98,15 @@ table {
    class "grass"
    [ { "static typing" * } {
         [ { "static type assignment" * } {
-	     [ "sty" "sty_lift" "sty_sty" * ]
+	     [ "sta ( ⦃?,?⦄ ⊢ ? • ? )" "sta_lift" "sta_sta" * ]
           }
 	]
         [ { "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_aaa" * ]
+	     [ "aaa ( ? ⊢ ? ⁝ ? )" "aaa_lift" "aaa_lifts" "aaa_ltpss" "aaa_aaa" * ]
 	  }
         ]
         [ { "parameters" * } {
@@ -111,13 +117,17 @@ table {
    ]
    class "yellow"
    [ { "unfold" * } {
-        [ { "term inverse relocation" * } {
-	     [ "delift ( ? ⊢ ? [?,?] ≡ ? )" "delift_lift" * ]
+        [ { "basic local env. thinning" * } {
+	     [ "thin ( ? [?,?] ≡ ? )" "thin_ldrop" "thin_delift" * ]
+          }
+	]        
+	[ { "inverse basic term relocation" * } {
+	     [ "delift ( ? ⊢ ? [?,?] ≡ ? )" "delift_alt ( ? ⊢ ? [?,?] ≡≡ ? )" "delift_lift" "delift_tpss" "delift_ltpss" "delift_delift" * ]
           }
 	]
 	[ { "partial unfold" * } {
-             [ "ltpss ( ? [?,?] ▶* ? )" "ltpss_ldrop" "ltpss_tps" "ltpss_ltpss" * ] 
-	     [ "tpss ( ? ⊢ ? [?,?] ▶* ? )" "tpss_lift" "tpss_tpss" "tpss_ltps" * ]
+             [ "ltpss ( ? ▶*[?,?] ? )" "ltpss_ldrop" "ltpss_tps" "ltpss_tpss" "ltpss_ltpss" * ] 
+	     [ "tpss ( ? ⊢ ? ▶*[?,?] ? )" "tpss_alt ( ? ⊢ ? ▶▶*[?,?] ? )" "tpss_lift" "tpss_tpss" * ]
           }
 	]
 	[ { "generic local env. slicing" * } { 
@@ -130,7 +140,7 @@ table {
           }
 	]
 	[ { "support for generic relocation" * } { 
-	     [ "gr2 ( @ [ ? ] ? ≡ ? )" "gr2_plus ( ? + ? )" "gr2_minus ( ? ▭ ? ≡ ? )" "gr2_gr2" * ]
+	     [ "gr2 ( @ [?] ? ≡ ? )" "gr2_plus ( ? + ? )" "gr2_minus ( ? ▭ ? ≡ ? )" "gr2_gr2" * ]
           }
 	]
      }
@@ -138,8 +148,7 @@ table {
    class "orange"   
    [ { "substitution" * } { 
         [ { "parallel substitution" * } {
-             [ "ltps ( ? [?,?] ▶ ? )" "ltps_ldrop" "ltps_tps" "ltps_ltps" * ]
-	     [ "tps ( ? ⊢ ? [?,?] ▶ ? )" "tps_lift" "tps_tps" * ]
+	     [ "tps ( ? ⊢ ? ▶[?,?] ? )" "tps_lift" "tps_tps" * ]
           }
 	]
 	[ { "global env. slicing" * } {
@@ -147,7 +156,11 @@ table {
           }
 	]
 	[ { "basic local env. slicing" * } {
-             [ "ldrop ( ⇩[?,?] ? ≡ ? )" "ldrop_ldrop" * ]
+             [ "ldrop ( ⇩[?,?] ? ≡ ? )" "ldrop_ldrop" "ldrop_sfr" * ]
+          }
+	]
+        [ { "local env. ref. for substitution" * } {
+             [ "lsubs ( ? ≼[?,?] ? )" "lsubs_lsubs" "lsubs_sfr ( ≼[?,?] ? )" * ]
           }
 	]
         [ { "basic term relocation" * } {
@@ -159,10 +172,6 @@ table {
    ]
    class "red"   
    [ { "grammar" * } {
-        [ { "local env. ref. for substitution" * } {
-             [ "lsubs ( ? [?,?] ≼ ? )" "lsubs_lsubs" * ]
-          }
-	]
 	[ { "same head term form" * } {
              [ "tshf ( ? ≈ ? )" "tshf_tshf" * ]
           }
@@ -172,13 +181,13 @@ table {
           }
 	]
 	[ { "closures" * } {
-             [ "cl_shift ( ? @ ? )" "cl_weight ( #[?,?] )" * ]
+             [ "cl_shift ( ? @@ ? )" "cl_weight ( #[?,?] )" * ]
           }
 	]
         [ { "internal syntax" * } {
              [ "genv" * ]
 	     [ "lenv" "lenv_weight ( #[?] )" "lenv_length ( |?| )" * ]
-             [ "term" "term_weight ( #[?] )" "term_simple ( 𝐒[?] )" "term_vector" * ]
+             [ "term" "term_weight ( #[?] )" "term_simple ( 𝐒⦃?⦄ )" "term_vector" * ]
 	     [ "item" * ]
 	  }
 	]