X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2Fbasic_2.html;h=bbde8e1cf45d067ed3727363a9d833c9768bac5a;hb=22d35425b8f5f7e479db3be59b73f76d77ae6711;hp=332935d9a7b08cd9bc04c72a0d07ad4c1a86c67f;hpb=5cdcab1eddf82a94fc9911cbadb1132ffc8ae4b6;p=helm.git diff --git a/helm/www/lambdadelta/basic_2.html b/helm/www/lambdadelta/basic_2.html index 332935d9a..bbde8e1cf 100644 --- a/helm/www/lambdadelta/basic_2.html +++ b/helm/www/lambdadelta/basic_2.html @@ -6,8 +6,8 @@ - -
sizes | files | -250 | +329 | characters | -484808 | +567347 | nodes | -1304888 | +1610281 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||
propositions | theorems | -84 | +105 | lemmas | -1112 | +1114 | total | -1196 | +1219 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||
concepts | declared | -45 | +52 | defined | -83 | +76 | total | 128 |
|
-
- - |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
dynamic typing | -"big tree" parallel computation | -yprs ( ? ⢠â¦?,?⦠â¥[g] â¦?,?⦠) | -yprs_yprs | -ygt ( ? ⢠â¦?,?⦠>[g] â¦?,?⦠) | -ygt_ygt | -
- - |
- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- - |
- "big tree" parallel reduction | -ypr ( ? ⢠â¦?,?⦠â½[g] â¦?,?⦠) | -ysc ( ? ⢠â¦?,?⦠â»[g] â¦?,?⦠) | -
- - |
-
- - |
-
- - |
- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- - |
local env. ref. for stratified native validity | -lsubsv ( ? ⢠? ¡â[?] ? ) | -lsubsv_ldrop lsubsv_lsuba lsubsv_ssta lsubsv_dxprs lsubsv_cpcs lsubsv_snv | -
- - |
+ lsubsv ( ? ⢠? ¡â[?,?] ? ) | +lsubsv_ldrop lsubsv_lsubd lsubsv_lsuba lsubsv_lsstas lsubsv_cpds lsubsv_cpcs lsubsv_snv |
|
@@ -343,11 +339,8 @@
stratified native validity | -snv ( �,?⦠⢠? ¡[?] ) | -snv_lift snv_ltpss_dx snv_ltpss_sn snv_aaa snv_ssta snv_sstas snv_ssta_ltpr snv_ltpr snv_cpcs | -
- - |
+ snv ( �,?⦠⢠? ¡[?,?] ) | +snv_lift snv_da_lpr snv_aaa snv_lsstas snv_lsstas_lpr snv_lpr snv_cpcs |
|
@@ -357,12 +350,9 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||
equivalence | -focalized equivalence | -lfpcs ( â¦?⦠â¬* â¦?⦠) | -lfpcs_aaa lfpcs_fpcs lfpcs_lfprs lfpcs_lfpcs | -
- - |
+ decomposed extended equivalence | +cpes ( â¦?,?⦠⢠? â¢*â¬*[?,?] ? ) | +cpes_cpds |
|
@@ -374,14 +364,9 @@
|
-
- - |
- fpcs ( â¦?,?⦠â¬* â¦?,?⦠) | -fpcs_aaa fpcs_cpcs fpcs_fprs fpcs_fpcs | -
- - |
+ context-sensitive equivalence | +cpcs ( â¦?,?⦠⢠? â¬* ? ) | +cpcs_aaa cpcs_cprs cpcs_cpcs |
|
@@ -390,98 +375,96 @@
||||||||||||||||||||||||||||||||||||||||||||||||
- - |
- local env. ref. for stratified static type assignment | -lsubss ( ? â¢â[?] ? ) | -lsubss_ldrop lsubss_ssta lsubss_cpcs | -
- - |
- + | conversion | +context-sensitive conversion | +cpc ( �,?⦠⢠? ⬠? ) | +cpc_cpc | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
- - |
- context-sensitive equivalence | -cpcs ( ? ⢠? â¬* ? ) | -cpcs_ltpss_dx cpcs_ltpss_sn cpcs_delift cpcs_aaa cpcs_ltpr cpcs_cprs cpcs_cpcs | -+ | computation | +evaluation for context-sensitive extended reduction | +cpxe ( â¦?,?⦠⢠â¡*[?,?] ðâ¦?⦠) | +
|
- + |
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
conversion | -focalized conversion | -lfpc ( �⦠⬠�⦠) | -lfpc_lfpc | -+ |
|
- + | evaluation for context-sensitive reduction | +cpre ( â¦?,?⦠⢠â¡* ðâ¦?⦠) | +cpre_cpre | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
+ |
|
- + | strongly normalizing "big tree" computation | +fsb ( �,?⦠⢠⦥[?,?] ? ) | +fsb_alt ( �,?⦠⢠⦥⦥[?,?] ? ) | +fsb_aaa fsb_csx | +
|
- fpc ( �,?⦠⬠�,?⦠) | -fpc_fpc | -+ | |||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
- + | strongly normalizing extended computation | +lcosx ( ? ⢠⧤â¬*[?,?,?] ? ) | +lcosx_cpxs | +
|
- + |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ |
|
- context-sensitive conversion | -cpc ( ? ⢠? ⬠? ) | -cpc_cpc | -+ |
|
- + | lsx ( ? ⢠ââ¬*[?,?,?,?] ? ) | +lsx_ldrop lsx_cpxs lsx_csx | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
computation | -focalized computation | -lfprs ( â¦?⦠â¡* â¦?⦠) | -lfprs_aaa lfprs_ltprs lfprs_cprs lfprs_fprs lfprs_lfprs | -+ |
+ + |
+
|
+ csx_vector ( â¦?,?⦠⢠â¬*[?,?] ? ) | +csx_tstc_vector csx_aaa |
|
@@ -496,11 +479,20 @@
|
- fprs ( â¦?,?⦠â¡* â¦?,?⦠) | -fprs_aaa fprs_fprs | -+ | csx ( â¦?,?⦠⢠â¬*[?,?] ? ) | +csx_alt ( â¦?,?⦠⢠â¬â¬*[?,?] ? ) | +csx_lift csx_lpx csx_lpxs csx_fpbs | +
+ + |
+ ||||||||||||||||||||||||||||||||||||||||||||||||
|
+ "big tree" parallel computation | +fpbg ( â¦?,?,?⦠>â[?,?] â¦?,?,?⦠) | +fpbg_lift fpbg_fpns fpbg_fpbg |
|
@@ -512,12 +504,11 @@
|
- decomposed extended computation | -dxprs ( â¦?,?⦠⢠? â¢*â¡*[?] ? ) | -dxprs_lift dxprs_ltpss_dx dxprs_ltpss_sn dxprs_aaa dxprs_dxprs | -+ |
|
+ fpbc ( â¦?,?,?⦠â»â[?,?] â¦?,?,?⦠) | +fpbc_fpns fpbc_fpbs |
|
@@ -529,12 +520,11 @@
|
- weakly normalizing computation | -cpe ( ? ⢠â¡* ðâ¦?⦠) | -cpe_cpe | -+ |
|
+ fpbu ( â¦?,?,?⦠â»[?,?] â¦?,?,?⦠) | +fpbu_lift fpbu_fpns |
|
@@ -546,15 +536,12 @@
|
- strongly normalizing computation | -csn_vector ( ? ⢠â¬* ? ) | -csn_cpr_vector csn_tstc_vector csn_aaa | -
- - |
- + |
|
+ fpbs ( â¦?,?,?⦠â¥[?,?] â¦?,?,?⦠) | +fpbs_alt ( â¦?,?,?⦠â¥â¥[?,?] â¦?,?,?⦠) | +fpbs_lift fpbs_aaa fpbs_fpns fpbs_fpbs fpbs_ext |
|
@@ -563,12 +550,9 @@
|
-
- - |
- csn ( ? ⢠â¬* ? ) | -csn_alt ( ? ⢠â¬â¬* ? ) | -csn_lift csn_cpr csn_lfpr | +parallel computation for "big tree" normal forms | +fpns ( â¦?,?,?⦠⢠ââ¡*[?,?] â¦?,?,?⦠) | +fpns_fpns |
|
@@ -580,15 +564,24 @@
|
- context-sensitive computation | -cprs (? ⢠? â¡* ?) | -cprs_lift cprs_tpss cprs_ltpss_dx cprs_ltpss_sn cprs_delift cprs_aaa cprs_ltpr cprs_lfpr cprs_cprs cprs_lfprs cprs_tstc cprs_tstc_vector | +decomposed extended computation | +cpds ( â¦?,?⦠⢠? â¢*â¡*[?,?] ? ) | +cpds_lift cpds_aaa cpds_cpds |
|
- + |
+ + |
+ |||||||||||||
|
+ context-sensitive extended computation | +lpxs ( â¦?,?⦠⢠â¡*[?,?] ? ) | +lpxs_alt ( â¦?,?⦠⢠â¡â¡*[?,?] ? ) | +lpxs_ldrop lpxs_lleq lpxs_aaa lpxs_cpxs lpxs_lpxs |
|
@@ -597,10 +590,11 @@
|
- context-free computation | -ltprs ( ? â¡* ? ) | -ltprs_alt ( ? â¡â¡* ? ) | -ltprs_ldrop ltprs_ltprs | +
+ + |
+ cpxs ( â¦?,?⦠⢠? â¡*[?,?] ? ) | +cpxs_tstc cpxs_tstc_vector cpxs_lift cpxs_cpys cpxs_lleq cpxs_aaa cpxs_cpxs |
|
@@ -612,14 +606,23 @@
|
- + | context-sensitive computation | +lprs ( â¦?,?⦠⢠â¡* ? ) | +lprs_alt ( â¦?,?⦠⢠â¡â¡* ? ) | +lprs_ldrop lprs_cprs lprs_lprs | +
|
- tprs ( ? â¡* ?) | -tprs_lift tprs_tprs | -+ | |||||||||||||||||||||||||||||||||||||||||
|
+
+ + |
+ cprs ( â¦?,?⦠⢠? â¡* ?) | +cprs_lift cprs_cprs |
|
@@ -632,14 +635,11 @@
local env. ref. for abstract candidates of reducibility | -lsubc ( ? â[?] ? ) | +lsubc ( ? ⢠? â[?] ? ) | lsubc_ldrop lsubc_ldrops lsubc_lsuba |
|
-
- - |
|
@@ -650,23 +650,17 @@
support for abstract computation properties | acp | -acp_cr ( â¦?,?⦠ϵ[?] ã?ã ) | +acp_cr ( â¦?,?,?⦠ϵ[?] ã?ã ) | acp_aaa | -
- - |
|
|||||||||||||||||||||||||||||||||||||||||||||||
reducibility | -context-sensitive focalized reduction | -cfpr ( ? ⢠�,?⦠⡠�,?⦠) | -cnfpr_ltpss cfpr_aaa cfpr_cpr cfpr_cfpr | -
- - |
+ reduction | +"big tree" parallel reduction | +fpb ( â¦?,?,?⦠â½[?,?] â¦?,?,?⦠) | +fpb_lift fpb_aaa |
|
@@ -678,10 +672,9 @@
|
- context-free focalized reduction | -lfpr ( â¦?⦠⡠â¦?⦠) | -lfpr_alt ( â¦?⦠â¡â¡ â¦?⦠) | -lfpr_aaa lfpr_cpr lfpr_fpr lfpr_lfpr | +normal forms for context-sensitive extended reduction | +cnx ( â¦?,?⦠⢠â¡[?,?] ðâ¦?⦠) | +cnx_lift cnx_crx cnx_cix |
|
@@ -693,14 +686,9 @@
|
-
- - |
- fpr ( �,?⦠⡠�,?⦠) | -fpr_cpr fpr_fpr | -
- - |
+ context-sensitive extended reduction | +lpx ( â¦?,?⦠⢠â¡[?,?] ? ) | +lpx_ldrop lpx_cpys lpx_lleq lpx_aaa |
|
@@ -712,12 +700,11 @@
|
- context-sensitive normal forms | -cnf ( ? ⢠ðâ¦?⦠) | -cnf_lift cnf_cif | -+ |
|
+ cpx ( â¦?,?⦠⢠? â¡[?,?] ? ) | +cpx_lift cpx_cpys cpx_lleq cpx_cix |
|
@@ -729,12 +716,9 @@
|
- context-sensitive reduction | -cpr ( ? ⢠? ⡠? ) | -cpr_lift cpr_tpss cpr_ltpss_dx cpr_ltpss_sn cpr_delift cpr_aaa cpr_ltpr cpr_cpr | -
- - |
+ irreducible forms for context-sensitive extended reduction | +cix ( â¦?,?⦠⢠â¡[?,?] ðâ¦?⦠) | +cix_lift |
|
@@ -746,11 +730,12 @@
|
- context-sensitive reducible forms | -crf ( ? ⢠ðâ¦?⦠) | -crf_append | -cif ( ? ⢠ðâ¦?⦠) | -cif_append | +reducible forms for context-sensitive extended reduction | +crx ( â¦?,?⦠⢠â¡[?,?] ðâ¦?⦠) | +crx_lift | +
+ + |
|
@@ -759,14 +744,23 @@
|
- context-free normal forms | -thnf ( ððâ¦?⦠) | +normal forms for context-sensitive reduction | +cnr ( â¦?,?⦠⢠⡠ðâ¦?⦠) | +cnr_lift cnr_crr cnr_cir |
|
- + |
+ + |
+
|
+ context-sensitive reduction | +lpr ( �,?⦠⢠⡠? ) | +lpr_ldrop lpr_lpr |
|
@@ -778,12 +772,11 @@
|
- context-free reduction | -ltpr ( ? â¡ ? ) | -ltpr_ldrop ltpr_tps ltpr_ltpss_dx ltpr_ltpss_sn ltpr_aaa ltpr_ltpr | -+ |
|
+ cpr ( �,?⦠⢠? ⡠? ) | +cpr_lift cpr_cir |
|
@@ -795,14 +788,23 @@
|
- + | irreducible forms for context-sensitive reduction | +cir ( â¦?,?⦠⢠⡠ðâ¦?⦠) | +cir_lift | +
|
- tpr ( ? â¡ ? ) | -tpr_lift tpr_tps tpr_tpss tpr_delift tpr_tpr | -+ |
+ + |
+ ||||||||||||||||||||||||||||||||||||||||||
|
+ reducible forms for context-sensitive reduction | +crr ( â¦?,?⦠⢠⡠ðâ¦?⦠) | +crr_lift |
|
@@ -811,10 +813,9 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
unwind | -iterated stratified static type assignment | -sstas ( â¦?,?⦠⢠? â¢*[?] ? ) | -sstas_lift sstas_ltpss_dx sstas_ltpss_sn sstas_aaa sstas_sstas | +unfold | +unfold | +unfold ( â¦?,?⦠⢠? ⧫* ? ) |
|
@@ -826,33 +827,25 @@
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
static typing | -stratified static type assignment | -ssta ( â¦?,?⦠⢠? â¢[?,?] ? ) | -ssta_lift ssta_ltpss_dx ssta_ltpss_sn ssta_aaa ssta_ssta | -+ |
|
-
- - |
- + | iterated static type assignment | +lsstas ( â¦?,?⦠⢠? â¢*[?,?,?] ? ) | +lsstas_alt ( â¦?,?⦠⢠? â¢â¢*[?,?,?] ? ) | +lsstas_lift lsstas_aaa lsstas_lsstas | +
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
- - |
+ static typing | local env. ref. for atomic arity assignment | -lsuba ( ? ââ ? ) | +lsuba ( ? ⢠? ââ ? ) | lsuba_ldrop lsuba_aaa lsuba_lsuba |
|
-
- - |
|
@@ -862,11 +855,8 @@
atomic arity assignment | -aaa ( ? ⢠? â ? ) | -aaa_lift aaa_lifts aaa_ltpss_dx aaa_ltpss_sn aaa_aaa | -
- - |
+ aaa ( â¦?,?⦠⢠? â ? ) | +aaa_lift aaa_lifts aaa_fqus aaa_da aaa_ssta aaa_aaa |
|
@@ -878,12 +868,9 @@
|
- parameters | -sh | -sd | -
- - |
+ stratified static type assignment | +ssta ( â¦?,?⦠⢠? â¢[?,?] ? ) | +ssta_lift ssta_ssta |
|
@@ -892,65 +879,53 @@
|||||||||||||||||||||||||||||||||||||||||
unfold | -basic local env. thinning | -thin ( ? â¼*[?,?] â¡ ? ) | -thin_ldrop thin_delift | -+ |
|
- + | local env. ref. for degree assignment | +lsubd ( ? ⢠? âªâ ? ) | +lsubd_da lsubd_lsubd | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
+ |
|
- inverse basic term relocation | -delift ( ? ⢠? â¼*[?,?] â¡ ? ) | -delift_alt ( ? ⢠? â¼â¼*[?,?] â¡ ? ) | -delift_lift delift_tpss delift_ltpss delift_delift | -+ | degree assignment | +da ( â¦?,?⦠⢠? âª[?,?] ? ) | +da_lift da_da | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
+ |
|
- partial unfold | -ltpss_sn ( ? ⢠â¶*[?,?] ? ) | -ltpss_sn_alt ( ? ⢠â¶â¶*[?,?] ? ) | -ltpss_sn_ldrop ltpss_sn_tps ltpss_sn_tpss ltpss_sn_ltpss_sn | -+ | parameters | +sh | +sd | +
|
- + |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||
- - |
-
- - |
- ltpss_dx ( ? â¶*[?,?] ? ) | -ltpss_dx_ldrop ltpss_dx_tps ltpss_dx_tpss ltpss_dx_ltpss_dx | -
- - |
-
- - |
+ substitution | +lazy equivalence for local environments | +lleq ( ? â[?,?] ? ) | +lleq_alt ( ? ââ[?,?] ? ) | +lleq_ldrop lleq_fqus lleq_lleq lleq_ext |
|
@@ -959,13 +934,10 @@
|
-
- - |
- tpss ( ? ⢠? â¶*[?,?] ? ) | -tpss_alt ( ? ⢠? â¶â¶*[?,?] ? ) | -tpss_lift | -tpss_tpss | +contxt-sensitive extended multiple substitution | +cpys ( â¦?,?⦠⢠? â¶*[?,?] ? ) | +cpys_alt ( â¦?,?⦠⢠? â¶â¶*[?,?] ? ) | +cpys_lift cpys_cpys |
|
@@ -974,12 +946,9 @@
|
- generic local env. slicing | -ldrops ( â©*[?] ? â¡ ? ) | -ldrops_ldrop ldrops_ldrops | -
- - |
+ iterated structural successor for closures | +fqus ( â¦?,?,?⦠â* â¦?,?,?⦠) | +fqus_alt fqus_fqus |
|
@@ -991,12 +960,11 @@
|
- iterated restricted structural predecessor for closures | -frsups ( â¦?,?⦠â§* â¦?,?⦠) | -frsups_frsups | -+ |
|
+ fqup ( â¦?,?,?⦠â+ â¦?,?,?⦠) | +fqup_fqup |
|
@@ -1008,14 +976,9 @@
|
-
- - |
- frsupp ( â¦?,?⦠â§+ â¦?,?⦠) | -frsupp_frsupp | -
- - |
+ iterated local env. slicing | +ldrops ( â©*[?,?] ? â¡ ? ) | +ldrops_ldrop ldrops_ldrops |
|
@@ -1033,9 +996,6 @@
|
-
- - |
|
@@ -1052,9 +1012,6 @@
|
-
- - |
|
@@ -1067,19 +1024,27 @@
gr2 ( @â¦?,?⦠⡠? ) | gr2_plus ( ? + ? ) | gr2_minus ( ? â ? â¡ ? ) | -gr2_gr2 | -+ | gr2_gr2 | +||||
relocation | +contxt-sensitive extended ordinary substitution | +cpy ( â¦?,?⦠⢠? â¶[?,?] ? ) | +cpy_lift cpy_cpy | +
+ + |
+
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
substitution | -parallel substitution | -tps ( ? ⢠? â¶[?,?] ? ) | -tps_lift tps_tps | -+ |
|
+ restricted local env. ref. | +lsubr ( ? â ? ) | +lsubr_lsubr |
|
@@ -1091,12 +1056,23 @@
|
- global env. slicing | -gdrop ( â©[?] ? â¡ ? ) | -gdrop_gdrop | +local env. ref. for extended substitution | +lsuby ( ? âÃ[?,?] ? ) | +lsuby_lsuby |
|
+
+ + |
+ |||||||||||||||||||||||||||||||||||||||||||||||
+ + |
+ structural successor for closures | +fquq ( â¦?,?,?⦠â⸮ â¦?,?,?⦠) | +fquq_alt ( â¦?,?,?⦠ââ⸮ â¦?,?,?⦠) |
|
@@ -1108,9 +1084,10 @@
|
- basic local env. slicing | -ldrop ( â©[?,?] ? â¡ ? ) | -ldrop_append ldrop_lpx ldrop_lbotr ldrop_ldrop | +
+ + |
+ fqu ( â¦?,?,?⦠â â¦?,?,?⦠) |
|
@@ -1125,10 +1102,9 @@
|
- local env. ref. for substitution | -lsubr ( ? â[?,?] ? ) | -(lsubr_lsubr) | -lsubr_lbotr ( â[?,?] ? ) | +global env. slicing | +gdrop ( â©[?] ? â¡ ? ) | +gdrop_gdrop |
|
@@ -1140,14 +1116,9 @@
|
- restricted structural predecessor for closures | -frsup ( �,?⦠⧠�,?⦠) | -
- - |
-
- - |
+ basic local env. slicing | +ldrop ( â©[?,?,?] ? â¡ ? ) | +ldrop_lpx_sn ldrop_leq ldrop_ldrop |
|
@@ -1165,9 +1136,6 @@
|
-
- - |
|
@@ -1184,21 +1152,29 @@
|
-
- - |
|
||||||||||||||||||||||||||||||
grammar | -same head term form | -tshf ( ? â ? ) | -(tshf_tshf) | +equivalence for local environments | +leq ( ? â[?,?] ? ) | +leq_leq |
|
+
+ + |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ + |
+ pointwise extension of a relation | +lpx_sn | +lpx_sn_tc lpx_sn_lpx_sn |
|
@@ -1216,9 +1192,6 @@
|
-
- - |
|
@@ -1228,11 +1201,8 @@
closures | -cl_shift ( ? @@ ? ) | -cl_weight ( â¯{?,?} ) | -
- - |
+ cl_weight ( â¯{?,?,?} ) | +cl_restricted_weight ( â¯{?,?} ) |
|
@@ -1252,9 +1222,6 @@
|
-
- - |
|
@@ -1269,8 +1236,7 @@
lenv | lenv_weight ( â¯{?} ) | lenv_length ( |?| ) | -lenv_append ( ? @@ ? ) | -lenv_px lenv_px_bi | +lenv_append ( ? @@ ? ) | ||||||||||||||||||||||||||||||||||||||||||
@@ -1282,10 +1248,7 @@ | term | term_weight ( â¯{?} ) | term_simple ( ðâ¦?⦠) | -term_vector | -
- - |
+ term_vector | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
@@ -1301,9 +1264,6 @@ |
|
-
- - |
|
@@ -1320,9 +1280,6 @@
|
-
- - |
|
@@ -1361,6 +1318,6 @@