LAMBDA-TYPES moved under contrib, fixed (to use the library of Coq even if

the library of matita is already compiled) and added to the daily benchmark.

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 093a3217dda6c5ffc833a7bf4b37c6db1e1adc79..0cd46a54f7850ce7fc1cf9099f409be4cc630442 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -164,12 +164,15 @@ distclean: clean
 tests: matitac matitadep matitaclean
        @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
        @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
+       @(cd contribs/LAMBDA-TYPES && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
 tests.opt: matitac.opt matitadep.opt matitaclean.opt
        @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
        @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
+       @(cd contribs/LAMBDA-TYPES && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
 cleantests: matitaclean
        @(cd library && make clean)
        @(cd tests && make clean)
+       @(cd contribs/LAMBDA-TYPES && make clean)
 .PHONY: tests tests.opt cleantests
 
 tags: TAGS

diff --git a/helm/matita/contribs/LAMBDA-TYPES/.depend b/helm/matita/contribs/LAMBDA-TYPES/.depend
new file mode 100644 (file)
index 0000000..863e134
--- /dev/null
+++ b/helm/matita/contribs/LAMBDA-TYPES/.depend
@@ -0,0 +1,6 @@
+/home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/tlt_defs.moo: ./tlt_defs.ma /home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/terms_defs.moo
+./tlt_defs.mo: /home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/tlt_defs.moo
+/home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/terms_defs.moo: ./terms_defs.ma
+./terms_defs.mo: /home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/terms_defs.moo
+/home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/lref_map_defs.moo: ./lref_map_defs.ma /home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/terms_defs.moo
+./lref_map_defs.mo: /home/sacerdot/miohelm/matita/.matita/xml/matita/LAMBDA-TYPES/lref_map_defs.moo

diff --git a/helm/matita/contribs/LAMBDA-TYPES/Makefile b/helm/matita/contribs/LAMBDA-TYPES/Makefile
new file mode 100644 (file)
index 0000000..f39526a
--- /dev/null
+++ b/helm/matita/contribs/LAMBDA-TYPES/Makefile
@@ -0,0 +1,47 @@
+SRC=$(shell find . -name "*.ma" -a -type f)
+
+MATITAC=../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac ../../matitaclean /dev/null
+MATITACOPT=../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac.opt ../../matitaclean.opt /dev/null
+VERBOSEMATITAC=../../matitac
+VERBOSEMATITACOPT=../../matitac.opt
+
+MATITACLEAN=../../matitaclean
+MATITACLEANOPT=../../matitaclean.opt
+
+MATITADEP=../../matitadep
+MATITADEPOPT=../../matitadep.opt
+
+DEPEND_NAME=.depend
+
+H=@
+
+all: $(SRC:%.ma=%.mo)
+
+opt:
+       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+
+verbose:
+       $(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" all
+
+%.opt:
+       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
+
+clean:
+       $(H)$(MATITACLEAN) $(SRC)
+
+cleanall:
+       $(H)rm -f $(SRC:%.ma=%.moo)
+       $(MATITACLEAN) all
+
+depend:
+       rm -f $(DEPEND_NAME)
+       make $(DEPEND_NAME)
+.PHONY: depend
+
+%.moo:
+       $(H)$(MATITAC) $<
+
+$(DEPEND_NAME): $(SRC)
+       $(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
+
+include $(DEPEND_NAME)

diff --git a/helm/matita/contribs/LAMBDA-TYPES/terms_defs.ma b/helm/matita/contribs/LAMBDA-TYPES/terms_defs.ma
index 3f93fc13d6971e5fc9b758c8d90b0e9b32732f03..6a88b1da30a40c2523e564b50b4135ed9c3e2012 100644 (file)
--- a/helm/matita/contribs/LAMBDA-TYPES/terms_defs.ma
+++ b/helm/matita/contribs/LAMBDA-TYPES/terms_defs.ma
@@ -27,6 +27,7 @@ inductive W : Set \def
    | Bind: B \to W 
    | Flat: F \to W.
 
+alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)".
 inductive T (A:Set) (N:Set) : Set \def
    | TSort: A \to nat \to (T A N) 
    | TLRef: A \to nat \to (T A N)