- degree-based equivalene for terms

[helm.git] / matita / matita / contribs / lambdadelta / basic_2 / web / basic_2_src.tbl

diff --git a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
index c1be240bf34bbc5b20310e6dfb8f733c472debdb..cd88f565a13aaab9020ecf4611e2e629e38c646e 100644 (file)
--- a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
+++ b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
@@ -138,19 +138,19 @@ table {
           }
         ]
         [ { "context-sensitive rt-reduction" * } {
-             [ "lpx_drop" + "lpx_frees" + "lpx_lleq" + "lpx_aaa" * ]
+             [ "lpx_lleq" * ]
              [ "cpx_lreq" + "cpx_fqus" + "cpx_llpx_sn" + "cpx_lleq" * ]
           }
         ]
 *)
         [ { "t-bound context-sensitive rt-transition" * } {
-             [ "lfpr ( ⦃?,?⦄ ⊢ ➡[?,?] ? )" "lfpr_length" + "lfpr_drops" + "lfpr_fqup" + "lfpr_lfpx" + "lfpr_lfpr" * ]
+             [ "lfpr ( ⦃?,?⦄ ⊢ ➡[?,?] ? )" "lfpr_length" + "lfpr_drops" + "lfpr_fqup" + "lfpr_frees" + "lfpr_aaa" + "lfpr_lfpx" + "lfpr_lfpr" * ]
              [ "cpr ( ⦃?,?⦄ ⊢ ? ➡[?] ? )" "cpr_drops" (* + "cpr_llpx_sn" + "cpr_cir" *) * ]
              [ "cpm ( ⦃?,?⦄ ⊢ ? ➡[?,?] ? )" "cpm_simple" + "cpm_drops" + "cpm_lsubr" + "cpm_cpx" * ]
           }
         ]
         [ { "uncounted context-sensitive rt-transition" * } {
-             [ "lfpx ( ⦃?,?⦄ ⊢ ⬈[?,?] ? )" "lfpx_length" + "lfpx_drops" + "lfpx_fqup" * ]
+             [ "lfpx ( ⦃?,?⦄ ⊢ ⬈[?,?] ? )" "lfpx_length" + "lfpx_drops" + "lfpx_fqup" + "lfpx_frees" + "lfpx_aaa" * ]
              [ "cpx ( ⦃?,?⦄ ⊢ ? ⬈[?] ? )" "cpx_simple" + "cpx_drops" + "cpx_lsubr" * ]
           }
         ]
@@ -162,10 +162,6 @@ table {
    ]
    class "green"
    [ { "static typing" * } {
-        [ { "parameters" * } {
-             [ "sh" "sd" * ]
-          }
-        ]
         [ { "restricted ref. for atomic arity assignment" * } {
              [ "lsuba ( ? ⊢ ? ⫃⁝ ? )" "lsuba_drops" + "lsuba_lsubr" + "lsuba_aaa" + "lsuba_lsuba" * ]
           }
@@ -174,10 +170,6 @@ table {
              [ "aaa ( ⦃?,?⦄ ⊢ ? ⁝ ? )" "aaa_drops" + "aaa_fqus" + "aaa_lfeq" + "aaa_aaa" * ]
           }
         ]
-        [ { "restricted ref. for local env." * } {
-             [ "lsubr ( ? ⫃ ? )" "lsubr_length" + "lsubr_drops" + "lsubr_lsubr" * ]
-          }
-        ]
         [ { "equivalence for closures on referred entries" * } {
              [ "ffeq ( ⦃?,?,?⦄ ≡ ⦃?,?,?⦄ )" "ffeq_freq" * ]
           }
@@ -190,8 +182,16 @@ table {
              [ "lfxs ( ? ⦻*[?,?] ? )" "lfxs_length" + "lfxs_drops" + "lfxs_fqup" + "lfxs_lfxs" * ]
           }
         ]
+        [ { "restricted ref. for context-sensitive free variables" * } {
+             [ "lsubf ( ⦃?,?⦄ ⫃𝐅* ⦃?,?⦄ )" "lsubf_frees" * ]
+          }
+        ]        
         [ { "context-sensitive free variables" * } {
-             [ "frees ( ? ⊢ 𝐅*⦃?⦄ ≡ ? )" "frees_weight" + "frees_lreq" + "frees_drops" + "frees_fqup" + "frees_fqus" + "frees_frees" * ]
+             [ "frees ( ? ⊢ 𝐅*⦃?⦄ ≡ ? )" "frees_weight" + "frees_lreq" + "frees_drops" + "frees_fqup" + "frees_frees" * ]
+          }
+        ]
+        [ { "restricted ref. for local env." * } {
+             [ "lsubr ( ? ⫃ ? )" "lsubr_length" + "lsubr_drops" + "lsubr_lsubr" * ]
           }
         ]
      }
@@ -237,13 +237,13 @@ table {
      }
    ]
    class "red"
-   [ { "grammar" * } {
+   [ { "syntax" * } {
         [ { "append for local environments" * } {
              [ "append ( ? @@ ? )" "append_length" * ]
           }
         ]
-        [ { "context-sensitive equivalences for terms" * } {
-             [ "ceq" "ceq_ceq" * ]
+        [ { "degree-based equivalence for terms" * } {
+             [ "deq ( ? ≡[?,?] ? ) " "deq_deq" * ]
           }
         ]
         [ { "same top term structure" * } {
@@ -251,17 +251,34 @@ table {
           }
         ]
         [ { "closures" * } {
-             [ "cl_weight ( ♯{?,?,?} )" "cl_restricted_weight ( ♯{?,?} )" * ]
+             [ "cl_weight ( ♯{?,?,?} )" * ]
+             [ "cl_restricted_weight ( ♯{?,?} )" * ]
           }
         ]
-        [ { "internal syntax" * } {
+        [ { "global environments" * } {
              [ "genv" * ]
-             [ "lenv" "lenv_weight ( ♯{?} )" "lenv_length ( |?| )" * ]
-             [ "term" "term_weight ( ♯{?} )" "term_simple ( 𝐒⦃?⦄ )" "term_vector ( Ⓐ?.? )" * ]
+          }
+        ]
+        [ { "local environments" * } {
+             [ "lenv_length ( |?| )" * ]
+             [ "lenv_weight ( ♯{?} )" * ]
+             [ "lenv" * ]
+          }
+        ]
+        [ { "terms" * } {
+             [ "term_vector ( Ⓐ?.? )" * ]
+             [ "term_simple ( 𝐒⦃?⦄ )"  * ]
+             [ "term_weight ( ♯{?} )" * ]
+             [ "term" * ]
+          }
+        ]
+        [ { "items" * } {
+             [ "item_sd" * ]
+             [ "item_sh" * ]
              [ "item" * ]
           }
         ]
-        [ { "external syntax" * } {
+        [ { "atomic arities" * } {
              [ "aarity" * ]
           }
         ]