From ff612dc35167ec0c145864c9aa8ae5e1ebe20a48 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Mon, 2 Jul 2018 16:10:32 +0200 Subject: [PATCH] syntactic components detached from basic_2 become static_2 + web site updated accordingly --- .gitignore | 2 + helm/www/lambdadelta/web/home/sitemap.tbl | 3 +- .../web/home/specification.ldw.xml | 1 + matita/matita/contribs/lambdadelta/Makefile | 2 +- .../lambdadelta/apps_2/models/model.ma | 2 +- .../lambdadelta/apps_2/models/model_gi.ma | 2 +- .../lambdadelta/apps_2/models/model_li.ma | 2 +- .../lambdadelta/apps_2/models/veq_lifts.ma | 2 +- .../lambdadelta/basic_2/dynamic/cnv_fqus.ma | 2 +- .../basic_2/dynamic/lsubsv_lsubd.ma | 2 +- .../basic_2/dynamic/lsubsv_scpds.ma | 2 +- .../lambdadelta/basic_2/dynamic/snv_da_lpr.ma | 2 +- .../basic_2/rt_computation/cpms_drops.ma | 2 +- .../basic_2/rt_computation/cprs_ext.ma | 2 +- .../basic_2/rt_computation/cpxs_drops.ma | 2 +- .../basic_2/rt_computation/cpxs_ext.ma | 2 +- .../basic_2/rt_computation/cpxs_fdeq.ma | 2 +- .../basic_2/rt_computation/cpxs_theq.ma | 2 +- .../rt_computation/cpxs_theq_vector.ma | 4 +- .../lambdadelta/basic_2/rt_computation/csx.ma | 2 +- .../basic_2/rt_computation/csx_aaa.ma | 2 +- .../basic_2/rt_computation/csx_drops.ma | 2 +- .../basic_2/rt_computation/csx_fdeq.ma | 2 +- .../basic_2/rt_computation/csx_fqus.ma | 2 +- .../basic_2/rt_computation/csx_gcp.ma | 2 +- .../basic_2/rt_computation/csx_gcr.ma | 2 +- .../basic_2/rt_computation/csx_simple_theq.ma | 4 +- .../basic_2/rt_computation/csx_vector.ma | 2 +- .../basic_2/rt_computation/fpbg_fpbs.ma | 4 +- .../basic_2/rt_computation/fpbs_fqup.ma | 4 +- .../basic_2/rt_computation/fpbs_fqus.ma | 2 +- .../basic_2/rt_computation/fpbs_lpxs.ma | 4 +- .../basic_2/rt_computation/lprs.ma | 2 +- .../basic_2/rt_computation/lprs_drops.ma | 2 +- .../basic_2/rt_computation/lprs_length.ma | 2 +- .../basic_2/rt_computation/lprs_tc.ma | 2 +- .../basic_2/rt_computation/lpxs.ma | 2 +- .../basic_2/rt_computation/lpxs_drops.ma | 2 +- .../basic_2/rt_computation/lpxs_fdeq.ma | 2 +- .../basic_2/rt_computation/lpxs_length.ma | 2 +- .../basic_2/rt_computation/lpxs_lpx.ma | 2 +- .../basic_2/rt_computation/lpxs_lpxs.ma | 2 +- .../basic_2/rt_computation/rdsx.ma | 2 +- .../basic_2/rt_computation/rdsx_drops.ma | 2 +- .../basic_2/rt_computation/rdsx_fqup.ma | 2 +- .../basic_2/rt_computation/rdsx_length.ma | 2 +- .../lambdadelta/basic_2/rt_transition/cnx.ma | 2 +- .../basic_2/rt_transition/cnx_drops.ma | 2 +- .../lambdadelta/basic_2/rt_transition/cpg.ma | 8 +- .../basic_2/rt_transition/cpg_drops.ma | 6 +- .../basic_2/rt_transition/cpg_lsubr.ma | 2 +- .../basic_2/rt_transition/cpg_simple.ma | 2 +- .../basic_2/rt_transition/cpr_ext.ma | 2 +- .../basic_2/rt_transition/cpx_ext.ma | 2 +- .../basic_2/rt_transition/cpx_fdeq.ma | 2 +- .../basic_2/rt_transition/cpx_fqus.ma | 4 +- .../basic_2/rt_transition/cpx_rdeq.ma | 2 +- .../basic_2/rt_transition/cpx_req.ma | 2 +- .../lambdadelta/basic_2/rt_transition/fpb.ma | 4 +- .../basic_2/rt_transition/fpb_fdeq.ma | 4 +- .../basic_2/rt_transition/fpb_rdeq.ma | 2 +- .../lambdadelta/basic_2/rt_transition/fpbq.ma | 4 +- .../basic_2/rt_transition/fpbq_aaa.ma | 4 +- .../lambdadelta/basic_2/rt_transition/lpr.ma | 2 +- .../basic_2/rt_transition/lpr_drops.ma | 2 +- .../basic_2/rt_transition/lpr_fquq.ma | 2 +- .../basic_2/rt_transition/lpr_length.ma | 2 +- .../basic_2/rt_transition/lpr_lpr.ma | 2 +- .../lambdadelta/basic_2/rt_transition/lpx.ma | 2 +- .../basic_2/rt_transition/lpx_aaa.ma | 4 +- .../basic_2/rt_transition/lpx_drops.ma | 2 +- .../basic_2/rt_transition/lpx_fquq.ma | 2 +- .../basic_2/rt_transition/lpx_length.ma | 2 +- .../basic_2/rt_transition/lpx_rdeq.ma | 2 +- .../lambdadelta/basic_2/rt_transition/rpx.ma | 2 +- .../basic_2/rt_transition/rpx_fqup.ma | 2 +- .../basic_2/rt_transition/rpx_fsle.ma | 4 +- .../basic_2/rt_transition/rpx_length.ma | 2 +- .../basic_2/rt_transition/rpx_lpx.ma | 2 +- .../basic_2/rt_transition/rpx_rdeq.ma | 4 +- .../basic_2/rt_transition/rpx_rpx.ma | 2 +- .../lambdadelta/basic_2/web/basic_2_src.tbl | 149 ---------------- .../contribs/lambdadelta/compile_static.sh | 1 - .../lambdadelta/ground_2/lib/arith.ma | 2 +- .../contribs/lambdadelta/ground_2/lib/bool.ma | 4 +- .../contribs/lambdadelta/ground_2/lib/list.ma | 4 +- .../lambdadelta/ground_2/lib/streams.ma | 2 +- .../{constructors => functions}/circledE_1.ma | 0 .../{constructors => functions}/diamond_0.ma | 0 .../{constructors => functions}/infinity_0.ma | 0 .../{constructors => functions}/no_0.ma | 0 .../{constructors => functions}/onezero_0.ma | 0 .../oplusright_3.ma | 0 .../semicolon_3.ma | 0 .../{constructors => functions}/tuple_4.ma | 0 .../{constructors => functions}/uparrow_1.ma | 0 .../{constructors => functions}/yes_0.ma | 0 .../{constructors => functions}/zeroone_0.ma | 0 .../{constructors => functions}/zerozero_0.ma | 0 .../lambdadelta/ground_2/relocation/mr2.ma | 4 +- .../lambdadelta/ground_2/steps/rtc.ma | 8 +- .../lambdadelta/ground_2/ynat/ynat.ma | 2 +- .../matita/contribs/lambdadelta/partial.txt | 7 +- matita/matita/contribs/lambdadelta/replace.sh | 2 +- matita/matita/contribs/lambdadelta/static.txt | 7 - .../{basic_2 => static_2}/i_static/rexs.ma | 4 +- .../i_static/rexs_drops.ma | 6 +- .../i_static/rexs_fqup.ma | 4 +- .../i_static/rexs_length.ma | 4 +- .../i_static/rexs_lex.ma | 8 +- .../i_static/rexs_rexs.ma | 4 +- .../notation/functions}/dxabbr_2.ma | 0 .../notation/functions}/dxabst_2.ma | 0 .../notation/functions}/dxbind1_2.ma | 0 .../notation/functions}/dxbind2_3.ma | 0 .../notation/functions}/dxitem_2.ma | 0 .../notation/functions}/dxvoid_1.ma | 0 .../notation/functions}/gref_1.ma | 0 .../notation/functions}/item0_0.ma | 0 .../notation/functions}/item0_1.ma | 0 .../notation/functions}/lref_1.ma | 0 .../notation/functions/snabbr_2.ma | 0 .../notation/functions}/snabbr_3.ma | 0 .../notation/functions}/snabbrneg_2.ma | 0 .../notation/functions}/snabbrpos_2.ma | 0 .../notation/functions/snabst_2.ma | 0 .../notation/functions}/snabst_3.ma | 0 .../notation/functions}/snabstneg_2.ma | 0 .../notation/functions}/snabstpos_2.ma | 0 .../notation/functions}/snappl_2.ma | 0 .../notation/functions/snapplvector_2.ma | 0 .../notation/functions/snbind1_2.ma | 0 .../notation/functions/snbind2_3.ma | 0 .../notation/functions}/snbind2_4.ma | 0 .../notation/functions}/snbind2neg_3.ma | 0 .../notation/functions}/snbind2pos_3.ma | 0 .../notation/functions}/sncast_2.ma | 0 .../notation/functions}/snflat2_3.ma | 0 .../notation/functions}/snitem2_2.ma | 0 .../notation/functions}/snitem2_3.ma | 0 .../notation/functions/snitem_2.ma | 0 .../notation/functions/snvoid_1.ma | 0 .../notation/functions}/star_0.ma | 0 .../notation/functions}/star_1.ma | 0 .../notation/functions/weight_1.ma | 0 .../notation/functions/weight_2.ma | 0 .../notation/functions/weight_3.ma | 0 .../notation/relations/atomicarity_4.ma | 0 .../notation/relations/freestar_3.ma | 0 .../notation/relations/ideqsn_3.ma | 0 .../notation/relations/ineint_5.ma | 0 .../notation/relations/lrsubeqa_3.ma | 0 .../notation/relations/lrsubeqc_2.ma | 0 .../notation/relations/lrsubeqc_4.ma | 0 .../notation/relations/lrsubeqf_4.ma | 0 .../notation/relations/rdropstar_3.ma | 0 .../notation/relations/rdropstar_4.ma | 0 .../notation/relations/relation_3.ma | 0 .../notation/relations/relation_4.ma | 0 .../notation/relations/relation_5.ma | 0 .../notation/relations/relationstar_4.ma | 0 .../notation/relations/rliftstar_3.ma | 0 .../notation/relations/simple_1.ma | 0 .../notation/relations/stareq_4.ma | 0 .../notation/relations/stareq_5.ma | 0 .../notation/relations/stareqsn_5.ma | 0 .../notation/relations/stareqsn_8.ma | 0 .../notation/relations/subseteq_4.ma | 0 .../notation/relations/supterm_6.ma | 0 .../notation/relations/supterm_7.ma | 0 .../notation/relations/suptermopt_6.ma | 0 .../notation/relations/suptermopt_7.ma | 0 .../notation/relations/suptermplus_6.ma | 0 .../notation/relations/suptermplus_7.ma | 0 .../notation/relations/suptermstar_6.ma | 0 .../notation/relations/suptermstar_7.ma | 0 .../notation/relations/topiso_4.ma | 0 .../notation/relations/voidstareq_4.ma | 0 .../{basic_2 => static_2}/relocation/drops.ma | 8 +- .../relocation/drops_cext2.ma | 2 +- .../relocation/drops_ctc.ma | 2 +- .../relocation/drops_drops.ma | 4 +- .../relocation/drops_length.ma | 4 +- .../relocation/drops_lex.ma | 6 +- .../relocation/drops_ltc.ma | 2 +- .../relocation/drops_seq.ma | 2 +- .../relocation/drops_sex.ma | 4 +- .../relocation/drops_vector.ma | 4 +- .../relocation/drops_weight.ma | 6 +- .../{basic_2 => static_2}/relocation/lex.ma | 6 +- .../relocation/lex_length.ma | 4 +- .../relocation/lex_lex.ma | 2 +- .../relocation/lex_tc.ma | 6 +- .../{basic_2 => static_2}/relocation/lifts.ma | 4 +- .../relocation/lifts_bind.ma | 4 +- .../relocation/lifts_lifts.ma | 2 +- .../relocation/lifts_lifts_bind.ma | 4 +- .../relocation/lifts_lifts_vector.ma | 4 +- .../relocation/lifts_simple.ma | 4 +- .../relocation/lifts_tdeq.ma | 4 +- .../relocation/lifts_vector.ma | 4 +- .../relocation/lifts_weight.ma | 4 +- .../relocation/lifts_weight_bind.ma | 6 +- .../{basic_2 => static_2}/relocation/seq.ma | 6 +- .../relocation/seq_length.ma | 4 +- .../relocation/seq_seq.ma | 4 +- .../{basic_2 => static_2}/relocation/sex.ma | 4 +- .../relocation/sex_length.ma | 6 +- .../relocation/sex_sex.ma | 2 +- .../relocation/sex_tc.ma | 2 +- .../s_computation/fqup.ma | 6 +- .../s_computation/fqup_drops.ma | 4 +- .../s_computation/fqup_fqup.ma | 2 +- .../s_computation/fqup_weight.ma | 4 +- .../s_computation/fqus.ma | 6 +- .../s_computation/fqus_drops.ma | 4 +- .../s_computation/fqus_fqup.ma | 4 +- .../s_computation/fqus_fqus.ma | 2 +- .../s_computation/fqus_weight.ma | 4 +- .../{basic_2 => static_2}/s_transition/fqu.ma | 10 +- .../s_transition/fqu_length.ma | 4 +- .../s_transition/fqu_tdeq.ma | 4 +- .../s_transition/fqu_weight.ma | 6 +- .../s_transition/fquq.ma | 6 +- .../s_transition/fquq_length.ma | 4 +- .../s_transition/fquq_weight.ma | 4 +- .../{basic_2 => static_2}/static/aaa.ma | 8 +- .../{basic_2 => static_2}/static/aaa_aaa.ma | 2 +- .../{basic_2 => static_2}/static/aaa_drops.ma | 8 +- .../{basic_2 => static_2}/static/aaa_fdeq.ma | 4 +- .../{basic_2 => static_2}/static/aaa_fqus.ma | 4 +- .../{basic_2 => static_2}/static/aaa_rdeq.ma | 4 +- .../{basic_2 => static_2}/static/fdeq.ma | 6 +- .../{basic_2 => static_2}/static/fdeq_fdeq.ma | 4 +- .../{basic_2 => static_2}/static/fdeq_fqup.ma | 4 +- .../{basic_2 => static_2}/static/fdeq_fqus.ma | 4 +- .../{basic_2 => static_2}/static/fdeq_req.ma | 4 +- .../{basic_2 => static_2}/static/frees.ma | 4 +- .../static/frees_append.ma | 4 +- .../static/frees_drops.ma | 4 +- .../static/frees_fqup.ma | 4 +- .../static/frees_frees.ma | 2 +- .../{basic_2 => static_2}/static/fsle.ma | 6 +- .../static/fsle_drops.ma | 4 +- .../{basic_2 => static_2}/static/fsle_fqup.ma | 4 +- .../{basic_2 => static_2}/static/fsle_fsle.ma | 4 +- .../static/fsle_length.ma | 4 +- .../{basic_2 => static_2}/static/gcp.ma | 4 +- .../{basic_2 => static_2}/static/gcp_aaa.ma | 4 +- .../{basic_2 => static_2}/static/gcp_cr.ma | 12 +- .../{basic_2 => static_2}/static/lsuba.ma | 4 +- .../{basic_2 => static_2}/static/lsuba_aaa.ma | 4 +- .../static/lsuba_drops.ma | 4 +- .../static/lsuba_lsuba.ma | 2 +- .../static/lsuba_lsubr.ma | 4 +- .../{basic_2 => static_2}/static/lsubc.ma | 6 +- .../static/lsubc_drops.ma | 4 +- .../static/lsubc_lsuba.ma | 4 +- .../static/lsubc_lsubr.ma | 4 +- .../{basic_2 => static_2}/static/lsubf.ma | 4 +- .../static/lsubf_frees.ma | 2 +- .../static/lsubf_lsubf.ma | 4 +- .../static/lsubf_lsubr.ma | 4 +- .../{basic_2 => static_2}/static/lsubr.ma | 4 +- .../static/lsubr_drops.ma | 4 +- .../static/lsubr_length.ma | 4 +- .../static/lsubr_lsubr.ma | 2 +- .../{basic_2 => static_2}/static/rdeq.ma | 6 +- .../static/rdeq_drops.ma | 6 +- .../{basic_2 => static_2}/static/rdeq_fqup.ma | 4 +- .../{basic_2 => static_2}/static/rdeq_fqus.ma | 8 +- .../static/rdeq_length.ma | 8 +- .../{basic_2 => static_2}/static/rdeq_rdeq.ma | 6 +- .../{basic_2 => static_2}/static/rdeq_req.ma | 4 +- .../{basic_2 => static_2}/static/req.ma | 4 +- .../{basic_2 => static_2}/static/req_fqup.ma | 4 +- .../{basic_2 => static_2}/static/req_fsle.ma | 6 +- .../{basic_2 => static_2}/static/rex.ma | 8 +- .../{basic_2 => static_2}/static/rex_drops.ma | 8 +- .../{basic_2 => static_2}/static/rex_fqup.ma | 4 +- .../{basic_2 => static_2}/static/rex_fsle.ma | 8 +- .../static/rex_length.ma | 4 +- .../{basic_2 => static_2}/static/rex_lex.ma | 6 +- .../{basic_2 => static_2}/static/rex_rex.ma | 6 +- .../{basic_2 => static_2}/syntax/aarity.ma | 4 +- .../{basic_2 => static_2}/syntax/append.ma | 14 +- .../syntax/append_length.ma | 4 +- .../{basic_2 => static_2}/syntax/bind.ma | 2 +- .../syntax/bind_weight.ma | 4 +- .../{basic_2 => static_2}/syntax/ceq_ext.ma | 2 +- .../syntax/ceq_ext_ceq_ext.ma | 2 +- .../{basic_2 => static_2}/syntax/cext2.ma | 4 +- .../syntax/cl_restricted_weight.ma | 4 +- .../{basic_2 => static_2}/syntax/cl_weight.ma | 6 +- .../{basic_2 => static_2}/syntax/ext2.ma | 2 +- .../{basic_2 => static_2}/syntax/ext2_ext2.ma | 2 +- .../{basic_2 => static_2}/syntax/ext2_tc.ma | 2 +- .../{basic_2 => static_2}/syntax/genv.ma | 10 +- .../syntax/genv_length.ma | 2 +- .../syntax/genv_weight.ma | 4 +- .../{basic_2 => static_2}/syntax/item.ma | 0 .../{basic_2 => static_2}/syntax/item_sd.ma | 2 +- .../{basic_2 => static_2}/syntax/item_sh.ma | 0 .../{basic_2 => static_2}/syntax/lenv.ma | 16 +- .../syntax/lenv_length.ma | 2 +- .../syntax/lenv_weight.ma | 4 +- .../{basic_2 => static_2}/syntax/lveq.ma | 4 +- .../syntax/lveq_length.ma | 4 +- .../{basic_2 => static_2}/syntax/lveq_lveq.ma | 2 +- .../{basic_2 => static_2}/syntax/tdeq.ma | 6 +- .../{basic_2 => static_2}/syntax/tdeq_ext.ma | 6 +- .../{basic_2 => static_2}/syntax/tdeq_tdeq.ma | 2 +- .../{basic_2 => static_2}/syntax/term.ma | 36 ++-- .../syntax/term_simple.ma | 4 +- .../syntax/term_vector.ma | 4 +- .../syntax/term_weight.ma | 4 +- .../{basic_2 => static_2}/syntax/theq.ma | 6 +- .../syntax/theq_simple.ma | 4 +- .../syntax/theq_simple_vector.ma | 4 +- .../{basic_2 => static_2}/syntax/theq_tdeq.ma | 4 +- .../{basic_2 => static_2}/syntax/theq_theq.ma | 2 +- .../lambdadelta/static_2/web/static_2.ldw.xml | 32 ++++ .../lambdadelta/static_2/web/static_2_src.tbl | 167 ++++++++++++++++++ 323 files changed, 662 insertions(+), 621 deletions(-) delete mode 100644 matita/matita/contribs/lambdadelta/compile_static.sh rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/circledE_1.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/diamond_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/infinity_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/no_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/onezero_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/oplusright_3.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/semicolon_3.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/tuple_4.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/uparrow_1.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/yes_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/zeroone_0.ma (100%) rename matita/matita/contribs/lambdadelta/ground_2/notation/{constructors => functions}/zerozero_0.ma (100%) delete mode 100644 matita/matita/contribs/lambdadelta/static.txt rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs_drops.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs_fqup.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs_lex.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/i_static/rexs_rexs.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxabbr_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxabst_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxbind1_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxbind2_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxitem_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/dxvoid_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/gref_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/item0_0.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/item0_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/lref_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snabbr_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabbr_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabbrneg_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabbrpos_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snabst_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabst_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabstneg_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snabstpos_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snappl_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snapplvector_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snbind1_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snbind2_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snbind2_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snbind2neg_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snbind2pos_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/sncast_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snflat2_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snitem2_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/snitem2_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snitem_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/snvoid_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/star_0.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2/notation/constructors => static_2/notation/functions}/star_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/weight_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/weight_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/functions/weight_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/atomicarity_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/freestar_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/ideqsn_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/ineint_5.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/lrsubeqa_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/lrsubeqc_2.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/lrsubeqc_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/lrsubeqf_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/rdropstar_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/rdropstar_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/relation_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/relation_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/relation_5.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/relationstar_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/rliftstar_3.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/simple_1.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/stareq_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/stareq_5.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/stareqsn_5.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/stareqsn_8.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/subseteq_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/supterm_6.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/supterm_7.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermopt_6.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermopt_7.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermplus_6.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermplus_7.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermstar_6.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/suptermstar_7.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/topiso_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/notation/relations/voidstareq_4.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_cext2.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_ctc.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_drops.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_length.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_lex.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_ltc.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_seq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_sex.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_vector.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/drops_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lex.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lex_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lex_lex.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lex_tc.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_bind.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_lifts.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_lifts_bind.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_lifts_vector.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_simple.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_tdeq.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_vector.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/lifts_weight_bind.ma (90%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/seq.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/seq_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/seq_seq.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/sex.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/sex_length.ma (92%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/sex_sex.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/relocation/sex_tc.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqup.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqup_drops.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqup_fqup.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqup_weight.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqus.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqus_drops.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqus_fqup.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqus_fqus.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_computation/fqus_weight.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fqu.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fqu_length.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fqu_tdeq.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fqu_weight.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fquq.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fquq_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/s_transition/fquq_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa_aaa.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa_fdeq.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa_fqus.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/aaa_rdeq.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fdeq.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fdeq_fdeq.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fdeq_fqup.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fdeq_fqus.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fdeq_req.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/frees.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/frees_append.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/frees_drops.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/frees_fqup.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/frees_frees.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fsle.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fsle_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fsle_fqup.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fsle_fsle.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/fsle_length.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/gcp.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/gcp_aaa.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/gcp_cr.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsuba.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsuba_aaa.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsuba_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsuba_lsuba.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsuba_lsubr.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubc.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubc_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubc_lsuba.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubc_lsubr.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubf.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubf_frees.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubf_lsubf.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubf_lsubr.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubr.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubr_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubr_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/lsubr_lsubr.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_drops.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_fqup.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_fqus.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_length.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_rdeq.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rdeq_req.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/req.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/req_fqup.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/req_fsle.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_drops.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_fqup.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_fsle.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_length.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_lex.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/static/rex_rex.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/aarity.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/append.ma (91%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/append_length.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/bind.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/bind_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/ceq_ext.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/ceq_ext_ceq_ext.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/cext2.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/cl_restricted_weight.ma (96%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/cl_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/ext2.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/ext2_ext2.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/ext2_tc.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/genv.ma (89%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/genv_length.ma (97%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/genv_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/item.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/item_sd.ma (99%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/item_sh.ma (100%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lenv.ma (88%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lenv_length.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lenv_weight.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lveq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lveq_length.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/lveq_lveq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/tdeq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/tdeq_ext.ma (93%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/tdeq_tdeq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/term.ma (84%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/term_simple.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/term_vector.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/term_weight.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/theq.ma (98%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/theq_simple.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/theq_simple_vector.ma (95%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/theq_tdeq.ma (94%) rename matita/matita/contribs/lambdadelta/{basic_2 => static_2}/syntax/theq_theq.ma (98%) create mode 100644 matita/matita/contribs/lambdadelta/static_2/web/static_2.ldw.xml create mode 100644 matita/matita/contribs/lambdadelta/static_2/web/static_2_src.tbl diff --git a/.gitignore b/.gitignore index a457deb5b..928986366 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,8 @@ helm/www/lambdadelta/xslt/apps_2_sum.xsl helm/www/lambdadelta/xslt/basic_2_blk.xsl helm/www/lambdadelta/xslt/basic_2_src.xsl helm/www/lambdadelta/xslt/basic_2_sum.xsl +helm/www/lambdadelta/xslt/static_2_src.xsl +helm/www/lambdadelta/xslt/static_2_sum.xsl helm/www/lambdadelta/xslt/ground_2_src.xsl helm/www/lambdadelta/xslt/ground_2_sum.xsl helm/www/lambdadelta/xslt/basic_1_blk.xsl diff --git a/helm/www/lambdadelta/web/home/sitemap.tbl b/helm/www/lambdadelta/web/home/sitemap.tbl index 14e8ac71a..e76cdd5f8 100644 --- a/helm/www/lambdadelta/web/home/sitemap.tbl +++ b/helm/www/lambdadelta/web/home/sitemap.tbl @@ -14,7 +14,8 @@ table [ class "white" { [ @@("html/specification" "specification") * ] [ @@("html/specification#v2" "version 2") - "(" ^ @@("html/ground_2" "background") + "-" + + "(" ^ @@("html/ground_2" "background") + "-" + + @@("html/static_2" "syntax") + "-" + @@("html/basic_2" "core") + "-" + @@("html/apps_2" "applications") ^ ")" * ] diff --git a/helm/www/lambdadelta/web/home/specification.ldw.xml b/helm/www/lambdadelta/web/home/specification.ldw.xml index 93208df02..c58b253a8 100644 --- a/helm/www/lambdadelta/web/home/specification.ldw.xml +++ b/helm/www/lambdadelta/web/home/specification.ldw.xml @@ -82,6 +82,7 @@ Informational pages on the parts of the specification: Background, + Syntax, Core, Applications. diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile index 0c03faa0c..073dc33a2 100644 --- a/matita/matita/contribs/lambdadelta/Makefile +++ b/matita/matita/contribs/lambdadelta/Makefile @@ -32,7 +32,7 @@ WWW := ../../../../helm/www/lambdadelta TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \ www up-html -PACKAGES := ground_2 basic_2 apps_2 alpha_1 +PACKAGES := ground_2 basic_2 static_2 apps_2 alpha_1 XPACKAGES := ground_2 basic_2 LDWS := $(shell find -name "*.ldw.xml") diff --git a/matita/matita/contribs/lambdadelta/apps_2/models/model.ma b/matita/matita/contribs/lambdadelta/apps_2/models/model.ma index 88703cfa2..86c624e1b 100644 --- a/matita/matita/contribs/lambdadelta/apps_2/models/model.ma +++ b/matita/matita/contribs/lambdadelta/apps_2/models/model.ma @@ -15,7 +15,7 @@ include "ground_2/notation/relations/ringeq_3.ma". include "apps_2/notation/models/at_3.ma". include "apps_2/notation/models/wbrackets_4.ma". -include "basic_2/syntax/term.ma". +include "static_2/syntax/term.ma". (* MODEL ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/apps_2/models/model_gi.ma b/matita/matita/contribs/lambdadelta/apps_2/models/model_gi.ma index 49a0d6754..1c354a621 100644 --- a/matita/matita/contribs/lambdadelta/apps_2/models/model_gi.ma +++ b/matita/matita/contribs/lambdadelta/apps_2/models/model_gi.ma @@ -12,6 +12,6 @@ (* *) (**************************************************************************) -include "basic_2/syntax/genv.ma". +include "static_2/syntax/genv.ma". (* GLOBAL ENVIRONMENT INTERPRETATION ***************************************) diff --git a/matita/matita/contribs/lambdadelta/apps_2/models/model_li.ma b/matita/matita/contribs/lambdadelta/apps_2/models/model_li.ma index 30d7d60d2..6be3c60c6 100644 --- a/matita/matita/contribs/lambdadelta/apps_2/models/model_li.ma +++ b/matita/matita/contribs/lambdadelta/apps_2/models/model_li.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv.ma". +include "static_2/syntax/lenv.ma". include "apps_2/models/model_vlift.ma". include "apps_2/notation/models/inwbrackets_4.ma". diff --git a/matita/matita/contribs/lambdadelta/apps_2/models/veq_lifts.ma b/matita/matita/contribs/lambdadelta/apps_2/models/veq_lifts.ma index 80a103a48..905b1a336 100644 --- a/matita/matita/contribs/lambdadelta/apps_2/models/veq_lifts.ma +++ b/matita/matita/contribs/lambdadelta/apps_2/models/veq_lifts.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/relocation/rtmap_basic.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/relocation/lifts.ma". include "apps_2/models/veq.ma". (* EVALUATION EQUIVALENCE **************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_fqus.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_fqus.ma index 341a3b1cb..cb79dfcc8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_fqus.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/cnv_fqus.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus_fqup.ma". +include "static_2/s_computation/fqus_fqup.ma". include "basic_2/dynamic/cnv_drops.ma". (* CONTEXT_SENSITIVE NATIVE VALIDITY FOR TERMS ******************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_lsubd.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_lsubd.ma index f2ecbb50a..7f9e72946 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_lsubd.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_lsubd.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubd.ma". +include "static_2/static/lsubd.ma". include "basic_2/dynamic/lsubsv.ma". (* LOCAL ENVIRONMENT REFINEMENT FOR STRATIFIED NATIVE VALIDITY **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_scpds.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_scpds.ma index 0694ae50a..cac43d361 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_scpds.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/lsubsv_scpds.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubd_da.ma". +include "static_2/static/lsubd_da.ma". include "basic_2/dynamic/lsubsv_lsubd.ma". include "basic_2/dynamic/lsubsv_lstas.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/dynamic/snv_da_lpr.ma b/matita/matita/contribs/lambdadelta/basic_2/dynamic/snv_da_lpr.ma index acaf6f038..e4f1699fd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/dynamic/snv_da_lpr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/dynamic/snv_da_lpr.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubd_da.ma". +include "static_2/static/lsubd_da.ma". include "basic_2/dynamic/snv_aaa.ma". include "basic_2/dynamic/snv_scpes.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpms_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpms_drops.ma index dce2cecf5..0e1d62090 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpms_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpms_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_ltc.ma". +include "static_2/relocation/drops_ltc.ma". include "basic_2/rt_transition/cpm_drops.ma". include "basic_2/rt_computation/cpms.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cprs_ext.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cprs_ext.ma index 01da390f0..e69b27a31 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cprs_ext.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cprs_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cext2.ma". +include "static_2/syntax/cext2.ma". include "basic_2/rt_computation/cpms.ma". (* CONTEXT-SENSITIVE PARALLEL R-COMPUTATION FOR BINDERS *********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_drops.ma index aac7f8c36..c42f94f83 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_ctc.ma". +include "static_2/relocation/drops_ctc.ma". include "basic_2/rt_transition/cpx_drops.ma". include "basic_2/rt_computation/cpxs.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_ext.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_ext.ma index c600cc7d0..c3280871a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_ext.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cext2.ma". +include "static_2/syntax/cext2.ma". include "basic_2/rt_computation/cpxs.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-COMPUTATION FOR BINDERS ************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_fdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_fdeq.ma index 16675efdb..1db09aeb5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_fdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq.ma". +include "static_2/static/fdeq.ma". include "basic_2/rt_computation/cpxs_rdeq.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-COMPUTATION FOR TERMS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq.ma index ae05d817e..d9e982b5e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/theq_tdeq.ma". +include "static_2/syntax/theq_tdeq.ma". include "basic_2/rt_computation/cpxs_lsubr.ma". include "basic_2/rt_computation/cpxs_cnx.ma". include "basic_2/rt_computation/lpxs_cpxs.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq_vector.ma index 9fb405b0c..147867a8b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_theq_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/theq_simple_vector.ma". -include "basic_2/relocation/lifts_vector.ma". +include "static_2/syntax/theq_simple_vector.ma". +include "static_2/relocation/lifts_vector.ma". include "basic_2/rt_computation/cpxs_theq.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-COMPUTATION FOR TERMS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx.ma index da0bbe1ee..4c8371a0b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtystrong_5.ma". -include "basic_2/syntax/tdeq.ma". +include "static_2/syntax/tdeq.ma". include "basic_2/rt_transition/cpx.ma". (* STRONGLY NORMALIZING TERMS FOR UNBOUND PARALLEL RT-TRANSITION ************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_aaa.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_aaa.ma index 4d54a74a5..6cc0664aa 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_aaa.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_aaa.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/gcp_aaa.ma". +include "static_2/static/gcp_aaa.ma". include "basic_2/rt_computation/cpxs_aaa.ma". include "basic_2/rt_computation/csx_gcp.ma". include "basic_2/rt_computation/csx_gcr.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_drops.ma index 84c7ec146..c0ecbf084 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_tdeq.ma". +include "static_2/relocation/lifts_tdeq.ma". include "basic_2/rt_transition/cpx_drops.ma". include "basic_2/rt_computation/csx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fdeq.ma index f8978c4cd..7c58163b3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq.ma". +include "static_2/static/fdeq.ma". include "basic_2/rt_computation/csx_rdeq.ma". (* STRONGLY NORMALIZING TERMS FOR UNBOUND PARALLEL RT-TRANSITION ************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fqus.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fqus.ma index 69cf8e20a..0943a9add 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fqus.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_fqus.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus.ma". +include "static_2/s_computation/fqus.ma". include "basic_2/rt_computation/csx_lsubr.ma". (* STRONGLY NORMALIZING TERMS FOR UNBOUND PARALLEL RT-TRANSITION ************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcp.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcp.ma index 8ff4067e0..f5b170930 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcp.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcp.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/gcp.ma". +include "static_2/static/gcp.ma". include "basic_2/rt_transition/cnx_drops.ma". include "basic_2/rt_computation/csx_drops.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcr.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcr.ma index 668b023d5..03970d35b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_gcr.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/gcp_cr.ma". +include "static_2/static/gcp_cr.ma". include "basic_2/rt_computation/csx_cnx_vector.ma". include "basic_2/rt_computation/csx_csx_vector.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_simple_theq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_simple_theq.ma index 54ef85a48..cc286ae6a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_simple_theq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_simple_theq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/theq_simple.ma". -include "basic_2/syntax/theq_theq.ma". +include "static_2/syntax/theq_simple.ma". +include "static_2/syntax/theq_theq.ma". include "basic_2/rt_transition/cpx_simple.ma". include "basic_2/rt_computation/cpxs.ma". include "basic_2/rt_computation/csx_csx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma index 5d0552b95..32afe79a4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_vector.ma". +include "static_2/syntax/term_vector.ma". include "basic_2/rt_computation/csx.ma". (* STRONGLY NORMALIZING TERMS VECTORS FOR UNBOUND PARALLEL RT-TRANSITION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbg_fpbs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbg_fpbs.ma index 5608b1ff8..3641326f8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbg_fpbs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbg_fpbs.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq_fqup.ma". -include "basic_2/static/fdeq_fdeq.ma". +include "static_2/static/fdeq_fqup.ma". +include "static_2/static/fdeq_fdeq.ma". include "basic_2/rt_transition/fpbq_fpb.ma". include "basic_2/rt_computation/fpbg.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqup.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqup.ma index b1e12a7a6..b625f889b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqup.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus_fqup.ma". -include "basic_2/static/fdeq_fqup.ma". +include "static_2/s_computation/fqus_fqup.ma". +include "static_2/static/fdeq_fqup.ma". include "basic_2/rt_computation/fpbs_fqus.ma". (* PARALLEL RST-COMPUTATION FOR CLOSURES ************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqus.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqus.ma index 3c8274371..db3925f71 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqus.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_fqus.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus.ma". +include "static_2/s_computation/fqus.ma". include "basic_2/rt_computation/fpbs.ma". (* PARALLEL RST-COMPUTATION FOR CLOSURES ************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_lpxs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_lpxs.ma index 3a67b6f49..2760e2a33 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_lpxs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/fpbs_lpxs.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq_fqus.ma". -include "basic_2/static/fdeq_fdeq.ma". +include "static_2/static/fdeq_fqus.ma". +include "static_2/static/fdeq_fdeq.ma". include "basic_2/rt_computation/cpxs_fqus.ma". include "basic_2/rt_computation/cpxs_fdeq.ma". include "basic_2/rt_computation/lpxs_fdeq.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs.ma index 1ee9f365b..880278d22 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predsnstar_4.ma". -include "basic_2/relocation/lex.ma". +include "static_2/relocation/lex.ma". include "basic_2/rt_computation/cprs_ext.ma". (* PARALLEL R-COMPUTATION FOR FULL LOCAL ENVIRONMENTS ***********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_drops.ma index aeef8e87a..ae0bcc6b4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_lex.ma". +include "static_2/relocation/drops_lex.ma". include "basic_2/rt_computation/cpms_drops.ma". (* PARALLEL R-COMPUTATION FOR FULL LOCAL ENVIRONMENTS ***********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_length.ma index a488b1a3f..ae38e76a4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_length.ma". +include "static_2/relocation/lex_length.ma". include "basic_2/rt_computation/lprs.ma". (* PARALLEL R-COMPUTATION FOR FULL LOCAL ENVIRONMENTS ***********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_tc.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_tc.ma index cec8e47f5..122051b4d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_tc.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lprs_tc.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_tc.ma". +include "static_2/relocation/lex_tc.ma". include "basic_2/rt_computation/lprs_ctc.ma". include "basic_2/rt_computation/cprs_lpr.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs.ma index 61fa33126..322f43712 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtysnstar_4.ma". -include "basic_2/relocation/lex.ma". +include "static_2/relocation/lex.ma". include "basic_2/rt_computation/cpxs_ext.ma". (* UNBOUND PARALLEL RT-COMPUTATION FOR FULL LOCAL ENVIRONMENTS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_drops.ma index 0482e3d19..9578dad4e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_lex.ma". +include "static_2/relocation/drops_lex.ma". include "basic_2/rt_computation/cpxs_drops.ma". (* UNBOUND PARALLEL RT-COMPUTATION FOR FULL LOCAL ENVIRONMENTS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_fdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_fdeq.ma index 3a280f96f..8a5676cc0 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_fdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq.ma". +include "static_2/static/fdeq.ma". include "basic_2/rt_computation/lpxs_rdeq.ma". (* UNBOUND PARALLEL RT-COMPUTATION FOR FULL LOCAL ENVIRONMENTS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_length.ma index 46dbd458d..fd664b95c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_length.ma". +include "static_2/relocation/lex_length.ma". include "basic_2/rt_computation/lpxs.ma". (* UNBOUND PARALLEL RT-COMPUTATION FOR FULL LOCAL ENVIRONMENTS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpx.ma index 96def5301..52a418617 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpx.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_tc.ma". +include "static_2/relocation/lex_tc.ma". include "basic_2/rt_computation/cpxs_lpx.ma". include "basic_2/rt_computation/lpxs.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpxs.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpxs.ma index 861762abd..e20b65982 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpxs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/lpxs_lpxs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_lex.ma". +include "static_2/relocation/lex_lex.ma". include "basic_2/rt_computation/lpxs_lpx.ma". (* UNBOUND PARALLEL RT-COMPUTATION FOR FULL LOCAL ENVIRONMENTS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx.ma index 3ec296cfa..5b62dbae1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtysnstrong_5.ma". -include "basic_2/static/rdeq.ma". +include "static_2/static/rdeq.ma". include "basic_2/rt_transition/lpx.ma". (* STRONGLY NORMALIZING REFERRED LOCAL ENV.S FOR UNBOUND RT-TRANSITION ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_drops.ma index 6f0cc4da0..ed5e99053 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_drops.ma". +include "static_2/static/rdeq_drops.ma". include "basic_2/rt_transition/lpx_drops.ma". include "basic_2/rt_computation/rdsx_length.ma". include "basic_2/rt_computation/rdsx_fqup.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_fqup.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_fqup.ma index 6216111e0..2913cb998 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_fqup.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_fqup.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_fqup.ma". +include "static_2/static/rdeq_fqup.ma". include "basic_2/rt_computation/rdsx.ma". (* STRONGLY NORMALIZING REFERRED LOCAL ENV.S FOR UNBOUND RT-TRANSITION ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_length.ma index e6ccab06a..22451994b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/rdsx_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_length.ma". +include "static_2/static/rdeq_length.ma". include "basic_2/rt_transition/lpx_length.ma". include "basic_2/rt_computation/rdsx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx.ma index 5aa9c9710..13e746d7f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtynormal_5.ma". -include "basic_2/syntax/tdeq.ma". +include "static_2/syntax/tdeq.ma". include "basic_2/rt_transition/cpx.ma". (* NORMAL TERMS FOR UNBOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION ********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx_drops.ma index c2479807a..2e593f991 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cnx_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_tdeq.ma". +include "static_2/relocation/lifts_tdeq.ma". include "basic_2/rt_transition/cpx_drops.ma". include "basic_2/rt_transition/cnx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma index f640625ca..0ca16ee93 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma @@ -15,10 +15,10 @@ include "ground_2/steps/rtc_max.ma". include "ground_2/steps/rtc_plus.ma". include "basic_2/notation/relations/predty_7.ma". -include "basic_2/syntax/item_sh.ma". -include "basic_2/syntax/lenv.ma". -include "basic_2/syntax/genv.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/syntax/item_sh.ma". +include "static_2/syntax/lenv.ma". +include "static_2/syntax/genv.ma". +include "static_2/relocation/lifts.ma". (* BOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS *****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_drops.ma index 8a5f96f91..a98e061f3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_drops.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_drops.ma". -include "basic_2/s_computation/fqup_weight.ma". -include "basic_2/s_computation/fqup_drops.ma". +include "static_2/relocation/drops_drops.ma". +include "static_2/s_computation/fqup_weight.ma". +include "static_2/s_computation/fqup_drops.ma". include "basic_2/rt_transition/cpg.ma". (* BOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS *****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_lsubr.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_lsubr.ma index fcb9275a1..ed99d317a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_lsubr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_lsubr.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubr.ma". +include "static_2/static/lsubr.ma". include "basic_2/rt_transition/cpg.ma". (* BOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS *****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma index c914decba..39228c247 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_simple.ma". +include "static_2/syntax/term_simple.ma". include "basic_2/rt_transition/cpg.ma". (* BOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS *****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_ext.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_ext.ma index c76a80fcc..3e3020fc3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_ext.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cext2.ma". +include "static_2/syntax/cext2.ma". include "basic_2/rt_transition/cpm.ma". (* CONTEXT-SENSITIVE PARALLEL R-TRANSITION FOR BINDERS **********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_ext.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_ext.ma index a12c86faa..9e6020a22 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_ext.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cext2.ma". +include "static_2/syntax/cext2.ma". include "basic_2/rt_transition/cpx.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR BINDERS *************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fdeq.ma index 3a86118e1..5124d8684 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq.ma". +include "static_2/static/fdeq.ma". include "basic_2/rt_transition/cpx_rdeq.ma". include "basic_2/rt_transition/rpx_rdeq.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fqus.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fqus.ma index e4c7db152..c500be141 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fqus.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_fqus.ma @@ -14,8 +14,8 @@ (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS ***************) -include "basic_2/relocation/lifts_tdeq.ma". -include "basic_2/s_computation/fqus_fqup.ma". +include "static_2/relocation/lifts_tdeq.ma". +include "static_2/s_computation/fqus_fqup.ma". include "basic_2/rt_transition/cpx_drops.ma". include "basic_2/rt_transition/cpx_lsubr.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_rdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_rdeq.ma index 1f5e4a9bb..33f937a22 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_rdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_rdeq.ma". +include "static_2/static/rdeq_rdeq.ma". include "basic_2/rt_transition/rpx_fsle.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_req.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_req.ma index 44dcfb53c..a836bfbea 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_req.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpx_req.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/req.ma". +include "static_2/static/req.ma". include "basic_2/rt_transition/rpx_fsle.ma". (* UNBOUND CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb.ma index 6d163a685..51c414112 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "basic_2/notation/relations/predsubtyproper_8.ma". -include "basic_2/s_transition/fqu.ma". -include "basic_2/static/rdeq.ma". +include "static_2/s_transition/fqu.ma". +include "static_2/static/rdeq.ma". include "basic_2/rt_transition/lpr_lpx.ma". (* PROPER PARALLEL RST-TRANSITION FOR CLOSURES ******************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_fdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_fdeq.ma index 4aaf35624..a0d041980 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_fdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fqu_tdeq.ma". -include "basic_2/static/fdeq.ma". +include "static_2/s_transition/fqu_tdeq.ma". +include "static_2/static/fdeq.ma". include "basic_2/rt_transition/fpb_rdeq.ma". (* PROPER PARALLEL RST-TRANSITION FOR CLOSURES ******************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_rdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_rdeq.ma index 6f9a66c72..eab2408fe 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpb_rdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_fqus.ma". +include "static_2/static/rdeq_fqus.ma". include "basic_2/rt_transition/cpx_rdeq.ma". include "basic_2/rt_transition/lpx_rdeq.ma". include "basic_2/rt_transition/fpb.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq.ma index 12bd824fa..a652d5c18 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "basic_2/notation/relations/predsubty_8.ma". -include "basic_2/static/fdeq.ma". -include "basic_2/s_transition/fquq.ma". +include "static_2/static/fdeq.ma". +include "static_2/s_transition/fquq.ma". include "basic_2/rt_transition/lpr_lpx.ma". (* PARALLEL RST-TRANSITION FOR CLOSURES *************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq_aaa.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq_aaa.ma index 55b946e58..7f539a77c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq_aaa.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/fpbq_aaa.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa_fqus.ma". -include "basic_2/static/aaa_fdeq.ma". +include "static_2/static/aaa_fqus.ma". +include "static_2/static/aaa_fdeq.ma". include "basic_2/rt_transition/lpx_aaa.ma". include "basic_2/rt_transition/fpbq.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr.ma index e983823c1..f69cb5e67 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predsn_4.ma". -include "basic_2/relocation/lex.ma". +include "static_2/relocation/lex.ma". include "basic_2/rt_transition/cpr_ext.ma". (* PARALLEL R-TRANSITION FOR FULL LOCAL ENVIRONMENTS ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_drops.ma index 2deb80367..b781f4f22 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_lex.ma". +include "static_2/relocation/drops_lex.ma". include "basic_2/rt_transition/cpm_drops.ma". include "basic_2/rt_transition/lpr.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_fquq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_fquq.ma index 70c4f676d..e1256efc5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_fquq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_fquq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fquq.ma". +include "static_2/s_transition/fquq.ma". include "basic_2/rt_transition/cpm_drops.ma". include "basic_2/rt_transition/cpm_lsubr.ma". include "basic_2/rt_transition/cpr.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_length.ma index a00bda146..51f2da5f2 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_length.ma". +include "static_2/relocation/lex_length.ma". include "basic_2/rt_transition/lpr.ma". (* PARALLEL R-TRANSITION FOR FULL LOCAL ENVIRONMENTS ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_lpr.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_lpr.ma index a4b3e42c3..3726639cd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_lpr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpr_lpr.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_lex.ma". +include "static_2/relocation/lex_lex.ma". include "basic_2/rt_transition/cpm_lsubr.ma". include "basic_2/rt_transition/cpr.ma". include "basic_2/rt_transition/cpr_drops.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx.ma index db127642d..ae782872c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtysn_4.ma". -include "basic_2/relocation/lex.ma". +include "static_2/relocation/lex.ma". include "basic_2/rt_transition/cpx_ext.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR FULL LOCAL ENVIRONMENTS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_aaa.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_aaa.ma index 1091f0f9a..aaa4e94e7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_aaa.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_aaa.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa_drops.ma". -include "basic_2/static/lsuba_aaa.ma". +include "static_2/static/aaa_drops.ma". +include "static_2/static/lsuba_aaa.ma". include "basic_2/rt_transition/lpx_drops.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR FULL LOCAL ENVIRONMENTS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_drops.ma index 330ddecc4..21577aab4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_drops.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_lex.ma". +include "static_2/relocation/drops_lex.ma". include "basic_2/rt_transition/cpx_drops.ma". include "basic_2/rt_transition/lpx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_fquq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_fquq.ma index 2df357c91..11ae99e7d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_fquq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_fquq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fquq.ma". +include "static_2/s_transition/fquq.ma". include "basic_2/rt_transition/lpx.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR FULL LOCAL ENVIRONMENTS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_length.ma index 1c8a2b9b6..29b3e5e46 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_length.ma". +include "static_2/relocation/lex_length.ma". include "basic_2/rt_transition/lpx.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR FULL LOCAL ENVIRONMENTS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_rdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_rdeq.ma index f63af0dcf..583214a04 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/lpx_rdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_req.ma". +include "static_2/static/rdeq_req.ma". include "basic_2/rt_transition/rpx_rdeq.ma". include "basic_2/rt_transition/rpx_lpx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx.ma index 76364b2f1..f45abc6d7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/predtysn_5.ma". -include "basic_2/static/rex.ma". +include "static_2/static/rex.ma". include "basic_2/rt_transition/cpx_ext.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR REFERRED LOCAL ENVIRONMENTS ***********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fqup.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fqup.ma index 1b49ca7d3..8a71e9b6a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fqup.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fqup.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_fqup.ma". +include "static_2/static/rex_fqup.ma". include "basic_2/rt_transition/rpx.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR REFERRED LOCAL ENVIRONMENTS ***********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fsle.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fsle.ma index 05b8ba41c..d26a5d557 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fsle.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_fsle.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/fsle_drops.ma". -include "basic_2/static/rex_fsle.ma". +include "static_2/static/fsle_drops.ma". +include "static_2/static/rex_fsle.ma". include "basic_2/rt_transition/rpx_length.ma". include "basic_2/rt_transition/rpx_fqup.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_length.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_length.ma index fe095d1df..209b010ed 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_length.ma". +include "static_2/static/rex_length.ma". include "basic_2/rt_transition/rpx.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR REFERRED LOCAL ENVIRONMENTS ***********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_lpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_lpx.ma index 585078496..24e840b1f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_lpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_lpx.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_lex.ma". +include "static_2/static/rex_lex.ma". include "basic_2/rt_transition/rpx_fsle.ma". include "basic_2/rt_transition/lpx.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rdeq.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rdeq.ma index e2513c96f..42478e2b6 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_fqup.ma". -include "basic_2/static/rdeq_rdeq.ma". +include "static_2/static/rdeq_fqup.ma". +include "static_2/static/rdeq_rdeq.ma". include "basic_2/rt_transition/rpx_fsle.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR REFERRED LOCAL ENVIRONMENTS ***********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rpx.ma index b5ccfa88c..56899e45d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/rpx_rpx.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_rex.ma". +include "static_2/static/rex_rex.ma". include "basic_2/rt_transition/rpx.ma". (* UNBOUND PARALLEL RT-TRANSITION FOR REFERRED LOCAL ENVIRONMENTS ***********) 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 7d94ab507..205227ec5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl +++ b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl @@ -119,155 +119,6 @@ table { ] } ] - class "water" - [ { "iterated static typing" * } { - [ { "iterated generic extension of a context-sensitive relation" * } { - [ [ "for lenvs on referred entries" ] "rexs" + "( ? ⪤*[?,?] ? )" "rexs_length" + "rexs_lex" + "rexs_drops" + "rexs_fqup" + "rexs_rexs" * ] - } - ] - } - ] - class "green" - [ { "static typing" * } { - [ { "generic reducibility" * } { - [ [ "restricted refinement for lenvs" ] "lsubc" + "( ? ⊢ ? ⫃[?] ? )" "lsubc_drops" + "lsubc_lsubr" + "lsubc_lsuba" * ] - [ [ "candidates" ] "gcp_cr" + "( ⦃?,?,?⦄ ϵ[?] 〚?〛 )" "gcp_aaa" * ] - [ [ "computation properties" ] "gcp" *] - } - ] - [ { "atomic arity assignment" * } { - [ [ "restricted refinement for lenvs" ] "lsuba" + "( ? ⊢ ? ⫃⁝ ? )" "lsuba_drops" + "lsuba_lsubr" + "lsuba_aaa" + "lsuba_lsuba" * ] - [ [ "for terms" ] "aaa" + "( ⦃?,?⦄ ⊢ ? ⁝ ? )" "aaa_drops" + "aaa_fqus" + "aaa_rdeq" + "aaa_fdeq" + "aaa_aaa" * ] - } - ] - [ { "degree-based equivalence" * } { - [ [ "for closures on referred entries" ] "fdeq" + "( ⦃?,?,?⦄ ≛[?,?] ⦃?,?,?⦄ )" "fdeq_fqup" + "fdeq_fqus" + "fdeq_req" + "fdeq_fdeq" * ] - [ [ "for lenvs on referred entries" ] "rdeq" + "( ? ≛[?,?,?] ? )" "rdeq_length" + "rdeq_drops" + "rdeq_fqup" + "rdeq_fqus" + "rdeq_req" + "rdeq_rdeq" * ] - } - ] - [ { "syntactic equivalence" * } { - [ [ "for lenvs on referred entries" ] "req" + "( ? ≡[?] ? )" "req_fqup" + "req_fsle" * ] - } - ] - [ { "generic extension of a context-sensitive relation" * } { - [ [ "for lenvs on referred entries" ] "rex" + "( ? ⪤[?,?] ? )" "rex_length" + "rex_lex" + "rex_drops" + "rex_fqup" + "rex_fsle" + "rex_rex" * ] - } - ] - [ { "context-sensitive free variables" * } { - [ [ "inclusion for restricted closures" ] "fsle" + "( ⦃?,?⦄ ⊆ ⦃?,?⦄ )" "fsle_length" + "fsle_drops" + "fsle_fqup" + "fsle_fsle" * ] - [ [ "restricted refinement for lenvs" ] "lsubf" + "( ⦃?,?⦄ ⫃𝐅* ⦃?,?⦄ )" "lsubf_lsubr" + "lsubf_frees" + "lsubf_lsubf" * ] - [ [ "for terms" ] "frees" + "( ? ⊢ 𝐅*⦃?⦄ ≘ ? )" "frees_append" + "frees_drops" + "frees_fqup" + "frees_frees" * ] - } - ] - [ { "local environments" * } { - [ [ "restricted refinement" ] "lsubr" + "( ? ⫃ ? )" "lsubr_length" + "lsubr_drops" + "lsubr_lsubr" * ] - } - ] - } - ] - class "grass" - [ { "s-computation" * } { - [ { "iterated structural successor" * } { - [ [ "for closures" ] "fqus" + "( ⦃?,?,?⦄ ⊐*[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐* ⦃?,?,?⦄ )" "fqus_weight" + "fqus_drops" + "fqus_fqup" + "fqus_fqus" * ] - [ [ "proper for closures" ] "fqup" + "( ⦃?,?,?⦄ ⊐+[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐+ ⦃?,?,?⦄ )" "fqup_weight" + "fqup_drops" + "fqup_fqup" * ] - } - ] - } - ] - class "yellow" - [ { "s-transition" * } { - [ { "structural successor" * } { - [ [ "for closures" ] "fquq" + "( ⦃?,?,?⦄ ⊐⸮[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐⸮ ⦃?,?,?⦄ )" "fquq_length" + "fquq_weight" * ] - [ [ "proper for closures" ] "fqu" + "( ⦃?,?,?⦄ ⊐[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐ ⦃?,?,?⦄ )" "fqu_length" + "fqu_weight" + "fqu_tdeq" * ] - } - ] - } - ] - class "orange" - [ { "relocation" * } { - [ { "generic slicing" * } { - [ [ "for lenvs" ] "drops" + "( ⬇*[?,?] ? ≘ ? )" + "( ⬇*[?] ? ≘ ? )" "drops_ctc" + "drops_ltc" + "drops_weight" + "drops_length" + "drops_cext2" + "drops_sex" + "drops_lex" + "drops_seq" + "drops_drops" + "drops_vector" * ] - } - ] - [ { "generic relocation" * } { - [ [ "for binders" ] "lifts_bind" + "( ⬆*[?] ? ≘ ? )" "lifts_weight_bind" + "lifts_lifts_bind" * ] - [ [ "for term vectors" ] "lifts_vector" + "( ⬆*[?] ? ≘ ? )" "lifts_lifts_vector" * ] - [ [ "for terms" ] "lifts" + "( ⬆*[?] ? ≘ ? )" "lifts_simple" + "lifts_weight" + "lifts_tdeq" + "lifts_lifts" * ] - } - ] - [ { "syntactic equivalence" * } { - [ [ "for lenvs on selected entries" ] "seq" + "( ? ≡[?] ? )" "seq_length" + "seq_seq" * ] - } - ] - [ { "generic entrywise extension" * } { - [ [ "for lenvs of one contex-sensitive relation" ] "lex" + "( ? ⪤[?] ? )" "lex_tc" + "lex_length" + "lex_lex" * ] - [ [ "for lenvs of two contex-sensitive relations" ] "sex" + "( ? ⪤[?,?,?] ? )" "sex_tc" + "sex_length" + "sex_sex" * ] - } - ] - } - ] - class "red" - [ { "syntax" * } { - [ { "equivalence up to exclusion binders" * } { - [ [ "for lenvs" ] "lveq" + "( ? ≋ⓧ*[?,?] ? )" "lveq_length" + "lveq_lveq" * ] - } - ] - [ { "append" * } { - [ [ "for lenvs" ] "append" + "( ? + ? )" "append_length" * ] - } - ] - [ { "head equivalence" * } { - [ [ "for terms" ] "theq" + "( ? ⩳[?,?] ? )" "theq_simple" + "theq_tdeq" + "theq_theq" + "theq_simple_vector" * ] - } - ] - [ { "degree-based equivalence" * } { - [ [ "" ] "tdeq_ext" + "( ? ≛[?,?] ? )" + "( ? ⊢ ? ≛[?,?] ? )" * ] - [ [ "" ] "tdeq" + "( ? ≛[?,?] ? )" "tdeq_tdeq" * ] - } - ] - [ { "closures" * } { - [ [ "" ] "cl_weight" + "( ♯{?,?,?} )" * ] - [ [ "" ] "cl_restricted_weight" + "( ♯{?,?} )" * ] - } - ] - [ { "global environments" * } { - [ [ "" ] "genv_length" + "( |?| )" * ] - [ [ "" ] "genv_weight" + "( ♯{?} )" * ] - [ [ "" ] "genv" * ] - } - ] - [ { "local environments" * } { - [ [ "" ] "ceq_ext" "ceq_ext_ceq_ext" * ] - [ [ "" ] "cext2" * ] - [ [ "" ] "lenv_length" + "( |?| )" * ] - [ [ "" ] "lenv_weight" + "( ♯{?} )" * ] - [ [ "" ] "lenv" * ] - } - ] - [ { "binders for local environments" * } { - [ [ "" ] "ext2" "ext2_tc" + "ext2_ext2" * ] - [ [ "" ] "bind" "bind_weight" * ] - } - ] - [ { "terms" * } { - [ [ "" ] "term_vector" + "( Ⓐ?.? )" * ] - [ [ "" ] "term_simple" + "( 𝐒⦃?⦄ )" * ] - [ [ "" ] "term_weight" + "( ♯{?} )" * ] - [ [ "" ] "term" * ] - } - ] - [ { "items" * } { - [ [ "" ] "item_sd" * ] - [ [ "" ] "item_sh" * ] - [ [ "" ] "item" * ] - } - ] - [ { "atomic arities" * } { - [ [ "" ] "aarity" * ] - } - ] - } - ] } class "top" { * } diff --git a/matita/matita/contribs/lambdadelta/compile_static.sh b/matita/matita/contribs/lambdadelta/compile_static.sh deleted file mode 100644 index 827c52e18..000000000 --- a/matita/matita/contribs/lambdadelta/compile_static.sh +++ /dev/null @@ -1 +0,0 @@ -../../matitac.opt `cat static.txt` diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/arith.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/arith.ma index 1c13de648..dde95e8a7 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/lib/arith.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/lib/arith.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "ground_2/notation/constructors/uparrow_1.ma". +include "ground_2/notation/functions/uparrow_1.ma". include "ground_2/notation/functions/downarrow_1.ma". include "arithmetics/nat.ma". include "ground_2/lib/relations.ma". diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/bool.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/bool.ma index 01f2780ff..7dd817f97 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/lib/bool.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/lib/bool.ma @@ -14,8 +14,8 @@ include "basics/bool.ma". include "ground_2/lib/relations.ma". -include "ground_2/notation/constructors/no_0.ma". -include "ground_2/notation/constructors/yes_0.ma". +include "ground_2/notation/functions/no_0.ma". +include "ground_2/notation/functions/yes_0.ma". (* BOOLEAN PROPERTIES *******************************************************) diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/list.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/list.ma index 07e13ea8f..fb643311a 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/lib/list.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/lib/list.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "ground_2/notation/constructors/circledE_1.ma". -include "ground_2/notation/constructors/oplusright_3.ma". +include "ground_2/notation/functions/circledE_1.ma". +include "ground_2/notation/functions/oplusright_3.ma". include "ground_2/lib/relations.ma". (* LISTS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/ground_2/lib/streams.ma b/matita/matita/contribs/lambdadelta/ground_2/lib/streams.ma index a308e5481..e1b3a6812 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/lib/streams.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/lib/streams.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "ground_2/notation/constructors/oplusright_3.ma". +include "ground_2/notation/functions/oplusright_3.ma". include "ground_2/lib/relations.ma". (* STREAMS ******************************************************************) diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/circledE_1.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/circledE_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/circledE_1.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/circledE_1.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/diamond_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/diamond_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/diamond_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/diamond_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/infinity_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/infinity_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/infinity_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/infinity_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/no_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/no_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/no_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/no_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/onezero_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/onezero_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/onezero_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/onezero_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/oplusright_3.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/oplusright_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/oplusright_3.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/oplusright_3.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/semicolon_3.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/semicolon_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/semicolon_3.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/semicolon_3.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/tuple_4.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/tuple_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/tuple_4.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/tuple_4.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/uparrow_1.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/uparrow_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/uparrow_1.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/uparrow_1.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/yes_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/yes_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/yes_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/yes_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/zeroone_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/zeroone_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/zeroone_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/zeroone_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/notation/constructors/zerozero_0.ma b/matita/matita/contribs/lambdadelta/ground_2/notation/functions/zerozero_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/ground_2/notation/constructors/zerozero_0.ma rename to matita/matita/contribs/lambdadelta/ground_2/notation/functions/zerozero_0.ma diff --git a/matita/matita/contribs/lambdadelta/ground_2/relocation/mr2.ma b/matita/matita/contribs/lambdadelta/ground_2/relocation/mr2.ma index b6062f295..6efc427c8 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/relocation/mr2.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/relocation/mr2.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "ground_2/notation/constructors/diamond_0.ma". -include "ground_2/notation/constructors/semicolon_3.ma". +include "ground_2/notation/functions/diamond_0.ma". +include "ground_2/notation/functions/semicolon_3.ma". include "ground_2/lib/arith.ma". (* MULTIPLE RELOCATION WITH PAIRS *******************************************) diff --git a/matita/matita/contribs/lambdadelta/ground_2/steps/rtc.ma b/matita/matita/contribs/lambdadelta/ground_2/steps/rtc.ma index 87c091b19..1e08d2474 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/steps/rtc.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/steps/rtc.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "ground_2/notation/constructors/tuple_4.ma". -include "ground_2/notation/constructors/zerozero_0.ma". -include "ground_2/notation/constructors/zeroone_0.ma". -include "ground_2/notation/constructors/onezero_0.ma". +include "ground_2/notation/functions/tuple_4.ma". +include "ground_2/notation/functions/zerozero_0.ma". +include "ground_2/notation/functions/zeroone_0.ma". +include "ground_2/notation/functions/onezero_0.ma". include "ground_2/lib/arith.ma". (* RT-TRANSITION COUNTER ****************************************************) diff --git a/matita/matita/contribs/lambdadelta/ground_2/ynat/ynat.ma b/matita/matita/contribs/lambdadelta/ground_2/ynat/ynat.ma index 7e2c2dc6c..4f3f85bb9 100644 --- a/matita/matita/contribs/lambdadelta/ground_2/ynat/ynat.ma +++ b/matita/matita/contribs/lambdadelta/ground_2/ynat/ynat.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/lib/arith.ma". -include "ground_2/notation/constructors/infinity_0.ma". +include "ground_2/notation/functions/infinity_0.ma". (* NATURAL NUMBERS WITH INFINITY ********************************************) diff --git a/matita/matita/contribs/lambdadelta/partial.txt b/matita/matita/contribs/lambdadelta/partial.txt index 40cb2929d..9ab2c9283 100644 --- a/matita/matita/contribs/lambdadelta/partial.txt +++ b/matita/matita/contribs/lambdadelta/partial.txt @@ -1,10 +1,5 @@ ground_2 -basic_2/syntax -basic_2/relocation -basic_2/s_transition -basic_2/s_computation -basic_2/static -basic_2/i_static +static_2 basic_2/rt_transition basic_2/rt_computation basic_2/rt_conversion diff --git a/matita/matita/contribs/lambdadelta/replace.sh b/matita/matita/contribs/lambdadelta/replace.sh index 291dc454a..fcc328a85 100644 --- a/matita/matita/contribs/lambdadelta/replace.sh +++ b/matita/matita/contribs/lambdadelta/replace.sh @@ -1,5 +1,5 @@ #!/bin/sh -for SRC in `find ground_2 basic_2 apps_2 -name "*.ma" -or -name "*.tbl"`; do +for SRC in `find grond_2 static_2 basic_2 apps_2 -name "*.ma" -or -name "*.tbl"`; do sed "s!$1!$2!g" ${SRC} > ${SRC}.new if [ ! -s ${SRC}.new ] || diff ${SRC} ${SRC}.new > /dev/null; then rm -f ${SRC}.new; diff --git a/matita/matita/contribs/lambdadelta/static.txt b/matita/matita/contribs/lambdadelta/static.txt deleted file mode 100644 index 7596031ba..000000000 --- a/matita/matita/contribs/lambdadelta/static.txt +++ /dev/null @@ -1,7 +0,0 @@ -ground_2 -basic_2/syntax -basic_2/relocation -basic_2/s_transition -basic_2/s_computation -basic_2/static -basic_2/i_static diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs.ma index e8bd0a2bd..8beb5bc3f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/notation/relations/relationstar_4.ma". -include "basic_2/static/rex.ma". +include "static_2/notation/relations/relationstar_4.ma". +include "static_2/static/rex.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_drops.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_drops.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs_drops.ma index 3ace3be2e..0b83c6431 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_drops.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/seq_seq.ma". -include "basic_2/static/rex_drops.ma". -include "basic_2/i_static/rexs.ma". +include "static_2/relocation/seq_seq.ma". +include "static_2/static/rex_drops.ma". +include "static_2/i_static/rexs.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_fqup.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs_fqup.ma index ad5adc659..c21d82017 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_fqup.ma". -include "basic_2/i_static/rexs.ma". +include "static_2/static/rex_fqup.ma". +include "static_2/i_static/rexs.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_length.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_length.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs_length.ma index 9b1e1263b..a5c82f9f5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_length.ma". -include "basic_2/i_static/rexs.ma". +include "static_2/static/rex_length.ma". +include "static_2/i_static/rexs.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_lex.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_lex.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_lex.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs_lex.ma index c46649efe..4ac00b7a1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_lex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_lex.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex_tc.ma". -include "basic_2/static/req_fqup.ma". -include "basic_2/static/req_fsle.ma". -include "basic_2/i_static/rexs_fqup.ma". +include "static_2/relocation/lex_tc.ma". +include "static_2/static/req_fqup.ma". +include "static_2/static/req_fsle.ma". +include "static_2/i_static/rexs_fqup.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_rexs.ma b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_rexs.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_rexs.ma rename to matita/matita/contribs/lambdadelta/static_2/i_static/rexs_rexs.ma index 7b0b83d48..2a1a9b0d8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/i_static/rexs_rexs.ma +++ b/matita/matita/contribs/lambdadelta/static_2/i_static/rexs_rexs.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_fsle.ma". -include "basic_2/i_static/rexs.ma". +include "static_2/static/rex_fsle.ma". +include "static_2/i_static/rexs.ma". (* ITERATED EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ***) diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxabbr_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxabbr_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxabst_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxabst_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind1_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxbind1_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind1_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxbind1_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxbind2_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxbind2_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxitem_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxitem_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxitem_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxitem_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxvoid_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/dxvoid_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxvoid_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/dxvoid_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/gref_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/gref_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/gref_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/gref_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/item0_0.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/item0_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/item0_0.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/item0_0.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/item0_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/item0_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/item0_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/item0_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/lref_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/lref_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/lref_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/lref_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snabbr_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbr_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snabbr_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbr_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbr_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbr_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbr_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbr_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbrneg_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbrneg_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbrneg_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbrneg_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbrpos_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbrpos_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabbrpos_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabbrpos_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snabst_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabst_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snabst_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabst_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabst_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabst_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabst_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabst_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabstneg_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabstneg_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabstneg_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabstneg_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabstpos_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snabstpos_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snabstpos_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snabstpos_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snappl_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snappl_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snappl_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snappl_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snapplvector_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snapplvector_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snapplvector_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snapplvector_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snbind1_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind1_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snbind1_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind1_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snbind2_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snbind2_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2neg_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2neg_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2neg_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2neg_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2pos_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2pos_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snbind2pos_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snbind2pos_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/sncast_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/sncast_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/sncast_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/sncast_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snflat2_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snflat2_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snflat2_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snflat2_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snitem2_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem2_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snitem2_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem2_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snitem2_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem2_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/snitem2_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem2_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snitem_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snitem_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snitem_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/snvoid_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/snvoid_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/snvoid_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/snvoid_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/star_0.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/star_0.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/star_0.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/star_0.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/star_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/star_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/constructors/star_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/star_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/functions/weight_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/functions/weight_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/atomicarity_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/atomicarity_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/atomicarity_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/atomicarity_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/freestar_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/freestar_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/freestar_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/freestar_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/ideqsn_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/ideqsn_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/ideqsn_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/ideqsn_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/ineint_5.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/ineint_5.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/ineint_5.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/ineint_5.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqa_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqa_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqa_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqa_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqc_2.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqc_2.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqc_2.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqc_2.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqc_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqc_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqc_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqc_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqf_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqf_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqf_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/lrsubeqf_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/rdropstar_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/rdropstar_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/rdropstar_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/rdropstar_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/rdropstar_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/rdropstar_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/rdropstar_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/rdropstar_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_5.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_5.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/relation_5.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/relation_5.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/relationstar_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/relationstar_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/relationstar_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/relationstar_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/rliftstar_3.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/rliftstar_3.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/rliftstar_3.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/rliftstar_3.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/simple_1.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/simple_1.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/simple_1.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/simple_1.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareq_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/stareq_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareq_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/stareq_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareq_5.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/stareq_5.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareq_5.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/stareq_5.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareqsn_5.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/stareqsn_5.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareqsn_5.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/stareqsn_5.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareqsn_8.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/stareqsn_8.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/stareqsn_8.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/stareqsn_8.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/subseteq_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/subseteq_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/subseteq_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/subseteq_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/supterm_6.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/supterm_6.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/supterm_6.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/supterm_6.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/supterm_7.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/supterm_7.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/supterm_7.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/supterm_7.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermopt_6.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermopt_6.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermopt_6.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermopt_6.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermopt_7.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermopt_7.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermopt_7.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermopt_7.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermplus_6.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermplus_6.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermplus_6.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermplus_6.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermplus_7.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermplus_7.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermplus_7.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermplus_7.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermstar_6.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermstar_6.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermstar_6.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermstar_6.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermstar_7.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermstar_7.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/suptermstar_7.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/suptermstar_7.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/topiso_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/topiso_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/topiso_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/topiso_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/voidstareq_4.ma b/matita/matita/contribs/lambdadelta/static_2/notation/relations/voidstareq_4.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/voidstareq_4.ma rename to matita/matita/contribs/lambdadelta/static_2/notation/relations/voidstareq_4.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops.ma index f982cb1a6..939aeb534 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops.ma @@ -13,10 +13,10 @@ (**************************************************************************) include "ground_2/relocation/rtmap_coafter.ma". -include "basic_2/notation/relations/rdropstar_3.ma". -include "basic_2/notation/relations/rdropstar_4.ma". -include "basic_2/relocation/seq.ma". -include "basic_2/relocation/lifts_bind.ma". +include "static_2/notation/relations/rdropstar_3.ma". +include "static_2/notation/relations/rdropstar_4.ma". +include "static_2/relocation/seq.ma". +include "static_2/relocation/lifts_bind.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_cext2.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_cext2.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_cext2.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_cext2.ma index f2a857d64..c55f9332f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_cext2.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_cext2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops.ma". +include "static_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ctc.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_ctc.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ctc.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_ctc.ma index de5d1ce48..acd929c41 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ctc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_ctc.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/relocation/seq_seq.ma". +include "static_2/relocation/seq_seq.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_drops.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_drops.ma index 8549cf02a..1c44ed555 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_lifts_bind.ma". -include "basic_2/relocation/drops_weight.ma". +include "static_2/relocation/lifts_lifts_bind.ma". +include "static_2/relocation/drops_weight.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_length.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_length.ma index 7543a5559..94085a331 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/relocation/drops.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_lex.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_lex.ma index 793ed1810..1e33fc3d8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_lex.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex.ma". -include "basic_2/relocation/drops_cext2.ma". -include "basic_2/relocation/drops_sex.ma". +include "static_2/relocation/lex.ma". +include "static_2/relocation/drops_cext2.ma". +include "static_2/relocation/drops_sex.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ltc.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_ltc.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ltc.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_ltc.ma index 62ae1ecc6..d2ca57bba 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_ltc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_ltc.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/lib/ltc.ma". -include "basic_2/relocation/seq_seq.ma". +include "static_2/relocation/seq_seq.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_seq.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_seq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_seq.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_seq.ma index a722d46e7..94beb0a71 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_seq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_seq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_sex.ma". +include "static_2/relocation/drops_sex.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_sex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_sex.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_sex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_sex.ma index 5f5dfdb3c..e1263a2fd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_sex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_sex.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_lifts_bind.ma". -include "basic_2/relocation/drops.ma". +include "static_2/relocation/lifts_lifts_bind.ma". +include "static_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_vector.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_vector.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_vector.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_vector.ma index 6a7560248..8c43b6404 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_vector.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_vector.ma". -include "basic_2/relocation/drops.ma". +include "static_2/relocation/lifts_vector.ma". +include "static_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/drops_weight.ma index 3b75c89f6..dfcb44500 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/drops_weight.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cl_restricted_weight.ma". -include "basic_2/relocation/lifts_weight_bind.ma". -include "basic_2/relocation/drops.ma". +include "static_2/syntax/cl_restricted_weight.ma". +include "static_2/relocation/lifts_weight_bind.ma". +include "static_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lex.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lex.ma index 7e6aeae49..1900d273d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lex.ma @@ -15,9 +15,9 @@ include "ground_2/pull/pull_2.ma". include "ground_2/pull/pull_4.ma". include "ground_2/relocation/rtmap_uni.ma". -include "basic_2/notation/relations/relation_3.ma". -include "basic_2/syntax/cext2.ma". -include "basic_2/relocation/sex.ma". +include "static_2/notation/relations/relation_3.ma". +include "static_2/syntax/cext2.ma". +include "static_2/relocation/sex.ma". (* GENERIC EXTENSION OF A CONTEXT-SENSITIVE REALTION FOR TERMS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_length.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lex_length.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lex_length.ma index 4f77163fe..053070fa5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/sex_length.ma". -include "basic_2/relocation/lex.ma". +include "static_2/relocation/sex_length.ma". +include "static_2/relocation/lex.ma". (* GENERIC EXTENSION OF A CONTEXT-SENSITIVE REALTION FOR TERMS **************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_lex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_lex.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lex_lex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lex_lex.ma index e8b30f23d..24bfebe65 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_lex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_lex.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex.ma". +include "static_2/relocation/lex.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_tc.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_tc.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lex_tc.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lex_tc.ma index 00b9db820..5dadd4e18 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lex_tc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lex_tc.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ext2_tc.ma". -include "basic_2/relocation/sex_tc.ma". -include "basic_2/relocation/lex.ma". +include "static_2/syntax/ext2_tc.ma". +include "static_2/relocation/sex_tc.ma". +include "static_2/relocation/lex.ma". alias symbol "subseteq" = "relation inclusion". diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts.ma index 5198b2d58..56f69a641 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts.ma @@ -14,8 +14,8 @@ (**************************************************************************) include "ground_2/relocation/nstream_after.ma". -include "basic_2/notation/relations/rliftstar_3.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/relations/rliftstar_3.ma". +include "static_2/syntax/term.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_bind.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_bind.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_bind.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_bind.ma index fd56f4e69..10630903b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_bind.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_bind.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ext2.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/syntax/ext2.ma". +include "static_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR BINDERS *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts.ma index 9d7fc61bf..41c641716 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts.ma". +include "static_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_bind.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_bind.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_bind.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_bind.ma index e1647b35b..e08ce9962 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_bind.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_bind.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_lifts.ma". -include "basic_2/relocation/lifts_bind.ma". +include "static_2/relocation/lifts_lifts.ma". +include "static_2/relocation/lifts_bind.ma". (* GENERIC RELOCATION FOR BINDERS *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_vector.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_vector.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_vector.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_vector.ma index 26a4fbede..033de1fb4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_lifts_vector.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_lifts_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_lifts.ma". -include "basic_2/relocation/lifts_vector.ma". +include "static_2/relocation/lifts_lifts.ma". +include "static_2/relocation/lifts_vector.ma". (* GENERIC RELOCATION FOR TERM VECTORS *************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_simple.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_simple.ma index 7d436c7b7..115a0b473 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_simple.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_simple.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/syntax/term_simple.ma". +include "static_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_tdeq.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_tdeq.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_tdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_tdeq.ma index 828ee58a9..0b0dbf92f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_tdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_tdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/tdeq.ma". -include "basic_2/relocation/lifts_lifts.ma". +include "static_2/syntax/tdeq.ma". +include "static_2/relocation/lifts_lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_vector.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_vector.ma index 8e234a5c1..4721eafe0 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_vector.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/syntax/term_vector.ma". +include "static_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERM VECTORS *************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight.ma index 3504082ba..358660fe2 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_weight.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/syntax/term_weight.ma". +include "static_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight_bind.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight_bind.ma similarity index 90% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight_bind.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight_bind.ma index f15143117..62135a027 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight_bind.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/lifts_weight_bind.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/syntax/bind_weight.ma". -include "basic_2/relocation/lifts_weight.ma". -include "basic_2/relocation/lifts_bind.ma". +include "static_2/syntax/bind_weight.ma". +include "static_2/relocation/lifts_weight.ma". +include "static_2/relocation/lifts_bind.ma". (* GENERIC RELOCATION FOR BINDERS *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/seq.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/seq.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/seq.ma index 8b833f570..dcfbb0323 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/seq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/ideqsn_3.ma". -include "basic_2/syntax/ceq_ext.ma". -include "basic_2/relocation/sex.ma". +include "static_2/notation/relations/ideqsn_3.ma". +include "static_2/syntax/ceq_ext.ma". +include "static_2/relocation/sex.ma". (* SYNTACTIC EQUIVALENCE FOR SELECTED LOCAL ENVIRONMENTS ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq_length.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/seq_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/seq_length.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/seq_length.ma index 4055f6638..3ea6b84b1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/seq_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/sex_length.ma". -include "basic_2/relocation/seq.ma". +include "static_2/relocation/sex_length.ma". +include "static_2/relocation/seq.ma". (* SYNTACTIC EQUIVALENCE FOR SELECTED LOCAL ENVIRONMENTS ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq_seq.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/seq_seq.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/seq_seq.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/seq_seq.ma index cd8dbe3ea..a06f1f527 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/seq_seq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/seq_seq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ceq_ext_ceq_ext.ma". -include "basic_2/relocation/sex_sex.ma". +include "static_2/syntax/ceq_ext_ceq_ext.ma". +include "static_2/relocation/sex_sex.ma". (* SYNTACTIC EQUIVALENCE FOR SELECTED LOCAL ENVIRONMENTS ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/sex.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/sex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/sex.ma index 96f62f93e..df09463c8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/sex.ma @@ -14,8 +14,8 @@ include "ground_2/relocation/rtmap_sle.ma". include "ground_2/relocation/rtmap_sdj.ma". -include "basic_2/notation/relations/relation_5.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/notation/relations/relation_5.ma". +include "static_2/syntax/lenv.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_length.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_length.ma similarity index 92% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/sex_length.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/sex_length.ma index 86473e631..a7b2a5d71 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_length.ma @@ -12,16 +12,16 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/relocation/sex.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/relocation/sex.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) (* Forward lemmas with length for local environments ************************) +(* Note: "#f #I1 #I2 #L1 #L2 >length_bind >length_bind //" was needed to conclude *) lemma sex_fwd_length: ∀RN,RP,f,L1,L2. L1 ⪤[RN, RP, f] L2 → |L1| = |L2|. #RN #RP #f #L1 #L2 #H elim H -f -L1 -L2 // -#f #I1 #I2 #L1 #L2 >length_bind >length_bind // qed-. (* Properties with length for local environments ****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_sex.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_sex.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/sex_sex.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/sex_sex.ma index df181b7f6..571379e2f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_sex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_sex.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/relocation/rtmap_sand.ma". -include "basic_2/relocation/drops.ma". +include "static_2/relocation/drops.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_tc.ma b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_tc.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/relocation/sex_tc.ma rename to matita/matita/contribs/lambdadelta/static_2/relocation/sex_tc.ma index b2134410b..339ac98a7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/sex_tc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/relocation/sex_tc.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/relocation/sex.ma". +include "static_2/relocation/sex.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqup.ma index a30e03a45..51c5afc6a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup.ma @@ -13,9 +13,9 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/notation/relations/suptermplus_6.ma". -include "basic_2/notation/relations/suptermplus_7.ma". -include "basic_2/s_transition/fqu.ma". +include "static_2/notation/relations/suptermplus_6.ma". +include "static_2/notation/relations/suptermplus_7.ma". +include "static_2/s_transition/fqu.ma". (* PLUS-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_drops.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_drops.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_drops.ma index f2db58c83..4eafa94d2 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops.ma". -include "basic_2/s_computation/fqup.ma". +include "static_2/relocation/drops.ma". +include "static_2/s_computation/fqup.ma". (* PLUS-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_fqup.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_fqup.ma index 4d7c02c08..ab0b4fbf8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_fqup.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqup.ma". +include "static_2/s_computation/fqup.ma". (* PLUS-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_weight.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_weight.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_weight.ma index 69af2d033..25a81dfa8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqup_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqup_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fqu_weight.ma". -include "basic_2/s_computation/fqup.ma". +include "static_2/s_transition/fqu_weight.ma". +include "static_2/s_computation/fqup.ma". (* PLUS-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqus.ma index 32555f1f6..fb6a7ea7d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus.ma @@ -13,9 +13,9 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/notation/relations/suptermstar_6.ma". -include "basic_2/notation/relations/suptermstar_7.ma". -include "basic_2/s_transition/fquq.ma". +include "static_2/notation/relations/suptermstar_6.ma". +include "static_2/notation/relations/suptermstar_7.ma". +include "static_2/s_transition/fquq.ma". (* STAR-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_drops.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_drops.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_drops.ma index cfcecbb00..0d2797139 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqup_drops.ma". -include "basic_2/s_computation/fqus_fqup.ma". +include "static_2/s_computation/fqup_drops.ma". +include "static_2/s_computation/fqus_fqup.ma". (* STAR-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqup.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqup.ma index 9a0ce6312..05a450dae 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqup.ma". -include "basic_2/s_computation/fqus.ma". +include "static_2/s_computation/fqup.ma". +include "static_2/s_computation/fqus.ma". (* STAR-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqus.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqus.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqus.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqus.ma index 1d41130e5..02e42e19b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_fqus.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_fqus.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus.ma". +include "static_2/s_computation/fqus.ma". (* STAR-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_weight.ma b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_weight.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_weight.ma index 335651bc4..f94366706 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_computation/fqus_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_computation/fqus_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fquq_weight.ma". -include "basic_2/s_computation/fqus.ma". +include "static_2/s_transition/fquq_weight.ma". +include "static_2/s_computation/fqus.ma". (* STAR-ITERATED SUPCLOSURE *************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fqu.ma index 0377df1a1..b834566d3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu.ma @@ -12,11 +12,11 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/supterm_6.ma". -include "basic_2/notation/relations/supterm_7.ma". -include "basic_2/syntax/lenv.ma". -include "basic_2/syntax/genv.ma". -include "basic_2/relocation/lifts.ma". +include "static_2/notation/relations/supterm_6.ma". +include "static_2/notation/relations/supterm_7.ma". +include "static_2/syntax/lenv.ma". +include "static_2/syntax/genv.ma". +include "static_2/relocation/lifts.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_length.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_length.ma index 467283ff1..2cfea06b8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/s_transition/fqu.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/s_transition/fqu.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_tdeq.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_tdeq.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_tdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_tdeq.ma index 2c7d03371..7deebbc61 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_tdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_tdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/tdeq.ma". -include "basic_2/s_transition/fqu_length.ma". +include "static_2/syntax/tdeq.ma". +include "static_2/s_transition/fqu_length.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_weight.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_weight.ma index 8f6d321a2..365f5c2db 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fqu_weight.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cl_weight.ma". -include "basic_2/relocation/lifts_weight.ma". -include "basic_2/s_transition/fqu.ma". +include "static_2/syntax/cl_weight.ma". +include "static_2/relocation/lifts_weight.ma". +include "static_2/s_transition/fqu.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fquq.ma index 4c7446e31..fc36281aa 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/suptermopt_6.ma". -include "basic_2/notation/relations/suptermopt_7.ma". -include "basic_2/s_transition/fqu.ma". +include "static_2/notation/relations/suptermopt_6.ma". +include "static_2/notation/relations/suptermopt_7.ma". +include "static_2/s_transition/fqu.ma". (* OPTIONAL SUPCLOSURE ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_length.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_length.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_length.ma index 9cd369686..08a70b7c3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fqu_length.ma". -include "basic_2/s_transition/fquq.ma". +include "static_2/s_transition/fqu_length.ma". +include "static_2/s_transition/fquq.ma". (* OPTIONAL SUPCLOSURE ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_weight.ma b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_weight.ma index faddd7dc6..8a8ef78a7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fquq_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/s_transition/fquq_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_transition/fqu_weight.ma". -include "basic_2/s_transition/fquq.ma". +include "static_2/s_transition/fqu_weight.ma". +include "static_2/s_transition/fquq.ma". (* OPTIONAL SUPCLOSURE ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa.ma index 6ea5a39c4..b7e9ca046 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/atomicarity_4.ma". -include "basic_2/syntax/aarity.ma". -include "basic_2/syntax/lenv.ma". -include "basic_2/syntax/genv.ma". +include "static_2/notation/relations/atomicarity_4.ma". +include "static_2/syntax/aarity.ma". +include "static_2/syntax/lenv.ma". +include "static_2/syntax/genv.ma". (* ATONIC ARITY ASSIGNMENT FOR TERMS ****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_aaa.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa_aaa.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa_aaa.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa_aaa.ma index f6224a96e..15b4fe4e1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_aaa.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa_aaa.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa.ma". +include "static_2/static/aaa.ma". (* ATONIC ARITY ASSIGNMENT ON TERMS *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa_drops.ma index 930ca157c..1cc311ddf 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa_drops.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_drops.ma". -include "basic_2/s_computation/fqup_weight.ma". -include "basic_2/s_computation/fqup_drops.ma". -include "basic_2/static/aaa.ma". +include "static_2/relocation/drops_drops.ma". +include "static_2/s_computation/fqup_weight.ma". +include "static_2/s_computation/fqup_drops.ma". +include "static_2/static/aaa.ma". (* ATONIC ARITY ASSIGNMENT ON TERMS *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_fdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa_fdeq.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa_fdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa_fdeq.ma index 13b5acbd6..4572fda32 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa_fdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/fdeq.ma". -include "basic_2/static/aaa_rdeq.ma". +include "static_2/static/fdeq.ma". +include "static_2/static/aaa_rdeq.ma". (* ATONIC ARITY ASSIGNMENT ON TERMS *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_fqus.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa_fqus.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa_fqus.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa_fqus.ma index 812bcc365..f02455f9f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_fqus.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa_fqus.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus_fqup.ma". -include "basic_2/static/aaa_drops.ma". +include "static_2/s_computation/fqus_fqup.ma". +include "static_2/static/aaa_drops.ma". (* ATONIC ARITY ASSIGNMENT ON TERMS *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_rdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/aaa_rdeq.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/aaa_rdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/aaa_rdeq.ma index d55f97ce7..23760c8bd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/aaa_rdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq.ma". -include "basic_2/static/aaa.ma". +include "static_2/static/rdeq.ma". +include "static_2/static/aaa.ma". (* ATONIC ARITY ASSIGNMENT ON TERMS *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/fdeq.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/fdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fdeq.ma index 6d8dd1589..25427895c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fdeq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/stareqsn_8.ma". -include "basic_2/syntax/genv.ma". -include "basic_2/static/rdeq.ma". +include "static_2/notation/relations/stareqsn_8.ma". +include "static_2/syntax/genv.ma". +include "static_2/static/rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR CLOSURES ON REFERRED ENTRIES ****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fdeq.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fdeq_fdeq.ma index 13ab8ff2f..729185985 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_rdeq.ma". -include "basic_2/static/fdeq.ma". +include "static_2/static/rdeq_rdeq.ma". +include "static_2/static/fdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR CLOSURES ON REFERRED ENTRIES ****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqup.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqup.ma index e9cc92a39..6a4f49e57 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_fqup.ma". -include "basic_2/static/fdeq.ma". +include "static_2/static/rdeq_fqup.ma". +include "static_2/static/fdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR CLOSURES ON REFERRED ENTRIES ****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqus.ma b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqus.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqus.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqus.ma index 6c2246cad..4274cd40f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_fqus.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_fqus.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_fqus.ma". -include "basic_2/static/fdeq.ma". +include "static_2/static/rdeq_fqus.ma". +include "static_2/static/fdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR CLOSURES ON REFERRED ENTRIES ****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_req.ma b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_req.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/fdeq_req.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fdeq_req.ma index 7f98713a0..0c0d9c3bc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fdeq_req.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fdeq_req.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rdeq_req.ma". -include "basic_2/static/fdeq.ma". +include "static_2/static/rdeq_req.ma". +include "static_2/static/fdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR CLOSURES ON REFERRED ENTRIES ****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma b/matita/matita/contribs/lambdadelta/static_2/static/frees.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/static/frees.ma rename to matita/matita/contribs/lambdadelta/static_2/static/frees.ma index b35ea99b8..054003f83 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/frees.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "ground_2/relocation/rtmap_sor.ma". -include "basic_2/notation/relations/freestar_3.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/notation/relations/freestar_3.ma". +include "static_2/syntax/lenv.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_append.ma b/matita/matita/contribs/lambdadelta/static_2/static/frees_append.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/frees_append.ma rename to matita/matita/contribs/lambdadelta/static_2/static/frees_append.ma index 9cf6bfe19..ce8d34808 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_append.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/frees_append.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/append.ma". -include "basic_2/static/frees.ma". +include "static_2/syntax/append.ma". +include "static_2/static/frees.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/frees_drops.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/frees_drops.ma index fe24eadf5..3c6466086 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/frees_drops.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "ground_2/relocation/nstream_coafter.ma". -include "basic_2/relocation/drops_drops.ma". -include "basic_2/static/frees_fqup.ma". +include "static_2/relocation/drops_drops.ma". +include "static_2/static/frees_fqup.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/frees_fqup.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/frees_fqup.ma index 217534a14..abaf4ff15 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/frees_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqup_weight.ma". -include "basic_2/static/lsubf_lsubr.ma". +include "static_2/s_computation/fqup_weight.ma". +include "static_2/static/lsubf_lsubr.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees_frees.ma b/matita/matita/contribs/lambdadelta/static_2/static/frees_frees.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/frees_frees.ma rename to matita/matita/contribs/lambdadelta/static_2/static/frees_frees.ma index 17e1f983d..c612ce7c7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees_frees.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/frees_frees.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/frees.ma". +include "static_2/static/frees.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fsle.ma b/matita/matita/contribs/lambdadelta/static_2/static/fsle.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/static/fsle.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fsle.ma index 9f4f9cf3b..bfafabbdb 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fsle.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fsle.ma @@ -13,9 +13,9 @@ (**************************************************************************) include "ground_2/relocation/rtmap_id.ma". -include "basic_2/notation/relations/subseteq_4.ma". -include "basic_2/syntax/lveq.ma". -include "basic_2/static/frees.ma". +include "static_2/notation/relations/subseteq_4.ma". +include "static_2/syntax/lveq.ma". +include "static_2/static/frees.ma". (* FREE VARIABLES INCLUSION FOR RESTRICTED CLOSURES *************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/fsle_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/fsle_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fsle_drops.ma index 441c6b468..8375d521a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fsle_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/frees_drops.ma". -include "basic_2/static/fsle_length.ma". +include "static_2/static/frees_drops.ma". +include "static_2/static/fsle_length.ma". (* FREE VARIABLES INCLUSION FOR RESTRICTED CLOSURES *************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/fsle_fqup.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/fsle_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fsle_fqup.ma index 84be1fe43..8056bf243 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fsle_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/frees_fqup.ma". -include "basic_2/static/fsle_length.ma". +include "static_2/static/frees_fqup.ma". +include "static_2/static/fsle_length.ma". (* FREE VARIABLES INCLUSION FOR RESTRICTED CLOSURES *************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_fsle.ma b/matita/matita/contribs/lambdadelta/static_2/static/fsle_fsle.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/fsle_fsle.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fsle_fsle.ma index 1b220af99..d8c0c3adc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_fsle.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fsle_fsle.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lveq_lveq.ma". -include "basic_2/static/fsle_fqup.ma". +include "static_2/syntax/lveq_lveq.ma". +include "static_2/static/fsle_fqup.ma". (* FREE VARIABLES INCLUSION FOR RESTRICTED CLOSURES *************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_length.ma b/matita/matita/contribs/lambdadelta/static_2/static/fsle_length.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/fsle_length.ma rename to matita/matita/contribs/lambdadelta/static_2/static/fsle_length.ma index 9f54a92e4..a811b35be 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/fsle_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/fsle_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lveq_length.ma". -include "basic_2/static/fsle.ma". +include "static_2/syntax/lveq_length.ma". +include "static_2/static/fsle.ma". (* FREE VARIABLES INCLUSION FOR RESTRICTED CLOSURES *************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/gcp.ma b/matita/matita/contribs/lambdadelta/static_2/static/gcp.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/gcp.ma rename to matita/matita/contribs/lambdadelta/static_2/static/gcp.ma index e0e3c54e9..569152d1e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/gcp.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/gcp.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/genv.ma". -include "basic_2/relocation/drops_vector.ma". +include "static_2/syntax/genv.ma". +include "static_2/relocation/drops_vector.ma". (* GENERIC COMPUTATION PROPERTIES *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/gcp_aaa.ma b/matita/matita/contribs/lambdadelta/static_2/static/gcp_aaa.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/gcp_aaa.ma rename to matita/matita/contribs/lambdadelta/static_2/static/gcp_aaa.ma index 31bcb5aa5..d6424d236 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/gcp_aaa.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/gcp_aaa.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa_aaa.ma". -include "basic_2/static/lsubc_drops.ma". +include "static_2/static/aaa_aaa.ma". +include "static_2/static/lsubc_drops.ma". (* GENERIC COMPUTATION PROPERTIES *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/gcp_cr.ma b/matita/matita/contribs/lambdadelta/static_2/static/gcp_cr.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/gcp_cr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/gcp_cr.ma index f9b13438a..5a5d9ee22 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/gcp_cr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/gcp_cr.ma @@ -12,12 +12,12 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/ineint_5.ma". -include "basic_2/syntax/aarity.ma". -include "basic_2/relocation/lifts_simple.ma". -include "basic_2/relocation/lifts_lifts_vector.ma". -include "basic_2/relocation/drops_drops.ma". -include "basic_2/static/gcp.ma". +include "static_2/notation/relations/ineint_5.ma". +include "static_2/syntax/aarity.ma". +include "static_2/relocation/lifts_simple.ma". +include "static_2/relocation/lifts_lifts_vector.ma". +include "static_2/relocation/drops_drops.ma". +include "static_2/static/gcp.ma". (* GENERIC COMPUTATION PROPERTIES *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsuba.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsuba.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsuba.ma index e16decefa..7277086ac 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsuba.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/lrsubeqa_3.ma". -include "basic_2/static/aaa.ma". +include "static_2/notation/relations/lrsubeqa_3.ma". +include "static_2/static/aaa.ma". (* RESTRICTED REFINEMENT FOR ATOMIC ARITY ASSIGNMENT ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_aaa.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_aaa.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsuba_aaa.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsuba_aaa.ma index 7bd8f30ed..d03aecd11 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_aaa.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_aaa.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa_aaa.ma". -include "basic_2/static/lsuba.ma". +include "static_2/static/aaa_aaa.ma". +include "static_2/static/lsuba.ma". (* RESTRICTED REFINEMENT FOR ATOMIC ARITY ASSIGNMENT ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsuba_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsuba_drops.ma index e55602e4f..bfec752e7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops.ma". -include "basic_2/static/lsuba.ma". +include "static_2/relocation/drops.ma". +include "static_2/static/lsuba.ma". (* RESTRICTED REFINEMENT FOR ATOMIC ARITY ASSIGNMENT ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsuba.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsuba.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsuba.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsuba.ma index 28dc2d8ee..fd353c365 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsuba.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsuba.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsuba_aaa.ma". +include "static_2/static/lsuba_aaa.ma". (* RESTRICTED REFINEMENT FOR ATOMIC ARITY ASSIGNMENT ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsubr.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsubr.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsubr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsubr.ma index dc36ae778..2be1bbe40 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsuba_lsubr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsuba_lsubr.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubr.ma". -include "basic_2/static/lsuba.ma". +include "static_2/static/lsubr.ma". +include "static_2/static/lsuba.ma". (* RESTRICTED REFINEMENT FOR ATOMIC ARITY ASSIGNMENT ************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubc.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubc.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubc.ma index bb4b27fe3..d7d1c565a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubc.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/lrsubeqc_4.ma". -include "basic_2/static/aaa.ma". -include "basic_2/static/gcp_cr.ma". +include "static_2/notation/relations/lrsubeqc_4.ma". +include "static_2/static/aaa.ma". +include "static_2/static/gcp_cr.ma". (* LOCAL ENVIRONMENT REFINEMENT FOR GENERIC REDUCIBILITY ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubc_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubc_drops.ma index 1916a81b4..9fe4888bf 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/aaa_drops.ma". -include "basic_2/static/lsubc.ma". +include "static_2/static/aaa_drops.ma". +include "static_2/static/lsubc.ma". (* LOCAL ENVIRONMENT REFINEMENT FOR GENERIC REDUCIBILITY ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsuba.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsuba.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsuba.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsuba.ma index 5a11f0ba1..3c6c0a1c9 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsuba.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsuba.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/lsuba.ma". -include "basic_2/static/gcp_aaa.ma". +include "static_2/static/lsuba.ma". +include "static_2/static/gcp_aaa.ma". (* LOCAL ENVIRONMENT REFINEMENT FOR GENERIC REDUCIBILITY ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsubr.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsubr.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsubr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsubr.ma index 0b1ab85f4..b6a3a6f43 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubc_lsubr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubc_lsubr.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubr.ma". -include "basic_2/static/lsubc.ma". +include "static_2/static/lsubr.ma". +include "static_2/static/lsubc.ma". (* LOCAL ENVIRONMENT REFINEMENT FOR GENERIC REDUCIBILITY ********************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubf.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubf.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubf.ma index 6eec91277..3c69f7f52 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubf.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/lrsubeqf_4.ma". +include "static_2/notation/relations/lrsubeqf_4.ma". include "ground_2/relocation/nstream_sor.ma". -include "basic_2/static/frees.ma". +include "static_2/static/frees.ma". (* RESTRICTED REFINEMENT FOR CONTEXT-SENSITIVE FREE VARIABLES ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_frees.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_frees.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubf_frees.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubf_frees.ma index 390e6f13a..7a39036b5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_frees.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_frees.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubf.ma". +include "static_2/static/lsubf.ma". (* RESTRICTED REFINEMENT FOR CONTEXT-SENSITIVE FREE VARIABLES ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubf.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubf.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubf.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubf.ma index 63211ac45..79f33abda 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubf.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubf.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/frees_frees.ma". -include "basic_2/static/lsubf.ma". +include "static_2/static/frees_frees.ma". +include "static_2/static/lsubf.ma". (* RESTRICTED REFINEMENT FOR CONTEXT-SENSITIVE FREE VARIABLES ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubr.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubr.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubr.ma index 24b7e90d2..a021ca5a4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubf_lsubr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubf_lsubr.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubr.ma". -include "basic_2/static/lsubf_lsubf.ma". +include "static_2/static/lsubr.ma". +include "static_2/static/lsubf_lsubf.ma". (* RESTRICTED REFINEMENT FOR CONTEXT-SENSITIVE FREE VARIABLES ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubr.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubr.ma index 382458d9e..5ec8a33f1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubr.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/lrsubeqc_2.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/notation/relations/lrsubeqc_2.ma". +include "static_2/syntax/lenv.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubr_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubr_drops.ma index f69618336..9257f34dc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_drops.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops.ma". -include "basic_2/static/lsubr.ma". +include "static_2/relocation/drops.ma". +include "static_2/static/lsubr.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubr_length.ma index db04cd8fa..0e11e293d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/static/lsubr.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/static/lsubr.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_lsubr.ma b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_lsubr.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/lsubr_lsubr.ma rename to matita/matita/contribs/lambdadelta/static_2/static/lsubr_lsubr.ma index ac9691aa6..3bf83b81e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_lsubr.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/lsubr_lsubr.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/lsubr.ma". +include "static_2/static/lsubr.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq.ma index efbd69ae1..f2de0dfe6 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/stareqsn_5.ma". -include "basic_2/syntax/tdeq_ext.ma". -include "basic_2/static/rex.ma". +include "static_2/notation/relations/stareqsn_5.ma". +include "static_2/syntax/tdeq_ext.ma". +include "static_2/static/rex.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_drops.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_drops.ma index 1cff3b95c..6b9537f61 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_drops.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_tdeq.ma". -include "basic_2/static/rex_drops.ma". -include "basic_2/static/rdeq.ma". +include "static_2/relocation/lifts_tdeq.ma". +include "static_2/static/rex_drops.ma". +include "static_2/static/rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqup.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqup.ma index 5ee09e1c8..e1a7afb3a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_fqup.ma". -include "basic_2/static/rdeq.ma". +include "static_2/static/rex_fqup.ma". +include "static_2/static/rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqus.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqus.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqus.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqus.ma index 8fe8c8f89..3ebf19118 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_fqus.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_fqus.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/s_computation/fqus_fqup.ma". -include "basic_2/static/rdeq_drops.ma". -include "basic_2/static/rdeq_fqup.ma". -include "basic_2/static/rdeq_rdeq.ma". +include "static_2/s_computation/fqus_fqup.ma". +include "static_2/static/rdeq_drops.ma". +include "static_2/static/rdeq_fqup.ma". +include "static_2/static/rdeq_rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_length.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_length.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_length.ma index a877646c9..e0f3bb236 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_length.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lifts_tdeq.ma". -include "basic_2/static/rex_length.ma". -include "basic_2/static/rex_fsle.ma". -include "basic_2/static/rdeq.ma". +include "static_2/relocation/lifts_tdeq.ma". +include "static_2/static/rex_length.ma". +include "static_2/static/rex_fsle.ma". +include "static_2/static/rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_rdeq.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_rdeq.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_rdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_rdeq.ma index 6bd574d2b..316438d66 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_rdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_rdeq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ext2_ext2.ma". -include "basic_2/syntax/tdeq_tdeq.ma". -include "basic_2/static/rdeq_length.ma". +include "static_2/syntax/ext2_ext2.ma". +include "static_2/syntax/tdeq_tdeq.ma". +include "static_2/static/rdeq_length.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_req.ma b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_req.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/static/rdeq_req.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rdeq_req.ma index 46ab07b2b..ab3ebca98 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rdeq_req.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rdeq_req.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/req_fsle.ma". -include "basic_2/static/rdeq.ma". +include "static_2/static/req_fsle.ma". +include "static_2/static/rdeq.ma". (* DEGREE-BASED EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES ******) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/req.ma b/matita/matita/contribs/lambdadelta/static_2/static/req.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/req.ma rename to matita/matita/contribs/lambdadelta/static_2/static/req.ma index d01f4ea5d..13965b92d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/req.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/req.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/ideqsn_3.ma". -include "basic_2/static/rex.ma". +include "static_2/notation/relations/ideqsn_3.ma". +include "static_2/static/rex.ma". (* SYNTACTIC EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES *********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/req_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/req_fqup.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/req_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/req_fqup.ma index 3fe7ad753..4434b4d69 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/req_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/req_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_fqup.ma". -include "basic_2/static/req.ma". +include "static_2/static/rex_fqup.ma". +include "static_2/static/req.ma". (* SYNTACTIC EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES *********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/req_fsle.ma b/matita/matita/contribs/lambdadelta/static_2/static/req_fsle.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/static/req_fsle.ma rename to matita/matita/contribs/lambdadelta/static_2/static/req_fsle.ma index 7662395c0..d91c9905b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/req_fsle.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/req_fsle.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/static/rex_length.ma". -include "basic_2/static/rex_fsle.ma". -include "basic_2/static/req.ma". +include "static_2/static/rex_length.ma". +include "static_2/static/rex_fsle.ma". +include "static_2/static/req.ma". (* SYNTACTIC EQUIVALENCE FOR LOCAL ENVIRONMENTS ON REFERRED ENTRIES *********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex.ma index cc175f08f..515e24bef 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex.ma @@ -13,10 +13,10 @@ (**************************************************************************) include "ground_2/relocation/rtmap_id.ma". -include "basic_2/notation/relations/relation_4.ma". -include "basic_2/syntax/cext2.ma". -include "basic_2/relocation/sex.ma". -include "basic_2/static/frees.ma". +include "static_2/notation/relations/relation_4.ma". +include "static_2/syntax/cext2.ma". +include "static_2/relocation/sex.ma". +include "static_2/static/frees.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_drops.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_drops.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_drops.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_drops.ma index 7ce890273..4e7315e11 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_drops.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_drops.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/relocation/drops_cext2.ma". -include "basic_2/relocation/drops_sex.ma". -include "basic_2/static/frees_drops.ma". -include "basic_2/static/rex.ma". +include "static_2/relocation/drops_cext2.ma". +include "static_2/relocation/drops_sex.ma". +include "static_2/static/frees_drops.ma". +include "static_2/static/rex.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_fqup.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_fqup.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_fqup.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_fqup.ma index 6060d3ff6..c45914f34 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_fqup.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_fqup.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/static/frees_fqup.ma". -include "basic_2/static/rex.ma". +include "static_2/static/frees_fqup.ma". +include "static_2/static/rex.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_fsle.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_fsle.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_fsle.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_fsle.ma index b69cd2efb..24f68014d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_fsle.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_fsle.ma @@ -12,10 +12,10 @@ (* *) (**************************************************************************) -include "basic_2/relocation/sex_length.ma". -include "basic_2/static/fsle_fsle.ma". -include "basic_2/static/rex_drops.ma". -include "basic_2/static/rex_rex.ma". +include "static_2/relocation/sex_length.ma". +include "static_2/static/fsle_fsle.ma". +include "static_2/static/rex_drops.ma". +include "static_2/static/rex_rex.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_length.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_length.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_length.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_length.ma index bd6b0d6c2..e279e159d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/relocation/sex_length.ma". -include "basic_2/static/rex_drops.ma". +include "static_2/relocation/sex_length.ma". +include "static_2/static/rex_drops.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_lex.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_lex.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_lex.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_lex.ma index 970588d1a..ffaebbc2e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_lex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_lex.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/lex.ma". -include "basic_2/static/rex_fsle.ma". -include "basic_2/static/req.ma". +include "static_2/relocation/lex.ma". +include "static_2/static/rex_fsle.ma". +include "static_2/static/req.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/rex_rex.ma b/matita/matita/contribs/lambdadelta/static_2/static/rex_rex.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/static/rex_rex.ma rename to matita/matita/contribs/lambdadelta/static_2/static/rex_rex.ma index 96162fd38..08a4f192c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/rex_rex.ma +++ b/matita/matita/contribs/lambdadelta/static_2/static/rex_rex.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/relocation/sex_sex.ma". -include "basic_2/static/frees_fqup.ma". -include "basic_2/static/rex.ma". +include "static_2/relocation/sex_sex.ma". +include "static_2/static/frees_fqup.ma". +include "static_2/static/rex.ma". (* GENERIC EXTENSION ON REFERRED ENTRIES OF A CONTEXT-SENSITIVE REALTION ****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/aarity.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/aarity.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/aarity.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/aarity.ma index 4db5d3115..89199fabb 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/aarity.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/aarity.ma @@ -17,8 +17,8 @@ *) include "ground_2/lib/relations.ma". -include "basic_2/notation/constructors/item0_0.ma". -include "basic_2/notation/constructors/snitem2_2.ma". +include "static_2/notation/functions/item0_0.ma". +include "static_2/notation/functions/snitem2_2.ma". (* ATOMIC ARITY *************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/append.ma similarity index 91% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/append.ma index b3a07339b..ec9ac39da 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/append.ma @@ -12,13 +12,13 @@ (* *) (**************************************************************************) -include "basic_2/notation/functions/snitem_2.ma". -include "basic_2/notation/functions/snbind1_2.ma". -include "basic_2/notation/functions/snbind2_3.ma". -include "basic_2/notation/functions/snvoid_1.ma". -include "basic_2/notation/functions/snabbr_2.ma". -include "basic_2/notation/functions/snabst_2.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/notation/functions/snitem_2.ma". +include "static_2/notation/functions/snbind1_2.ma". +include "static_2/notation/functions/snbind2_3.ma". +include "static_2/notation/functions/snvoid_1.ma". +include "static_2/notation/functions/snabbr_2.ma". +include "static_2/notation/functions/snabst_2.ma". +include "static_2/syntax/lenv.ma". (* APPEND FOR LOCAL ENVIRONMENTS ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/append_length.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/append_length.ma index e7c79ebee..1945bac9f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/append_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/syntax/append.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/syntax/append.ma". (* APPEND FOR LOCAL ENVIRONMENTS ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/bind.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/bind.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/bind.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/bind.ma index 487722c44..e7c09081e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/bind.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/bind.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term.ma". +include "static_2/syntax/term.ma". (* BINDERS FOR LOCAL ENVIRONMENTS ******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/bind_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/bind_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/bind_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/bind_weight.ma index 85277a353..c1f512f33 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/bind_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/bind_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_weight.ma". -include "basic_2/syntax/bind.ma". +include "static_2/syntax/term_weight.ma". +include "static_2/syntax/bind.ma". (* WEIGHT OF A BINDER FOR LOCAL ENVIRONMENTS *******************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext.ma index f89840135..63b3e2102 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/cext2.ma". +include "static_2/syntax/cext2.ma". (* CONTEXT-AWARE SYNTACTIC EQUIVALENCE FOR BINDERS **************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext_ceq_ext.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext_ceq_ext.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext_ceq_ext.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext_ceq_ext.ma index 2ab3768a0..020230a93 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/ceq_ext_ceq_ext.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/ceq_ext_ceq_ext.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ceq_ext.ma". +include "static_2/syntax/ceq_ext.ma". (* CONTEXT-AWARE SYNTACTIC EQUIVALENCE FOR BINDERS **************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/cext2.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/cext2.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/cext2.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/cext2.ma index 6595ba704..8ccf4e9fc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/cext2.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/cext2.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ext2.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/syntax/ext2.ma". +include "static_2/syntax/lenv.ma". (* EXTENSION TO BINDERS OF A CONTEXT-SENSITIVE RELATION FOR TERMS ***********) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/cl_restricted_weight.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/cl_restricted_weight.ma index 5af875355..31c3f7adc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/cl_restricted_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/functions/weight_2.ma". -include "basic_2/syntax/lenv_weight.ma". +include "static_2/notation/functions/weight_2.ma". +include "static_2/syntax/lenv_weight.ma". (* WEIGHT OF A RESTRICTED CLOSURE *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/cl_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/cl_weight.ma index c4226cd83..a51094adc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/cl_weight.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/functions/weight_3.ma". -include "basic_2/syntax/lenv_weight.ma". -include "basic_2/syntax/genv.ma". +include "static_2/notation/functions/weight_3.ma". +include "static_2/syntax/lenv_weight.ma". +include "static_2/syntax/genv.ma". (* WEIGHT OF A CLOSURE ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/ext2.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/ext2.ma index a7d8d7f20..a31aef544 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/bind.ma". +include "static_2/syntax/bind.ma". (* EXTENSION TO BINDERS OF A RELATION FOR TERMS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_ext2.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2_ext2.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_ext2.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/ext2_ext2.ma index 9abbbc0ba..ec71ed980 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_ext2.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2_ext2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/ext2.ma". +include "static_2/syntax/ext2.ma". (* EXTENSION TO BINDERS OF A RELATION FOR TERMS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_tc.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2_tc.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_tc.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/ext2_tc.ma index 1fc4bd4bf..d6df0a3de 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/ext2_tc.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/ext2_tc.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "ground_2/lib/star.ma". -include "basic_2/syntax/ext2.ma". +include "static_2/syntax/ext2.ma". (* EXTENSION TO BINDERS OF A RELATION FOR TERMS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/genv.ma similarity index 89% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/genv.ma index 3e899a829..35365d802 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/genv.ma @@ -12,11 +12,11 @@ (* *) (**************************************************************************) -include "basic_2/notation/constructors/star_0.ma". -include "basic_2/notation/constructors/dxbind2_3.ma". -include "basic_2/notation/constructors/dxabbr_2.ma". -include "basic_2/notation/constructors/dxabst_2.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/functions/star_0.ma". +include "static_2/notation/functions/dxbind2_3.ma". +include "static_2/notation/functions/dxabbr_2.ma". +include "static_2/notation/functions/dxabst_2.ma". +include "static_2/syntax/term.ma". (* GLOBAL ENVIRONMENTS ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv_length.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/genv_length.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/genv_length.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/genv_length.ma index bda7b391e..afd36af9c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/genv_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/genv.ma". +include "static_2/syntax/genv.ma". (* LENGTH OF A GLOBAL ENVIRONMENT *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/genv_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/genv_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/genv_weight.ma index 632fdc8e5..9bf005fa0 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/genv_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/genv_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_weight.ma". -include "basic_2/syntax/genv.ma". +include "static_2/syntax/term_weight.ma". +include "static_2/syntax/genv.ma". (* WEIGHT OF A GLOBAL ENVIRONMENT *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/item.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/item.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/item.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/item.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/item_sd.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/item_sd.ma index 15be7977f..8a9ae7183 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/item_sd.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/item_sh.ma". +include "static_2/syntax/item_sh.ma". (* SORT DEGREE **************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sh.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/item_sh.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/item_sh.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/item_sh.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv.ma similarity index 88% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lenv.ma index 2822b5d4b..7e2b65da5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv.ma @@ -12,14 +12,14 @@ (* *) (**************************************************************************) -include "basic_2/notation/constructors/star_0.ma". -include "basic_2/notation/constructors/dxitem_2.ma". -include "basic_2/notation/constructors/dxbind1_2.ma". -include "basic_2/notation/constructors/dxbind2_3.ma". -include "basic_2/notation/constructors/dxvoid_1.ma". -include "basic_2/notation/constructors/dxabbr_2.ma". -include "basic_2/notation/constructors/dxabst_2.ma". -include "basic_2/syntax/bind.ma". +include "static_2/notation/functions/star_0.ma". +include "static_2/notation/functions/dxitem_2.ma". +include "static_2/notation/functions/dxbind1_2.ma". +include "static_2/notation/functions/dxbind2_3.ma". +include "static_2/notation/functions/dxvoid_1.ma". +include "static_2/notation/functions/dxabbr_2.ma". +include "static_2/notation/functions/dxabst_2.ma". +include "static_2/syntax/bind.ma". (* LOCAL ENVIRONMENTS *******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv_length.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lenv_length.ma index 440c5497a..52dfc3516 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv.ma". +include "static_2/syntax/lenv.ma". (* LENGTH OF A LOCAL ENVIRONMENT ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv_weight.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lenv_weight.ma index 74a388944..01ff8b7ad 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lenv_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/bind_weight.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/syntax/bind_weight.ma". +include "static_2/syntax/lenv.ma". (* WEIGHT OF A LOCAL ENVIRONMENT ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lveq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lveq.ma index 9dd335a05..855978783 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/voidstareq_4.ma". -include "basic_2/syntax/lenv.ma". +include "static_2/notation/relations/voidstareq_4.ma". +include "static_2/syntax/lenv.ma". (* EQUIVALENCE FOR LOCAL ENVIRONMENTS UP TO EXCLUSION BINDERS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_length.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq_length.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_length.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lveq_length.ma index eca38567c..104d2b8b9 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_length.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lenv_length.ma". -include "basic_2/syntax/lveq.ma". +include "static_2/syntax/lenv_length.ma". +include "static_2/syntax/lveq.ma". (* EQUIVALENCE FOR LOCAL ENVIRONMENTS UP TO EXCLUSION BINDERS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_lveq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq_lveq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_lveq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/lveq_lveq.ma index 40a5fb5c8..8ac40a55f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/lveq_lveq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/lveq_lveq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/lveq_length.ma". +include "static_2/syntax/lveq_length.ma". (* EQUIVALENCE FOR LOCAL ENVIRONMENTS UP TO EXCLUSION BINDERS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/tdeq.ma index d431b7677..d008d5e86 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/stareq_4.ma". -include "basic_2/syntax/item_sd.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/relations/stareq_4.ma". +include "static_2/syntax/item_sd.ma". +include "static_2/syntax/term.ma". (* DEGREE-BASED EQUIVALENCE ON TERMS ****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_ext.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_ext.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_ext.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_ext.ma index 93a3be18d..f13292089 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_ext.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_ext.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/stareq_5.ma". -include "basic_2/syntax/cext2.ma". -include "basic_2/syntax/tdeq.ma". +include "static_2/notation/relations/stareq_5.ma". +include "static_2/syntax/cext2.ma". +include "static_2/syntax/tdeq.ma". (* EXTENDED DEGREE-BASED EQUIVALENCE ****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_tdeq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_tdeq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_tdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_tdeq.ma index 80d13f4e6..a8bbec3fd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/tdeq_tdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/tdeq_tdeq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/tdeq.ma". +include "static_2/syntax/tdeq.ma". (* DEGREE-BASED EQUIVALENCE ON TERMS ****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/term.ma similarity index 84% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/term.ma index ccbb494dd..93cce0ffc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/term.ma @@ -12,24 +12,24 @@ (* *) (**************************************************************************) -include "basic_2/notation/constructors/item0_1.ma". -include "basic_2/notation/constructors/snitem2_3.ma". -include "basic_2/notation/constructors/snbind2_4.ma". -include "basic_2/notation/constructors/snbind2pos_3.ma". -include "basic_2/notation/constructors/snbind2neg_3.ma". -include "basic_2/notation/constructors/snflat2_3.ma". -include "basic_2/notation/constructors/star_1.ma". -include "basic_2/notation/constructors/lref_1.ma". -include "basic_2/notation/constructors/gref_1.ma". -include "basic_2/notation/constructors/snabbr_3.ma". -include "basic_2/notation/constructors/snabbrpos_2.ma". -include "basic_2/notation/constructors/snabbrneg_2.ma". -include "basic_2/notation/constructors/snabst_3.ma". -include "basic_2/notation/constructors/snabstpos_2.ma". -include "basic_2/notation/constructors/snabstneg_2.ma". -include "basic_2/notation/constructors/snappl_2.ma". -include "basic_2/notation/constructors/sncast_2.ma". -include "basic_2/syntax/item.ma". +include "static_2/notation/functions/item0_1.ma". +include "static_2/notation/functions/snitem2_3.ma". +include "static_2/notation/functions/snbind2_4.ma". +include "static_2/notation/functions/snbind2pos_3.ma". +include "static_2/notation/functions/snbind2neg_3.ma". +include "static_2/notation/functions/snflat2_3.ma". +include "static_2/notation/functions/star_1.ma". +include "static_2/notation/functions/lref_1.ma". +include "static_2/notation/functions/gref_1.ma". +include "static_2/notation/functions/snabbr_3.ma". +include "static_2/notation/functions/snabbrpos_2.ma". +include "static_2/notation/functions/snabbrneg_2.ma". +include "static_2/notation/functions/snabst_3.ma". +include "static_2/notation/functions/snabstpos_2.ma". +include "static_2/notation/functions/snabstneg_2.ma". +include "static_2/notation/functions/snappl_2.ma". +include "static_2/notation/functions/sncast_2.ma". +include "static_2/syntax/item.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/term_simple.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/term_simple.ma index e6cfdb3c0..4bef6764d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/term_simple.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/simple_1.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/relations/simple_1.ma". +include "static_2/syntax/term.ma". (* SIMPLE (NEUTRAL) TERMS ***************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/term_vector.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/term_vector.ma index df6e6e1cf..b5da507bc 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/term_vector.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "ground_2/lib/list.ma". -include "basic_2/notation/functions/snapplvector_2.ma". -include "basic_2/syntax/term_simple.ma". +include "static_2/notation/functions/snapplvector_2.ma". +include "static_2/syntax/term_simple.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/term_weight.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/term_weight.ma index 6a0a4ea31..c8d4c974d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/term_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/notation/functions/weight_1.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/functions/weight_1.ma". +include "static_2/syntax/term.ma". (* WEIGHT OF A TERM *********************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/theq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/theq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/theq.ma index a09a53533..37c4af70a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/theq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -include "basic_2/notation/relations/topiso_4.ma". -include "basic_2/syntax/item_sd.ma". -include "basic_2/syntax/term.ma". +include "static_2/notation/relations/topiso_4.ma". +include "static_2/syntax/item_sd.ma". +include "static_2/syntax/term.ma". (* HEAD EQUIVALENCE FOR TERMS ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple.ma index a260edd75..9ad5ed550 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_simple.ma". -include "basic_2/syntax/theq.ma". +include "static_2/syntax/term_simple.ma". +include "static_2/syntax/theq.ma". (* HEAD EQUIVALENCE FOR TERMS ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple_vector.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple_vector.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple_vector.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple_vector.ma index a17c97090..f7212ee11 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_simple_vector.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_simple_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/term_vector.ma". -include "basic_2/syntax/theq_simple.ma". +include "static_2/syntax/term_vector.ma". +include "static_2/syntax/theq_simple.ma". (* HEAD EQUIVALENCE FOR TERMS ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_tdeq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_tdeq.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/theq_tdeq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/theq_tdeq.ma index e151e40f0..99447dba7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_tdeq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_tdeq.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/syntax/tdeq.ma". -include "basic_2/syntax/theq.ma". +include "static_2/syntax/tdeq.ma". +include "static_2/syntax/theq.ma". (* HEAD EQUIVALENCE FOR TERMS ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_theq.ma b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_theq.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/syntax/theq_theq.ma rename to matita/matita/contribs/lambdadelta/static_2/syntax/theq_theq.ma index 88547d98e..e9e586d00 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/syntax/theq_theq.ma +++ b/matita/matita/contribs/lambdadelta/static_2/syntax/theq_theq.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/syntax/theq.ma". +include "static_2/syntax/theq.ma". (* HEAD EQUIVALENCE FOR TERMS ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/static_2/web/static_2.ldw.xml b/matita/matita/contribs/lambdadelta/static_2/web/static_2.ldw.xml new file mode 100644 index 000000000..5df6a4609 --- /dev/null +++ b/matita/matita/contribs/lambdadelta/static_2/web/static_2.ldw.xml @@ -0,0 +1,32 @@ + + + + + + Contents of the Specification + This specification contains the syntactic components of λδ version 2 + that every forthcoming system of the λδ family will share. + + + Summary of the Specification + Here is a numerical account of the specification's contents + and its timeline. + + + + + The specification stands alone. + + + Logical Structure of the Specification + This table reports the specification's components and their planes. + +
+ +
+ diff --git a/matita/matita/contribs/lambdadelta/static_2/web/static_2_src.tbl b/matita/matita/contribs/lambdadelta/static_2/web/static_2_src.tbl new file mode 100644 index 000000000..740b3482e --- /dev/null +++ b/matita/matita/contribs/lambdadelta/static_2/web/static_2_src.tbl @@ -0,0 +1,167 @@ +name "static_2_src" + +table { + class "gray" + [ { "component" * } { + [ { "section" * } { + [ [ "plane" ] "files" * ] + } + ] + } + ] + class "water" + [ { "iterated static typing" * } { + [ { "iterated generic extension of a context-sensitive relation" * } { + [ [ "for lenvs on referred entries" ] "rexs" + "( ? ⪤*[?,?] ? )" "rexs_length" + "rexs_lex" + "rexs_drops" + "rexs_fqup" + "rexs_rexs" * ] + } + ] + } + ] + class "green" + [ { "static typing" * } { + [ { "generic reducibility" * } { + [ [ "restricted refinement for lenvs" ] "lsubc" + "( ? ⊢ ? ⫃[?] ? )" "lsubc_drops" + "lsubc_lsubr" + "lsubc_lsuba" * ] + [ [ "candidates" ] "gcp_cr" + "( ⦃?,?,?⦄ ϵ[?] 〚?〛 )" "gcp_aaa" * ] + [ [ "computation properties" ] "gcp" *] + } + ] + [ { "atomic arity assignment" * } { + [ [ "restricted refinement for lenvs" ] "lsuba" + "( ? ⊢ ? ⫃⁝ ? )" "lsuba_drops" + "lsuba_lsubr" + "lsuba_aaa" + "lsuba_lsuba" * ] + [ [ "for terms" ] "aaa" + "( ⦃?,?⦄ ⊢ ? ⁝ ? )" "aaa_drops" + "aaa_fqus" + "aaa_rdeq" + "aaa_fdeq" + "aaa_aaa" * ] + } + ] + [ { "degree-based equivalence" * } { + [ [ "for closures on referred entries" ] "fdeq" + "( ⦃?,?,?⦄ ≛[?,?] ⦃?,?,?⦄ )" "fdeq_fqup" + "fdeq_fqus" + "fdeq_req" + "fdeq_fdeq" * ] + [ [ "for lenvs on referred entries" ] "rdeq" + "( ? ≛[?,?,?] ? )" "rdeq_length" + "rdeq_drops" + "rdeq_fqup" + "rdeq_fqus" + "rdeq_req" + "rdeq_rdeq" * ] + } + ] + [ { "syntactic equivalence" * } { + [ [ "for lenvs on referred entries" ] "req" + "( ? ≡[?] ? )" "req_fqup" + "req_fsle" * ] + } + ] + [ { "generic extension of a context-sensitive relation" * } { + [ [ "for lenvs on referred entries" ] "rex" + "( ? ⪤[?,?] ? )" "rex_length" + "rex_lex" + "rex_drops" + "rex_fqup" + "rex_fsle" + "rex_rex" * ] + } + ] + [ { "context-sensitive free variables" * } { + [ [ "inclusion for restricted closures" ] "fsle" + "( ⦃?,?⦄ ⊆ ⦃?,?⦄ )" "fsle_length" + "fsle_drops" + "fsle_fqup" + "fsle_fsle" * ] + [ [ "restricted refinement for lenvs" ] "lsubf" + "( ⦃?,?⦄ ⫃𝐅* ⦃?,?⦄ )" "lsubf_lsubr" + "lsubf_frees" + "lsubf_lsubf" * ] + [ [ "for terms" ] "frees" + "( ? ⊢ 𝐅*⦃?⦄ ≘ ? )" "frees_append" + "frees_drops" + "frees_fqup" + "frees_frees" * ] + } + ] + [ { "local environments" * } { + [ [ "restricted refinement" ] "lsubr" + "( ? ⫃ ? )" "lsubr_length" + "lsubr_drops" + "lsubr_lsubr" * ] + } + ] + } + ] + class "grass" + [ { "s-computation" * } { + [ { "iterated structural successor" * } { + [ [ "for closures" ] "fqus" + "( ⦃?,?,?⦄ ⊐*[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐* ⦃?,?,?⦄ )" "fqus_weight" + "fqus_drops" + "fqus_fqup" + "fqus_fqus" * ] + [ [ "proper for closures" ] "fqup" + "( ⦃?,?,?⦄ ⊐+[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐+ ⦃?,?,?⦄ )" "fqup_weight" + "fqup_drops" + "fqup_fqup" * ] + } + ] + } + ] + class "yellow" + [ { "s-transition" * } { + [ { "structural successor" * } { + [ [ "for closures" ] "fquq" + "( ⦃?,?,?⦄ ⊐⸮[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐⸮ ⦃?,?,?⦄ )" "fquq_length" + "fquq_weight" * ] + [ [ "proper for closures" ] "fqu" + "( ⦃?,?,?⦄ ⊐[?] ⦃?,?,?⦄ )" + "( ⦃?,?,?⦄ ⊐ ⦃?,?,?⦄ )" "fqu_length" + "fqu_weight" + "fqu_tdeq" * ] + } + ] + } + ] + class "orange" + [ { "relocation" * } { + [ { "generic slicing" * } { + [ [ "for lenvs" ] "drops" + "( ⬇*[?,?] ? ≘ ? )" + "( ⬇*[?] ? ≘ ? )" "drops_ctc" + "drops_ltc" + "drops_weight" + "drops_length" + "drops_cext2" + "drops_sex" + "drops_lex" + "drops_seq" + "drops_drops" + "drops_vector" * ] + } + ] + [ { "generic relocation" * } { + [ [ "for binders" ] "lifts_bind" + "( ⬆*[?] ? ≘ ? )" "lifts_weight_bind" + "lifts_lifts_bind" * ] + [ [ "for term vectors" ] "lifts_vector" + "( ⬆*[?] ? ≘ ? )" "lifts_lifts_vector" * ] + [ [ "for terms" ] "lifts" + "( ⬆*[?] ? ≘ ? )" "lifts_simple" + "lifts_weight" + "lifts_tdeq" + "lifts_lifts" * ] + } + ] + [ { "syntactic equivalence" * } { + [ [ "for lenvs on selected entries" ] "seq" + "( ? ≡[?] ? )" "seq_length" + "seq_seq" * ] + } + ] + [ { "generic entrywise extension" * } { + [ [ "for lenvs of one contex-sensitive relation" ] "lex" + "( ? ⪤[?] ? )" "lex_tc" + "lex_length" + "lex_lex" * ] + [ [ "for lenvs of two contex-sensitive relations" ] "sex" + "( ? ⪤[?,?,?] ? )" "sex_tc" + "sex_length" + "sex_sex" * ] + } + ] + } + ] + class "red" + [ { "syntax" * } { + [ { "equivalence up to exclusion binders" * } { + [ [ "for lenvs" ] "lveq" + "( ? ≋ⓧ*[?,?] ? )" "lveq_length" + "lveq_lveq" * ] + } + ] + [ { "append" * } { + [ [ "for lenvs" ] "append" + "( ? + ? )" "append_length" * ] + } + ] + [ { "head equivalence" * } { + [ [ "for terms" ] "theq" + "( ? ⩳[?,?] ? )" "theq_simple" + "theq_tdeq" + "theq_theq" + "theq_simple_vector" * ] + } + ] + [ { "degree-based equivalence" * } { + [ [ "" ] "tdeq_ext" + "( ? ≛[?,?] ? )" + "( ? ⊢ ? ≛[?,?] ? )" * ] + [ [ "" ] "tdeq" + "( ? ≛[?,?] ? )" "tdeq_tdeq" * ] + } + ] + [ { "closures" * } { + [ [ "" ] "cl_weight" + "( ♯{?,?,?} )" * ] + [ [ "" ] "cl_restricted_weight" + "( ♯{?,?} )" * ] + } + ] + [ { "global environments" * } { + [ [ "" ] "genv_length" + "( |?| )" * ] + [ [ "" ] "genv_weight" + "( ♯{?} )" * ] + [ [ "" ] "genv" * ] + } + ] + [ { "local environments" * } { + [ [ "" ] "ceq_ext" "ceq_ext_ceq_ext" * ] + [ [ "" ] "cext2" * ] + [ [ "" ] "lenv_length" + "( |?| )" * ] + [ [ "" ] "lenv_weight" + "( ♯{?} )" * ] + [ [ "" ] "lenv" * ] + } + ] + [ { "binders for local environments" * } { + [ [ "" ] "ext2" "ext2_tc" + "ext2_ext2" * ] + [ [ "" ] "bind" "bind_weight" * ] + } + ] + [ { "terms" * } { + [ [ "" ] "term_vector" + "( Ⓐ?.? )" * ] + [ [ "" ] "term_simple" + "( 𝐒⦃?⦄ )" * ] + [ [ "" ] "term_weight" + "( ♯{?} )" * ] + [ [ "" ] "term" * ] + } + ] + [ { "items" * } { + [ [ "" ] "item_sd" * ] + [ [ "" ] "item_sh" * ] + [ [ "" ] "item" * ] + } + ] + [ { "atomic arities" * } { + [ [ "" ] "aarity" * ] + } + ] + } + ] +} + +class "top" { * } + +class "capitalize italic" { 0 1 } + +class "italic" { 2 } -- 2.39.2