From 5c1b44dfefa085fbb56e23047652d3650be9d855 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 10 Jan 2008 22:32:03 +0000 Subject: [PATCH] BIG FAT WARNING: DEVELOPMENTS DIE HERE What follows is the email on the helm mailing list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Riassunto: - non esistono più i developments - non esiste più il comando set "baseuri" "cic:/...." (non serve più) - questa mail è parecchio lunga, ma le prossime 2 sezioni le consiglio a _tutti_, quelle successive solo a chi aveva molti development dipendenti luno dall'altro. Ad ogni modo, il manuale di matita (che si apre con F1) è stato aggiornato e al posto dei developments ora spiega come funziona ora la compilazione. Dove sono scritte le baseuri? - nella radice dei vostri ma (per esempio library/, tests/, contribs/RELATIOANL etc...) c'è un file di testo chiamato 'root'. - ad esempio il file library/root contiene una riga tipo: baseuri = cic:/matita - la baseuri in cui i files .ma vengono compilati si calcola guardando il path tra la radice e il file. As esempio library/nat/plus.ma essendo "radicato" da library/root che definisce la baseuri a cic:/matita verrà compilato in cic:/matita + /nat/plus/ (esattamente dove era compilato prima, e tutti i .ma committati, quando necessario, sono stati porati a questo schema. In tutta library solo 1 file non lo rispettava). Come si compila adesso che non c'è più matitamake? - da matita non cambia nulla, ho solo tolto un paio di popup che chiedevano sempre conferme di cose inutili (tipo se compilare il file incluso o no... ora lo compila sempre). - matitac ha cambiato leggermente semantica, ma potete fregarvene: la seguente linea continua a funzionare e fa le stesse cose di prima. cd library; make opt - il file delle dipendenze tra i files .ma prima veniva generato a ogni make con matitadep, ora non viene più fatto, quindi se cambiare gli includes che fate in un file fate un make depend.opt (o make depend se avete compilato in bytecode). matitadep è sempre stato lento, per questo motivo non viene chiamato tutte le volte. stamattina ho risolto un vecchissimo problema (ricordate che ogni tanto andava in stack overflow?) e ora mi sembra anche molto più veloce, quindi forse lo si potrebbe lanciare sempre ... vedremo Qui finisce la parte necessaria a tutti, ci si sente coraggioso continui pure. In generale il codice ML è diventato più semplice, matita è anche più veloce a compilare e spero che i vari BUG dei developments siano spariti. Chiaramente ce ne saranno di nuovi... ma spero di meno. Dettagli del root file (dipendenze tra radici) - il root file è una lista associative chiave -> valore le cui linee matchano la seguente regexp: \s*[^=]+\s*=\s*.+\s* le chiavi utilizzabili sono: baseuri, include_paths. - per esempio, tests/ ha bisogno di legacy/ e vari files in tests/ hanno la riga: include "coq.ma". Il root file per tests è: baseuri=cic:/tests include_paths=../legacy - library/ sta sempre negli include paths, se usate files in library non è necessario dichiarare il relativo include path - si possono dichiarare più include_paths, separandoli da spazi. per sempio include_paths=../foo ../../bar/baz - i files che includete devono esistere in uno degli include paths, e vengono cercati: - in / (path assoluto, da evitare possibilmente) - in . - in library/ - negli include_paths - una volta scritto il root file, lanciando matitadep viene generato un file depends. Tale processo da anche degli errori, in caso alcuni files non riescano ad essere trovati nei paths specificati - una volta fatto ciò matita lanciato da dentro una radice compila tutto, quindi se serve "salta" in una delle radici specificate dagli include_paths e compila pure li dentro - non sono supportati (e non so nemmeno cosa voglia dire) files con lo stesso nome (e path relativo alla radice) in radici differenti, in tal caso include "a.ma" se a.ma esiste anche in una delle radici da cui si dipende, include sempre quello locale (prima c'era un bug per cui includeva quello non-locale). ho dovuto fare un po di renaming nei files di ferruccio, da capire se vanno bene. Dove è finito make: - matitac ora legge il file depends e compila lui i files nell'orine giusto (e solo se necessario). ./matitac compila tutto (nella radice della dir corrente) ./matitac foo/a.ma compila a.ma (e le sue dipendenze se necessario) - matitadep ha bisogno di un file root, detto ciò si cerca i files con estensione .ma e ne genera un depends, con formato: a b c b d d c le lettere sono nomi di files (quindi .ma, niente .moo, .mo, .mo.opt etc...). Le linee si leggono come a deve essere compilato dopo b e c b dopo d d e c anche subito i files esterni alla radice (trovati via include paths) vengono listati anche loro, senza dipendenze (tanto salta nella loro radice e fa "make" li dentro, dove le sue dipendenze sono note). Mi sembra più veloce a compilare?! - prima, per ogni file .ma, veniva lanciato matitac, ora è lo stesso matitac a compilare tutti i files uno dopo l'altro. Il tempo speso a creare un processo (e per matita ce ne vuole parecchio) è risparmiato, quindi per un set di files molto piccoli si vede anche ad occhio la differenza. - il fatto che non venga generato un nuovo processo ha fatto si che tutti i bug relativi all'undo (parti imperative dello stato) venissero a galla. Ne è rimasto solo uno, che non so risolvere: quando camlp5 stampa " una regola è stata mascherata" che li pare che tutto si inceppi. - il nostro environment è imperativo e nessuno lo svuota mai, risultato: non carica gli oggetti da disco quasi mai... è sia un bene che un male... potrei resettarlo alla fine di ogni comilazione... - Non ho mai provato a fare .ma con dipendenze circolari, magari diverge. --- helm/software/Makefile | 1 + .../acic_content/termAcicContent.ml | 3 +- .../acic_content/termAcicContent.mli | 2 + .../software/components/cic/libraryObjects.ml | 18 + .../components/cic/libraryObjects.mli | 4 +- .../components/cic_disambiguation/.depend | 4 +- .../components/cic_disambiguation/.depend.opt | 4 +- .../cic_disambiguation/number_notation.ml | 4 +- .../content_pres/termContentPres.ml | 5 +- .../content_pres/termContentPres.mli | 2 + helm/software/components/extlib/hExtlib.ml | 56 ++ helm/software/components/extlib/hExtlib.mli | 15 + .../grafite_engine/grafiteEngine.ml | 60 +- .../grafite_engine/grafiteEngine.mli | 1 - .../components/grafite_engine/grafiteSync.ml | 25 +- .../components/grafite_engine/grafiteSync.mli | 12 +- .../components/grafite_engine/grafiteTypes.ml | 33 +- .../grafite_engine/grafiteTypes.mli | 11 +- .../components/grafite_parser/.depend | 4 +- .../components/grafite_parser/.depend.opt | 4 +- .../grafite_parser/dependenciesParser.ml | 93 +-- .../grafite_parser/dependenciesParser.mli | 7 +- .../grafite_parser/grafiteDisambiguate.ml | 6 +- .../grafite_parser/grafiteDisambiguate.mli | 2 +- .../grafite_parser/grafiteParser.ml | 21 +- .../grafite_parser/grafiteParser.mli | 4 + .../grafite_parser/grafiteWalker.ml | 8 +- .../grafite_parser/grafiteWalker.mli | 8 +- .../components/grafite_parser/test_dep.ml | 11 +- .../components/lexicon/cicNotation.ml | 4 + .../components/lexicon/cicNotation.mli | 9 +- helm/software/components/library/.depend | 2 + helm/software/components/library/.depend.opt | 2 + helm/software/components/library/Makefile | 1 + helm/software/components/library/coercDb.ml | 4 + helm/software/components/library/coercDb.mli | 4 + helm/software/components/library/librarian.ml | 326 ++++++++++ .../software/components/library/librarian.mli | 44 ++ .../components/library/libraryClean.ml | 78 +-- .../components/library/librarySync.ml | 23 + .../components/library/librarySync.mli | 6 +- .../syntax_extensions/pa_unicode_macro.ml | 5 +- helm/software/components/tactics/tactics.mli | 2 +- helm/software/configure.ac | 6 +- helm/software/make/main.ml | 34 -- helm/software/make/make.ml | 103 ---- helm/software/make/make.mli | 18 - helm/software/make/test/a.c | 0 helm/software/make/test/b.c | 0 helm/software/make/test/c.c | 0 helm/software/make/test/d.c | 0 helm/software/make/test/e.c | 0 helm/software/matita/.depend | 72 +-- helm/software/matita/.depend.opt | 78 +-- helm/software/matita/Makefile | 82 +-- helm/software/matita/bench_disamberrors | 90 --- helm/software/matita/bench_summary.py | 75 --- helm/software/matita/buildTimeConf.ml.in | 3 - .../contribs/LAMBDA-TYPES/Base-1/Makefile | 14 + .../contribs/LAMBDA-TYPES/Base-1/blt/defs.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-1/blt/props.ma | 2 +- .../LAMBDA-TYPES/Base-1/definitions.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-1/depends | 13 + .../contribs/LAMBDA-TYPES/Base-1/ext/arith.ma | 2 +- .../LAMBDA-TYPES/Base-1/ext/tactics.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-1/makefile | 39 -- .../LAMBDA-TYPES/Base-1/plist/defs.ma | 2 +- .../LAMBDA-TYPES/Base-1/plist/props.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-1/preamble.ma | 4 +- .../matita/contribs/LAMBDA-TYPES/Base-1/root | 2 + .../contribs/LAMBDA-TYPES/Base-1/spare.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-1/theory.ma | 2 +- .../LAMBDA-TYPES/Base-1/types/defs.ma | 2 +- .../LAMBDA-TYPES/Base-1/types/props.ma | 2 +- .../contribs/LAMBDA-TYPES/Base-2/Makefile | 26 + .../Base-2/blt/{defs.mma => defs2.mma} | 3 - .../Base-2/blt/{props.mma => props2.mma} | 4 +- .../contribs/LAMBDA-TYPES/Base-2/depend | 9 - .../Base-2/ext/{arith.mma => arith2.mma} | 2 - .../Base-2/ext/{tactics.mma => tactics2.mma} | 2 - .../contribs/LAMBDA-TYPES/Base-2/makefile | 58 -- .../Base-2/plist/{defs.mma => defs2.mma} | 2 - .../Base-2/plist/{props.mma => props2.mma} | 4 +- .../contribs/LAMBDA-TYPES/Base-2/preamble.ma | 30 - .../matita/contribs/LAMBDA-TYPES/Base-2/root | 2 + .../Base-2/{theory.mma => theory2.mma} | 12 +- .../Base-2/types/{defs.mma => defs2.mma} | 2 - .../Base-2/types/{props.mma => props2.mma} | 4 +- .../LAMBDA-TYPES/LambdaDelta-1/A/defs.ma | 4 +- .../LAMBDA-TYPES/LambdaDelta-1/C/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/C/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/G/defs.ma | 4 +- .../LAMBDA-TYPES/LambdaDelta-1/Makefile | 14 + .../LAMBDA-TYPES/LambdaDelta-1/T/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/T/defs.ma | 4 +- .../LAMBDA-TYPES/LambdaDelta-1/T/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/arity/props.ma | 2 +- .../LambdaDelta-1/arity/subst0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clear/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma | 2 +- .../LambdaDelta-1/csubst0/clear.ma | 2 +- .../LambdaDelta-1/csubst0/defs.ma | 2 +- .../LambdaDelta-1/csubst0/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma | 2 +- .../LambdaDelta-1/csubst0/getl.ma | 2 +- .../LambdaDelta-1/csubst0/props.ma | 2 +- .../LambdaDelta-1/csubst1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma | 2 +- .../LambdaDelta-1/csubst1/getl.ma | 2 +- .../LambdaDelta-1/csubst1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma | 2 +- .../{definitions.ma => definitions3.ma} | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/depends | 200 ++++++ .../LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/drop/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/flt/props.ma | 2 +- .../LambdaDelta-1/fsubst0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/getl/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/iso/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/leq/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/llt/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/makefile | 39 -- .../LambdaDelta-1/next_plus/defs.ma | 2 +- .../LambdaDelta-1/next_plus/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma | 2 +- .../{preamble.ma => preamble3.ma} | 4 +- .../LAMBDA-TYPES/LambdaDelta-1/r/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/r/props.ma | 2 +- .../contribs/LAMBDA-TYPES/LambdaDelta-1/root | 2 + .../LAMBDA-TYPES/LambdaDelta-1/s/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/s/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma | 2 +- .../LambdaDelta-1/{spare.ma => spare3.ma} | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma | 2 +- .../LambdaDelta-1/subst0/props.ma | 2 +- .../LambdaDelta-1/subst0/subst0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma | 2 +- .../LambdaDelta-1/subst1/props.ma | 2 +- .../LambdaDelta-1/subst1/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma | 2 +- .../LambdaDelta-1/{theory.ma => theory3.ma} | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma | 2 +- .../LambdaDelta-1/ty3/arity_props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma | 2 +- .../LambdaDelta-1/ty3/pr3_props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma | 2 +- .../LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma | 2 +- .../LAMBDA-TYPES/Unified-Sub/Lift/defs.ma | 2 +- .../LAMBDA-TYPES/Unified-Sub/Lift/fun.ma | 2 +- .../LAMBDA-TYPES/Unified-Sub/Lift/inv.ma | 2 +- .../LAMBDA-TYPES/Unified-Sub/Lift/props.ma | 2 +- .../LAMBDA-TYPES/Unified-Sub/Makefile | 14 + .../Unified-Sub/datatypes/Context.ma | 2 +- .../Unified-Sub/datatypes/Term.ma | 4 +- .../contribs/LAMBDA-TYPES/Unified-Sub/depends | 12 + .../LAMBDA-TYPES/Unified-Sub/makefile | 39 -- .../Unified-Sub/{preamble.ma => preamble4.ma} | 10 +- .../contribs/LAMBDA-TYPES/Unified-Sub/root | 2 + .../matita/contribs/LOGIC/CLE/defs.ma | 2 +- .../matita/contribs/LOGIC/Insert/defs.ma | 2 +- .../matita/contribs/LOGIC/Insert/fun.ma | 2 +- .../matita/contribs/LOGIC/Insert/inv.ma | 2 +- .../matita/contribs/LOGIC/Insert/props.ma | 2 +- .../matita/contribs/LOGIC/Lift/defs.ma | 2 +- helm/software/matita/contribs/LOGIC/Makefile | 14 + .../matita/contribs/LOGIC/NTrack/defs.ma | 2 +- .../matita/contribs/LOGIC/NTrack/inv.ma | 2 +- .../matita/contribs/LOGIC/NTrack/order.ma | 2 +- .../matita/contribs/LOGIC/NTrack/props.ma | 2 +- .../matita/contribs/LOGIC/PEq/defs.ma | 2 +- .../matita/contribs/LOGIC/PNF/defs.ma | 2 +- .../matita/contribs/LOGIC/PRed/defs.ma | 2 +- .../matita/contribs/LOGIC/PRed/wlt.ma | 2 +- .../matita/contribs/LOGIC/Track/defs.ma | 2 +- .../matita/contribs/LOGIC/Track/inv.ma | 2 +- .../matita/contribs/LOGIC/Track/order.ma | 2 +- .../matita/contribs/LOGIC/Track/pred.ma | 2 +- .../matita/contribs/LOGIC/WLT/defs.ma | 2 +- .../matita/contribs/LOGIC/Weight/defs.ma | 2 +- .../contribs/LOGIC/datatypes_defs/Context.ma | 2 +- .../contribs/LOGIC/datatypes_defs/Formula.ma | 4 +- .../contribs/LOGIC/datatypes_defs/Proof.ma | 4 +- .../contribs/LOGIC/datatypes_defs/Sequent.ma | 2 +- .../contribs/LOGIC/datatypes_props/Sequent.ma | 2 +- helm/software/matita/contribs/LOGIC/depends | 27 + helm/software/matita/contribs/LOGIC/makefile | 39 -- .../LOGIC/{preamble.ma => preamble0.ma} | 4 +- helm/software/matita/contribs/LOGIC/root | 2 + helm/software/matita/contribs/Makefile | 2 +- .../matita/contribs/RELATIONAL/Makefile | 14 + .../matita/contribs/RELATIONAL/NLE/defs.ma | 2 +- .../matita/contribs/RELATIONAL/NLE/inv.ma | 2 +- .../matita/contribs/RELATIONAL/NLE/nplus.ma | 2 +- .../matita/contribs/RELATIONAL/NLE/order.ma | 2 +- .../matita/contribs/RELATIONAL/NLE/props.ma | 2 +- .../matita/contribs/RELATIONAL/NPlus/defs.ma | 2 +- .../matita/contribs/RELATIONAL/NPlus/fun.ma | 2 +- .../matita/contribs/RELATIONAL/NPlus/inv.ma | 2 +- .../contribs/RELATIONAL/NPlus/monoid.ma | 2 +- .../contribs/RELATIONAL/NPlusList/defs.ma | 2 +- .../contribs/RELATIONAL/NPlusList/props.ma | 2 +- .../matita/contribs/RELATIONAL/ZEq/defs.ma | 2 +- .../matita/contribs/RELATIONAL/ZEq/setoid.ma | 2 +- .../contribs/RELATIONAL/datatypes/Bool.ma | 2 +- .../contribs/RELATIONAL/datatypes/List.ma | 2 +- .../contribs/RELATIONAL/datatypes/Nat.ma | 2 +- .../contribs/RELATIONAL/datatypes/Zah.ma | 2 +- .../matita/contribs/RELATIONAL/depends | 21 + .../matita/contribs/RELATIONAL/makefile | 39 -- .../matita/contribs/RELATIONAL/preamble.ma | 2 +- helm/software/matita/contribs/RELATIONAL/root | 1 + helm/software/matita/contribs/prova.ma | 236 ------- helm/software/matita/dama/Makefile | 10 + .../matita/dama/Q_is_orded_divisble_group.ma | 272 +++++++++ helm/software/matita/dama/attic/fields.ma | 2 +- .../matita/dama/attic/integration_algebras.ma | 16 +- .../matita/dama/attic/ordered_fields_ch0.ma | 6 +- helm/software/matita/dama/attic/reals.ma | 2 +- helm/software/matita/dama/attic/rings.ma | 6 +- .../matita/dama/attic/vector_spaces.ma | 4 +- .../dama/classical_pointfree/ordered_sets.ma | 6 +- .../dama/classical_pointfree/ordered_sets2.ma | 4 +- .../matita/dama/classical_pointwise/sets.ma | 24 +- .../dama/classical_pointwise/sigma_algebra.ma | 2 +- .../dama/classical_pointwise/topology.ma | 2 +- .../matita/dama/constructive_connectives.ma | 2 +- .../constructive_higher_order_relations.ma | 5 +- .../dama/constructive_pointfree/lebesgue.ma | 2 +- helm/software/matita/dama/depends | 40 ++ helm/software/matita/dama/divisible_group.ma | 2 +- helm/software/matita/dama/excess.ma | 4 +- helm/software/matita/dama/group.ma | 2 +- helm/software/matita/dama/lattice.ma | 2 +- helm/software/matita/dama/makefile | 33 - helm/software/matita/dama/metric_lattice.ma | 2 +- helm/software/matita/dama/metric_space.ma | 2 +- .../matita/dama/ordered_divisible_group.ma | 2 +- helm/software/matita/dama/ordered_group.ma | 2 +- .../software/matita/dama/premetric_lattice.ma | 2 +- .../software/matita/dama/prevalued_lattice.ma | 2 +- helm/software/matita/dama/root | 1 + helm/software/matita/dama/sandwich.ma | 2 +- helm/software/matita/dama/sequence.ma | 2 +- helm/software/matita/dep2dot.rb | 30 - helm/software/matita/gragrep.ml | 67 -- helm/software/matita/gragrep.mli | 27 - .../matita/help/C/figures/developments.png | Bin 15793 -> 0 bytes helm/software/matita/help/C/sec_commands.xml | 33 +- .../matita/help/C/sec_gettingstarted.xml | 175 ++---- helm/software/matita/legacy/Makefile | 14 + helm/software/matita/legacy/coq.ma | 2 - helm/software/matita/legacy/depends | 1 + helm/software/matita/legacy/makefile | 39 -- helm/software/matita/legacy/root | 1 + helm/software/matita/library/Makefile | 14 + .../matita/library/algebra/CoRN/Setoids.ma | 10 +- helm/software/matita/library/depends | 88 +++ .../matita/library/library_notation.ma | 54 -- helm/software/matita/library/list/list.ma | 6 +- helm/software/matita/library/makefile | 39 -- helm/software/matita/library/root | 1 + .../matita/library/technicalities/setoids.ma | 2 +- helm/software/matita/matita.glade | 444 +------------- helm/software/matita/matita.ma.templ | 2 - helm/software/matita/matita.ml | 34 +- helm/software/matita/matitaEngine.ml | 115 ++-- helm/software/matita/matitaEngine.mli | 5 +- helm/software/matita/matitaExcPp.ml | 6 +- helm/software/matita/matitaGui.ml | 340 +++-------- helm/software/matita/matitaGuiTypes.mli | 5 +- helm/software/matita/matitaInit.ml | 182 +++--- helm/software/matita/matitaMathView.ml | 15 - helm/software/matita/matitaMisc.ml | 2 + helm/software/matita/matitaScript.ml | 297 ++++----- helm/software/matita/matitaScript.mli | 16 +- helm/software/matita/matitaTypes.ml | 2 - helm/software/matita/matitaTypes.mli | 1 - helm/software/matita/matitaWiki.ml | 18 +- helm/software/matita/matitac.ml | 118 ++-- helm/software/matita/matitacLib.ml | 575 +++++++----------- helm/software/matita/matitacLib.mli | 18 +- helm/software/matita/matitaclean.ml | 114 ++-- helm/software/matita/matitadep.ml | 261 ++++---- helm/software/matita/matitamake.ml | 135 ---- helm/software/matita/matitamake.mli | 27 - helm/software/matita/matitamakeLib.ml | 394 ------------ helm/software/matita/matitamakeLib.mli | 62 -- helm/software/matita/matitaprover.ml | 136 ----- helm/software/matita/matitaprover.mli | 29 - helm/software/matita/matitatop.ml | 31 - helm/software/matita/rottener.ml | 169 ----- helm/software/matita/rottenize_lib | 4 - helm/software/matita/template_makefile.in | 36 -- .../matita/template_makefile_devel.in | 39 -- helm/software/matita/tests/Makefile | 14 + .../matita/tests/TPTP/Veloci/BOO001-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO003-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO003-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO004-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO004-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO005-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO005-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO006-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO006-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO009-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO009-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO010-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO010-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO011-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO011-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO012-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO012-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO013-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO013-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO016-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO017-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO018-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO034-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO069-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO071-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/BOO075-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL004-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL007-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL008-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL010-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL012-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL013-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL014-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL015-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL016-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL017-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL018-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL021-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL022-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL024-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL025-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL045-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL048-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL050-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL058-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL058-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL060-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL060-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL061-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL061-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL062-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL062-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL063-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL063-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL063-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL063-5.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL063-6.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-5.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-6.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-7.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-8.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL064-9.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL083-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL084-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL085-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/COL086-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP001-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP001-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP010-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP011-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP012-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP022-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP023-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP115-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP116-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP117-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP118-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP136-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP137-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP139-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP141-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP142-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP143-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP144-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP145-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP146-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP149-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP150-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP151-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP152-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP153-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP154-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP155-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP156-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP157-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP158-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP159-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP160-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP161-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP162-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP163-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP168-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP168-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP173-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP174-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP176-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP176-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP182-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP182-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP182-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP182-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP186-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP186-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP188-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP188-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP189-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP189-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP192-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP206-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP454-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP455-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP456-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP457-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP458-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP459-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP460-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP463-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP467-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP481-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP484-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP485-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP486-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP487-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP488-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP490-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP491-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP492-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP493-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP494-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP495-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP496-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP497-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP498-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP509-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP510-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP511-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP512-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP513-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP514-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP515-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP516-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP517-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP518-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP520-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP541-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP542-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP543-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP544-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP545-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP546-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP547-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP548-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP549-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP550-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP551-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP552-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP556-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP558-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP560-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP561-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP562-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP564-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP565-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP566-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP567-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP568-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP569-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP570-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP572-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP573-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP574-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP576-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP577-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP578-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP580-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP581-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP582-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP583-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP584-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP586-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP588-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP590-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP592-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP595-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP596-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP597-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP598-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP599-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP600-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP602-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP603-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP604-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP605-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP606-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP608-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP612-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP613-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP614-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP615-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/GRP616-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT008-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT033-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT034-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT039-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT039-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT040-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LAT045-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL110-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL112-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL113-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL114-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL115-2.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL132-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL133-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL134-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL135-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL139-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL140-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL141-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL153-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL154-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL155-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL156-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL157-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL158-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL161-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LCL164-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LDA001-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/LDA007-3.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG007-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG008-4.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG011-5.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG023-6.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG023-7.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG024-6.p.ma | 2 +- .../matita/tests/TPTP/Veloci/RNG024-7.p.ma | 2 +- .../matita/tests/TPTP/Veloci/ROB002-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/ROB009-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/ROB010-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/ROB013-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/ROB030-1.p.ma | 2 +- .../matita/tests/TPTP/Veloci/SYN083-1.p.ma | 2 +- helm/software/matita/tests/absurd.ma | 4 +- helm/software/matita/tests/apply.ma | 4 +- helm/software/matita/tests/apply2.ma | 2 +- helm/software/matita/tests/applys.ma | 2 +- helm/software/matita/tests/assumption.ma | 4 +- helm/software/matita/tests/bad_induction.ma | 2 +- helm/software/matita/tests/bad_tests/auto.ma | 4 +- .../matita/tests/bad_tests/baseuri.ma | 4 +- helm/software/matita/tests/bool.ma | 4 +- helm/software/matita/tests/change.ma | 4 +- helm/software/matita/tests/clear.ma | 4 +- helm/software/matita/tests/clearbody.ma | 4 +- helm/software/matita/tests/coercions.ma | 2 +- .../matita/tests/coercions_contravariant.ma | 8 +- .../matita/tests/coercions_dependent.ma | 4 +- .../matita/tests/coercions_dupelim.ma | 2 +- .../matita/tests/coercions_nonuniform.ma | 10 +- helm/software/matita/tests/coercions_open.ma | 8 +- .../matita/tests/coercions_propagation.ma | 12 +- .../matita/tests/coercions_russell.ma | 16 +- helm/software/matita/tests/comments.ma | 4 +- helm/software/matita/tests/compose.ma | 2 +- helm/software/matita/tests/constructor.ma | 4 +- helm/software/matita/tests/continuationals.ma | 4 +- helm/software/matita/tests/contradiction.ma | 4 +- helm/software/matita/tests/cut.ma | 4 +- helm/software/matita/tests/decl.ma | 2 +- helm/software/matita/tests/decompose.ma | 2 +- .../software/matita/tests/demodulation_coq.ma | 4 +- .../matita/tests/demodulation_matita.ma | 2 +- .../matita/tests/dependent_injection.ma | 4 +- .../matita/tests/dependent_type_inference.ma | 2 +- helm/software/matita/tests/depends | 350 +++++++++++ helm/software/matita/tests/destruct.ma | 2 +- helm/software/matita/tests/elim.ma | 4 +- helm/software/matita/tests/fguidi.ma | 6 +- helm/software/matita/tests/first.ma | 2 +- .../matita/tests/fix_betareduction.ma | 4 +- helm/software/matita/tests/fold.ma | 4 +- helm/software/matita/tests/generalize.ma | 4 +- helm/software/matita/tests/hard_refine.ma | 4 +- helm/software/matita/tests/injection.ma | 4 +- .../tests/interactive/automatic_insertion.ma | 2 +- .../software/matita/tests/interactive/drop.ma | 2 +- .../matita/tests/interactive/grafite.ma | 2 +- .../matita/tests/interactive/test5.ma | 2 +- .../matita/tests/interactive/test6.ma | 2 +- .../matita/tests/interactive/test7.ma | 2 +- .../matita/tests/interactive/test_instance.ma | 2 +- helm/software/matita/tests/inversion.ma | 4 +- helm/software/matita/tests/inversion2.ma | 4 +- helm/software/matita/tests/letrec.ma | 2 +- helm/software/matita/tests/letrecand.ma | 2 +- helm/software/matita/tests/makefile | 37 -- helm/software/matita/tests/match_inference.ma | 2 +- .../matita/tests/metasenv_ordering.ma | 4 +- .../matita/tests/multiple_inheritance.ma | 4 +- helm/software/matita/tests/mysql_escaping.ma | 2 +- helm/software/matita/tests/naiveparamod.ma | 2 +- helm/software/matita/tests/overred.ma | 6 +- helm/software/matita/tests/paramodulation.ma | 4 +- .../matita/tests/paramodulation/BOO075-1.ma | 26 +- .../tests/paramodulation/boolean_algebra.ma | 4 +- .../matita/tests/paramodulation/group.ma | 4 +- .../matita/tests/paramodulation/irratsqrt2.ma | 2 +- helm/software/matita/tests/pullback.ma | 2 +- helm/software/matita/tests/push_pop_status.ma | 95 +++ .../matita/tests/push_pop_status_aux1.ma | 1 + .../matita/tests/push_pop_status_aux2.ma | 2 + helm/software/matita/tests/record.ma | 2 +- helm/software/matita/tests/replace.ma | 4 +- helm/software/matita/tests/rewrite.ma | 4 +- helm/software/matita/tests/root | 2 + helm/software/matita/tests/second.ma | 2 +- helm/software/matita/tests/simpl.ma | 4 +- helm/software/matita/tests/tacticals.ma | 2 +- helm/software/matita/tests/test2.ma | 4 +- helm/software/matita/tests/test3.ma | 4 +- helm/software/matita/tests/test4.ma | 4 +- helm/software/matita/tests/third.ma | 2 +- helm/software/matita/tests/tinycals.ma | 2 +- helm/software/matita/tests/unfold.ma | 4 +- 776 files changed, 3710 insertions(+), 5297 deletions(-) create mode 100644 helm/software/components/library/librarian.ml create mode 100644 helm/software/components/library/librarian.mli delete mode 100644 helm/software/make/main.ml delete mode 100644 helm/software/make/make.ml delete mode 100644 helm/software/make/make.mli delete mode 100644 helm/software/make/test/a.c delete mode 100644 helm/software/make/test/b.c delete mode 100644 helm/software/make/test/c.c delete mode 100644 helm/software/make/test/d.c delete mode 100644 helm/software/make/test/e.c delete mode 100755 helm/software/matita/bench_disamberrors delete mode 100755 helm/software/matita/bench_summary.py create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-1/Makefile create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-1/depends delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-1/root create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-2/Makefile rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/{defs.mma => defs2.mma} (94%) rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/{props.mma => props2.mma} (94%) delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-2/depend rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/{arith.mma => arith2.mma} (98%) rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/{tactics.mma => tactics2.mma} (95%) delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-2/makefile rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/{defs.mma => defs2.mma} (95%) rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/{props.mma => props2.mma} (93%) delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-2/preamble.ma create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Base-2/root rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/{theory.mma => theory2.mma} (85%) rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/{defs.mma => defs2.mma} (96%) rename helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/{props.mma => props2.mma} (93%) create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/Makefile rename helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/{definitions.ma => definitions3.ma} (96%) create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/depends delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile rename helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/{preamble.ma => preamble3.ma} (96%) create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/root rename helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/{spare.ma => spare3.ma} (99%) rename helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/{theory.ma => theory3.ma} (95%) create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Makefile create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/depends delete mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/makefile rename helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/{preamble.ma => preamble4.ma} (85%) create mode 100644 helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/root create mode 100644 helm/software/matita/contribs/LOGIC/Makefile create mode 100644 helm/software/matita/contribs/LOGIC/depends delete mode 100644 helm/software/matita/contribs/LOGIC/makefile rename helm/software/matita/contribs/LOGIC/{preamble.ma => preamble0.ma} (93%) create mode 100644 helm/software/matita/contribs/LOGIC/root create mode 100644 helm/software/matita/contribs/RELATIONAL/Makefile create mode 100644 helm/software/matita/contribs/RELATIONAL/depends delete mode 100644 helm/software/matita/contribs/RELATIONAL/makefile create mode 100644 helm/software/matita/contribs/RELATIONAL/root delete mode 100644 helm/software/matita/contribs/prova.ma create mode 100644 helm/software/matita/dama/Makefile create mode 100644 helm/software/matita/dama/Q_is_orded_divisble_group.ma create mode 100644 helm/software/matita/dama/depends delete mode 100644 helm/software/matita/dama/makefile create mode 100644 helm/software/matita/dama/root delete mode 100755 helm/software/matita/dep2dot.rb delete mode 100644 helm/software/matita/gragrep.ml delete mode 100644 helm/software/matita/gragrep.mli delete mode 100644 helm/software/matita/help/C/figures/developments.png create mode 100644 helm/software/matita/legacy/Makefile create mode 100644 helm/software/matita/legacy/depends delete mode 100644 helm/software/matita/legacy/makefile create mode 100644 helm/software/matita/legacy/root create mode 100644 helm/software/matita/library/Makefile create mode 100644 helm/software/matita/library/depends delete mode 100644 helm/software/matita/library/library_notation.ma delete mode 100644 helm/software/matita/library/makefile create mode 100644 helm/software/matita/library/root delete mode 100644 helm/software/matita/matitamake.ml delete mode 100644 helm/software/matita/matitamake.mli delete mode 100644 helm/software/matita/matitamakeLib.ml delete mode 100644 helm/software/matita/matitamakeLib.mli delete mode 100644 helm/software/matita/matitaprover.ml delete mode 100644 helm/software/matita/matitaprover.mli delete mode 100644 helm/software/matita/matitatop.ml delete mode 100644 helm/software/matita/rottener.ml delete mode 100755 helm/software/matita/rottenize_lib delete mode 100644 helm/software/matita/template_makefile.in delete mode 100644 helm/software/matita/template_makefile_devel.in create mode 100644 helm/software/matita/tests/Makefile create mode 100644 helm/software/matita/tests/depends delete mode 100644 helm/software/matita/tests/makefile create mode 100644 helm/software/matita/tests/push_pop_status.ma create mode 100644 helm/software/matita/tests/push_pop_status_aux1.ma create mode 100644 helm/software/matita/tests/push_pop_status_aux2.ma create mode 100644 helm/software/matita/tests/root diff --git a/helm/software/Makefile b/helm/software/Makefile index 2f19a7523..9e62f6935 100644 --- a/helm/software/Makefile +++ b/helm/software/Makefile @@ -57,6 +57,7 @@ CLEAN_ON_DIST = \ matita/TPTP/ \ matita/dama/ \ matita/contribs/ \ + matita/library/assembly/ \ matita/library_auto/ \ $(NULL) EXTRA_DIST = \ diff --git a/helm/software/components/acic_content/termAcicContent.ml b/helm/software/components/acic_content/termAcicContent.ml index 681f3cd54..f6b1b68aa 100644 --- a/helm/software/components/acic_content/termAcicContent.ml +++ b/helm/software/components/acic_content/termAcicContent.ml @@ -376,8 +376,9 @@ let ast_of_acic ~output_type id_to_sort annterm = debug_print (lazy ("ast_of_acic -> " ^ CicNotationPp.pp_term ast)); ast, term_info.uri +let counter = ref ~-1 +let reset () = counter := ~-1;; let fresh_id = - let counter = ref ~-1 in fun () -> incr counter; !counter diff --git a/helm/software/components/acic_content/termAcicContent.mli b/helm/software/components/acic_content/termAcicContent.mli index def5b0a1b..4f366c9c2 100644 --- a/helm/software/components/acic_content/termAcicContent.mli +++ b/helm/software/components/acic_content/termAcicContent.mli @@ -68,3 +68,5 @@ val instantiate_appl_pattern: (string * Cic.term) list -> CicNotationPt.cic_appl_pattern -> Cic.term +(* hack. seee cicNotation for explanation *) +val reset: unit -> unit diff --git a/helm/software/components/cic/libraryObjects.ml b/helm/software/components/cic/libraryObjects.ml index 7e1dc626f..e402f4db2 100644 --- a/helm/software/components/cic/libraryObjects.ml +++ b/helm/software/components/cic/libraryObjects.ml @@ -80,7 +80,25 @@ let reset_defaults () = true_URIs_ref := default_true_URIs; false_URIs_ref := default_false_URIs; absurd_URIs_ref := default_absurd_URIs +;; + +let stack = ref [];; +let push () = + stack := (!eq_URIs_ref, !true_URIs_ref, !false_URIs_ref, !absurd_URIs_ref)::!stack; + reset_defaults () +;; + +let pop () = + match !stack with + | [] -> raise (Failure "Unable to POP in libraryObjects.ml") + | (eq,t,f,a)::tl -> + stack := tl; + eq_URIs_ref := eq; + true_URIs_ref := t; + false_URIs_ref := f; + absurd_URIs_ref := a +;; (**** LOOKUP FUNCTIONS ****) let eq_URI () = diff --git a/helm/software/components/cic/libraryObjects.mli b/helm/software/components/cic/libraryObjects.mli index bb742f172..b4e19dff8 100644 --- a/helm/software/components/cic/libraryObjects.mli +++ b/helm/software/components/cic/libraryObjects.mli @@ -24,8 +24,10 @@ *) val set_default : string -> UriManager.uri list -> unit -val reset_defaults : unit -> unit +val reset_defaults : unit -> unit +val push: unit -> unit +val pop: unit -> unit val eq_URI : unit -> UriManager.uri option diff --git a/helm/software/components/cic_disambiguation/.depend b/helm/software/components/cic_disambiguation/.depend index ca4124461..2ca28ce61 100644 --- a/helm/software/components/cic_disambiguation/.depend +++ b/helm/software/components/cic_disambiguation/.depend @@ -8,5 +8,5 @@ disambiguate.cmo: disambiguateTypes.cmi disambiguateChoices.cmi \ disambiguate.cmi disambiguate.cmx: disambiguateTypes.cmx disambiguateChoices.cmx \ disambiguate.cmi -number_notation.cmo: disambiguateTypes.cmi disambiguateChoices.cmi -number_notation.cmx: disambiguateTypes.cmx disambiguateChoices.cmx +number_notation.cmo: disambiguateChoices.cmi +number_notation.cmx: disambiguateChoices.cmx diff --git a/helm/software/components/cic_disambiguation/.depend.opt b/helm/software/components/cic_disambiguation/.depend.opt index ca4124461..2ca28ce61 100644 --- a/helm/software/components/cic_disambiguation/.depend.opt +++ b/helm/software/components/cic_disambiguation/.depend.opt @@ -8,5 +8,5 @@ disambiguate.cmo: disambiguateTypes.cmi disambiguateChoices.cmi \ disambiguate.cmi disambiguate.cmx: disambiguateTypes.cmx disambiguateChoices.cmx \ disambiguate.cmi -number_notation.cmo: disambiguateTypes.cmi disambiguateChoices.cmi -number_notation.cmx: disambiguateTypes.cmx disambiguateChoices.cmx +number_notation.cmo: disambiguateChoices.cmi +number_notation.cmx: disambiguateChoices.cmx diff --git a/helm/software/components/cic_disambiguation/number_notation.ml b/helm/software/components/cic_disambiguation/number_notation.ml index 78135d9be..e3cc4fa0b 100644 --- a/helm/software/components/cic_disambiguation/number_notation.ml +++ b/helm/software/components/cic_disambiguation/number_notation.ml @@ -29,7 +29,7 @@ let _ = DisambiguateChoices.add_num_choice ("natural number", (fun _ num _ -> LibraryObjects.build_nat (int_of_string num))); - DisambiguateChoices.add_num_choice +(* DisambiguateChoices.add_num_choice ("Coq natural number", (fun _ num _ -> HelmLibraryObjects.build_nat (int_of_string num))); DisambiguateChoices.add_num_choice @@ -55,4 +55,4 @@ let _ = HelmLibraryObjects.build_bin_pos num ] else assert false)) - +*) diff --git a/helm/software/components/content_pres/termContentPres.ml b/helm/software/components/content_pres/termContentPres.ml index 0ee424f18..d68b6a8b4 100644 --- a/helm/software/components/content_pres/termContentPres.ml +++ b/helm/software/components/content_pres/termContentPres.ml @@ -468,8 +468,9 @@ let fill_pos_info l1_pattern = l1_pattern in aux true l1_pattern *) +let counter = ref ~-1 +let reset () = counter := ~-1;; let fresh_id = - let counter = ref ~-1 in fun () -> incr counter; !counter @@ -672,3 +673,5 @@ let instantiate_level2 env term = let _ = load_patterns21 [] + + diff --git a/helm/software/components/content_pres/termContentPres.mli b/helm/software/components/content_pres/termContentPres.mli index 5ff710036..77cda8a81 100644 --- a/helm/software/components/content_pres/termContentPres.mli +++ b/helm/software/components/content_pres/termContentPres.mli @@ -50,3 +50,5 @@ val instantiate_level2: CicNotationEnv.t -> CicNotationPt.term -> CicNotationPt.term +(* hack. seee cicNotation for explanation *) +val reset: unit -> unit diff --git a/helm/software/components/extlib/hExtlib.ml b/helm/software/components/extlib/hExtlib.ml index 24f0dd196..3ee270e4e 100644 --- a/helm/software/components/extlib/hExtlib.ml +++ b/helm/software/components/extlib/hExtlib.ml @@ -422,3 +422,59 @@ let raise_localized_exception ~offset floc exn = let estimate_size x = 4 * (String.length (Marshal.to_string x [])) / 1024 +let normalize_path s = + let s = Str.global_replace (Str.regexp "//") "/" s in + let l = Str.split (Str.regexp "/") s in + let rec aux acc = function + | [] -> acc + | he::"."::tl -> aux acc (he::tl) + | he::".."::tl when he <> ".." -> aux [] (acc @ tl) + | he::tl -> aux (acc@[he]) tl + in + (if Str.string_match (Str.regexp "^/") s 0 then "/" else "") ^ + String.concat "/" (aux [] l) + ^ (if Str.string_match (Str.regexp "/$") s 0 then "/" else "") +;; + +let find_in paths path = + let rec aux = function + | [] -> raise (Failure "find_in") + | p :: tl -> + let path = normalize_path (p ^ "/" ^ path) in + try + if (Unix.stat path).Unix.st_kind = Unix.S_REG then path + else aux tl + with Unix.Unix_error _ as exn -> + aux tl + in + try + aux paths + with Unix.Unix_error _ | Failure _ -> + raise + (Failure "find_in") +;; + +let is_prefix_of_aux d1 d2 = + let len1 = String.length d1 in + let len2 = String.length d2 in + if len2 < len1 then + false, len1, len2 + else + let pref = String.sub d2 0 len1 in + pref = d1 && (len1 = len2 || d1.[len1-1] = '/' || d2.[len1] = '/'), len1, len2 + +let is_prefix_of d1 d2 = + let b,_,_ = is_prefix_of_aux d1 d2 in b +;; + +let chop_prefix prefix s = + let b,lp,ls = is_prefix_of_aux prefix s in + if b then + String.sub s lp (ls - lp) + else + s +;; + +let touch s = + try close_out(open_out s) with Sys_error _ -> () +;; diff --git a/helm/software/components/extlib/hExtlib.mli b/helm/software/components/extlib/hExtlib.mli index f951a6709..73450ae11 100644 --- a/helm/software/components/extlib/hExtlib.mli +++ b/helm/software/components/extlib/hExtlib.mli @@ -42,11 +42,17 @@ val safe_rmdir: string -> unit (** removes a dir if it exists and is empty *) val is_dir_empty: string -> bool (** checks if the dir is empty *) val rmdir_descend: string -> unit (** rmdir -p *) val chmod: int -> string -> unit (** chmod *) +val normalize_path: string -> string (** /foo/./bar/..//baz -> /foo/baz *) (** find all _files_ whose name matches test under a filesystem root. * Test is passed the filename path relative to the given filesystem root *) val find: ?test:(string -> bool) -> string -> string list + (** find_in paths name returns the first path^"/"^name such that + * is a regular file and the current user can 'stat' it. + * May raise (Failure "find_in") *) +val find_in: string list -> string -> string + (** {2 File I/O} *) val input_file: string -> string (** read all the contents of file to string *) @@ -114,3 +120,12 @@ val raise_localized_exception: offset:int -> Stdpp.location -> exn -> 'a (* size in KB (SLOW) *) val estimate_size: 'a -> int +(* is_prefix_of [prefix] [string], in terms of dirs: + * foo/bar/ is prefix of foo/bar/baz + * foo/bar is prefix of foo/bar/baz + * foo/b isn't of foo/bar/baz + * foo/bar is prefix of foo/bar + *) +val is_prefix_of: string -> string -> bool +val chop_prefix: string -> string -> string +val touch: string -> unit diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index e8e3171a0..409c0921a 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -33,13 +33,11 @@ exception IncludedFileNotCompiled of string * string exception Macro of GrafiteAst.loc * (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -exception ReadOnlyUri of string type 'a disambiguator_input = string * int * 'a type options = { do_heavy_checks: bool ; - clean_baseuri: bool } (** create a ProofEngineTypes.mk_fresh_name_type function which uses given @@ -410,7 +408,6 @@ type eval_ast = Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> ?do_heavy_checks:bool -> - ?clean_baseuri:bool -> GrafiteTypes.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) disambiguator_input -> @@ -482,10 +479,10 @@ let refinement_toolkit = { RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj; } -let eval_coercion status ~add_composites uri arity saturations baseuri = +let eval_coercion status ~add_composites uri arity saturations = let status,compounds = GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity - saturations baseuri + saturations (GrafiteTypes.get_baseuri status) in let moo_content = List.map coercion_moo_statement_of ((uri,arity,saturations)::compounds) @@ -570,6 +567,7 @@ let add_coercions_of_record_to_moo obj lemmas status = with Not_found -> false,0 with Not_found -> assert false in + let buri = GrafiteTypes.get_baseuri status in (* looking at the fields we can know the 'wanted' coercions, but not the * actually generated ones. So, only the intersection between the wanted * and the actual should be in the moo as coercion, while everithing in @@ -579,8 +577,7 @@ let add_coercions_of_record_to_moo obj lemmas status = (function | (name,true,arity) -> Some - (arity, UriManager.uri_of_string - (GrafiteTypes.qualify status name ^ ".con")) + (arity, UriManager.uri_of_string (buri ^ "/" ^ name ^ ".con" )) | _ -> None) fields in @@ -649,8 +646,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let status = GrafiteTypes.add_moo_content [cmd] status in status,[] | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) -> - eval_coercion status ~add_composites uri arity saturations - (GrafiteTypes.get_string_option status "baseuri") + eval_coercion status ~add_composites uri arity saturations | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; GrafiteTypes.add_moo_content [cmd] status,[] @@ -685,7 +681,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status status,[] | GrafiteAst.Print (_,"proofterm") -> let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in - print_endline (Auto.pp_proofterm p); + prerr_endline (Auto.pp_proofterm p); status,[] | GrafiteAst.Print (_,_) -> status,[] | GrafiteAst.Qed loc -> @@ -715,37 +711,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) -> Setoids.add_relation id a aeq refl sym trans; status, [] (*CSC: TO BE FIXED *) - | GrafiteAst.Set (loc, name, value) -> - if name = "baseuri" then begin - let value = - let v = Http_getter_misc.strip_trailing_slash value in - try - ignore (String.index v ' '); - GrafiteTypes.command_error "baseuri can't contain spaces" - with Not_found -> v - in - if Http_getter_storage.is_read_only value then begin - HLog.error (Printf.sprintf "uri %s belongs to a read-only repository" value); - raise (ReadOnlyUri value) - end; - if (not (Http_getter_storage.is_empty ~local:true value) || - LibraryClean.db_uris_of_baseuri value <> []) - && opts.clean_baseuri - then begin - HLog.message ("baseuri " ^ value ^ " is not empty"); - HLog.message ("cleaning baseuri " ^ value); - LibraryClean.clean_baseuris [value]; - assert (Http_getter_storage.is_empty ~local:true value); - end; - if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk" - ~default:false) - then - HExtlib.mkdir - (Filename.dirname - (Http_getter.filename ~local:true ~writable:true (value ^ - "/foo.con"))); - end; - GrafiteTypes.set_option status name value,[] + | GrafiteAst.Set (loc, name, value) -> status, [] +(* GrafiteTypes.set_option status name value,[] *) | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with @@ -755,8 +722,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status ".ind", (match types with (name,_,_,_)::_ -> name | _ -> assert false) | _ -> assert false in - let uri = - UriManager.uri_of_string (GrafiteTypes.qualify status name ^ ext) in + let buri = GrafiteTypes.get_baseuri status in + let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ext) in let obj = CicRefine.pack_coercion_obj obj in let metasenv = GrafiteTypes.get_proof_metasenv status in match obj with @@ -860,13 +827,10 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status status) status moo } and eval_ast = {ea_go = fun ~disambiguate_tactic ~disambiguate_command -~disambiguate_macro ?(do_heavy_checks=false) ?(clean_baseuri=true) status +~disambiguate_macro ?(do_heavy_checks=false) status (text,prefix_len,st) -> - let opts = { - do_heavy_checks = do_heavy_checks ; - clean_baseuri = clean_baseuri } - in + let opts = { do_heavy_checks = do_heavy_checks ; } in match st with | GrafiteAst.Executable (_,ex) -> eval_executable.ee_go ~disambiguate_tactic ~disambiguate_command diff --git a/helm/software/components/grafite_engine/grafiteEngine.mli b/helm/software/components/grafite_engine/grafiteEngine.mli index 63580ad2e..d1a07a4ed 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.mli +++ b/helm/software/components/grafite_engine/grafiteEngine.mli @@ -51,7 +51,6 @@ val eval_ast : Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> ?do_heavy_checks:bool -> - ?clean_baseuri:bool -> GrafiteTypes.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) disambiguator_input -> diff --git a/helm/software/components/grafite_engine/grafiteSync.ml b/helm/software/components/grafite_engine/grafiteSync.ml index 067fe9b59..d318d11a7 100644 --- a/helm/software/components/grafite_engine/grafiteSync.ml +++ b/helm/software/components/grafite_engine/grafiteSync.ml @@ -133,14 +133,29 @@ let time_travel ~present ~past = List.iter (fun uri -> LibrarySync.remove_coercion uri) coercions_to_remove; List.iter LibrarySync.remove_obj objs_to_remove -let init () = - LibrarySync.remove_all_coercions (); - LibraryObjects.reset_defaults (); - { +let initial_status baseuri = { GrafiteTypes.moo_content_rev = []; proof_status = GrafiteTypes.No_proof; - options = GrafiteTypes.no_options; +(* options = GrafiteTypes.no_options; *) objects = []; coercions = []; universe = Universe.empty; + baseuri = baseuri; } + + +let init baseuri = + LibrarySync.remove_all_coercions (); + LibraryObjects.reset_defaults (); + initial_status baseuri + ;; +let pop () = + LibrarySync.pop (); + LibraryObjects.pop () +;; + +let push () = + LibrarySync.push (); + LibraryObjects.push () +;; + diff --git a/helm/software/components/grafite_engine/grafiteSync.mli b/helm/software/components/grafite_engine/grafiteSync.mli index 0a2595430..f66c0e853 100644 --- a/helm/software/components/grafite_engine/grafiteSync.mli +++ b/helm/software/components/grafite_engine/grafiteSync.mli @@ -40,4 +40,14 @@ val time_travel: present:GrafiteTypes.status -> past:GrafiteTypes.status -> unit (* also resets the imperative part of the status *) -val init: unit -> GrafiteTypes.status +val init: string -> GrafiteTypes.status + +(* + (* just an empty status, does not reset imperative + * part, use push/pop for that *) +val initial_status: string -> GrafiteTypes.status +*) + + (* preserve _only_ imperative parts of the status *) +val push: unit -> unit +val pop: unit -> unit diff --git a/helm/software/components/grafite_engine/grafiteTypes.ml b/helm/software/components/grafite_engine/grafiteTypes.ml index 6e8be22bb..71fd19f94 100644 --- a/helm/software/components/grafite_engine/grafiteTypes.ml +++ b/helm/software/components/grafite_engine/grafiteTypes.ml @@ -44,20 +44,23 @@ type proof_status = (* Status in which the proof could be while it is being processed by the * engine. No status entering/exiting the engine could be in it. *) +(* REMOVE module StringMap = Map.Make (String) type option_value = | String of string | Int of int -type options = option_value StringMap.t -let no_options = StringMap.empty +*) +(* type options = option_value StringMap.t *) +(* let no_options = StringMap.empty *) type status = { moo_content_rev: GrafiteMarshal.moo; proof_status: proof_status; - options: options; +(* options: options; *) objects: UriManager.uri list; coercions: UriManager.uri list; universe:Universe.universe; + baseuri: string; } let get_current_proof status = @@ -136,21 +139,18 @@ let add_moo_content cmds status = GrafiteAstPp.pp_command content')); *) { status with moo_content_rev = content' } +let get_baseuri status = status.baseuri;; + +(* let get_option status name = try StringMap.find name status.options with Not_found -> raise (Option_error (name, "not found")) - + let set_option status name value = - let mangle_dir s = - let s = Str.global_replace (Str.regexp "//+") "/" s in - let s = Str.global_replace (Str.regexp "/$") "" s in - s - in - let types = [ "baseuri", (`String, mangle_dir); ] in + let types = [ (* no set options defined! *) ] in let ty_and_mangler = - try - List.assoc name types + try List.assoc name types with Not_found -> command_error (Printf.sprintf "Unknown option \"%s\"" name) in @@ -163,9 +163,6 @@ let set_option status name value = with Failure _ -> command_error (Printf.sprintf "Not an integer value \"%s\"" value)) in - if StringMap.mem name status.options && name = "baseuri" then - command_error "Redefinition of 'baseuri' is forbidden." - else { status with options = StringMap.add name value status.options } @@ -173,8 +170,7 @@ let get_string_option status name = match get_option status name with | String s -> s | _ -> raise (Option_error (name, "not a string value")) - -let qualify status name = get_string_option status "baseuri" ^ "/" ^ name +*) let dump_status status = HLog.message "status.aliases:\n"; @@ -186,6 +182,7 @@ let dump_status status = | Proof _ -> "proof\n" | Intermediate _ -> "Intermediate\n"); HLog.message "status.options\n"; +(* REMOVEME StringMap.iter (fun k v -> let v = match v with @@ -193,7 +190,9 @@ let dump_status status = | Int i -> string_of_int i in HLog.message (k ^ "::=" ^ v)) status.options; +*) HLog.message "status.coercions\n"; HLog.message "status.objects:\n"; List.iter (fun u -> HLog.message (UriManager.string_of_uri u)) status.objects + diff --git a/helm/software/components/grafite_engine/grafiteTypes.mli b/helm/software/components/grafite_engine/grafiteTypes.mli index b26c0ca21..ce988944b 100644 --- a/helm/software/components/grafite_engine/grafiteTypes.mli +++ b/helm/software/components/grafite_engine/grafiteTypes.mli @@ -42,19 +42,22 @@ type proof_status = | Proof of ProofEngineTypes.proof | Intermediate of Cic.metasenv +(* type option_value = | String of string | Int of int type options val no_options: options +*) type status = { moo_content_rev: GrafiteMarshal.moo; proof_status: proof_status; (** logical status *) - options: options; +(* options: options; *) objects: UriManager.uri list; (** in-scope objects *) coercions: UriManager.uri list; (** defined coercions *) universe:Universe.universe; (** universe of terms used by auto *) + baseuri: string; } val dump_status : status -> unit @@ -62,11 +65,12 @@ val dump_status : status -> unit (** list is not reversed, head command will be the first emitted *) val add_moo_content: GrafiteMarshal.ast_command list -> status -> status +(* REOMVE ME val get_option : status -> string -> option_value val get_string_option : status -> string -> string val set_option : status -> string -> string -> status - -val qualify: status -> string -> string +*) +val get_baseuri: status -> string val get_current_proof: status -> ProofEngineTypes.proof val get_proof_metasenv: status -> Cic.metasenv @@ -76,3 +80,4 @@ val get_proof_conclusion : status -> int -> Cic.term val set_stack: Continuationals.Stack.t -> status -> status val set_metasenv: Cic.metasenv -> status -> status + diff --git a/helm/software/components/grafite_parser/.depend b/helm/software/components/grafite_parser/.depend index 2dc8a7cab..f097cc8d3 100644 --- a/helm/software/components/grafite_parser/.depend +++ b/helm/software/components/grafite_parser/.depend @@ -1,8 +1,8 @@ grafiteWalker.cmi: grafiteParser.cmi dependenciesParser.cmo: dependenciesParser.cmi dependenciesParser.cmx: dependenciesParser.cmi -grafiteParser.cmo: dependenciesParser.cmi grafiteParser.cmi -grafiteParser.cmx: dependenciesParser.cmx grafiteParser.cmi +grafiteParser.cmo: grafiteParser.cmi +grafiteParser.cmx: grafiteParser.cmi cicNotation2.cmo: grafiteParser.cmi cicNotation2.cmi cicNotation2.cmx: grafiteParser.cmx cicNotation2.cmi grafiteDisambiguator.cmo: grafiteDisambiguator.cmi diff --git a/helm/software/components/grafite_parser/.depend.opt b/helm/software/components/grafite_parser/.depend.opt index 2dc8a7cab..f097cc8d3 100644 --- a/helm/software/components/grafite_parser/.depend.opt +++ b/helm/software/components/grafite_parser/.depend.opt @@ -1,8 +1,8 @@ grafiteWalker.cmi: grafiteParser.cmi dependenciesParser.cmo: dependenciesParser.cmi dependenciesParser.cmx: dependenciesParser.cmi -grafiteParser.cmo: dependenciesParser.cmi grafiteParser.cmi -grafiteParser.cmx: dependenciesParser.cmx grafiteParser.cmi +grafiteParser.cmo: grafiteParser.cmi +grafiteParser.cmx: grafiteParser.cmi cicNotation2.cmo: grafiteParser.cmi cicNotation2.cmi cicNotation2.cmx: grafiteParser.cmx cicNotation2.cmi grafiteDisambiguator.cmo: grafiteDisambiguator.cmi diff --git a/helm/software/components/grafite_parser/dependenciesParser.ml b/helm/software/components/grafite_parser/dependenciesParser.ml index eb33e49b8..32ee44491 100644 --- a/helm/software/components/grafite_parser/dependenciesParser.ml +++ b/helm/software/components/grafite_parser/dependenciesParser.ml @@ -25,28 +25,15 @@ (* $Id$ *) -(* FG - * From Cambridge dictionary - * Dependency: - * a country which is supported and governed by another country - * Dependence: - * when you need something or someone all the time, especially in order to - * continue existing or operating - * - * Fate vobis ... - *) - exception UnableToInclude of string (* statements meaningful for matitadep *) type dependency = | IncludeDep of string - | BaseuriDep of string | UriDep of UriManager.uri let pp_dependency = function | IncludeDep str -> "include \"" ^ str ^ "\"" - | BaseuriDep str -> "set \"baseuri\" \"" ^ str ^ "\"" | UriDep uri -> "uri \"" ^ UriManager.string_of_uri uri ^ "\"" let parse_dependencies lexbuf = @@ -54,56 +41,38 @@ let parse_dependencies lexbuf = CicNotationLexer.level2_ast_lexer.Token.tok_func (Obj.magic lexbuf) in let rec parse acc = - try - (parser - | [< '("QSTRING", s) >] -> - (* because of alias id qstring = qstring :-( *) - (try - parse (UriDep (UriManager.uri_of_string s) :: acc) - with - UriManager.IllFormedUri _ -> parse acc) - | [< '("URI", u) >] -> - parse (UriDep (UriManager.uri_of_string u) :: acc) - | [< '("IDENT", "include"); '("QSTRING", fname) >] -> - parse (IncludeDep fname :: acc) - | [< '("IDENT", "set"); '("QSTRING", "baseuri"); '("QSTRING", baseuri) >] -> - parse (BaseuriDep baseuri :: acc) - | [< '("EOI", _) >] -> acc - | [< 'tok >] -> parse acc - | [< >] -> acc) tok_stream - with - Stream.Error _ -> parse acc - | CicNotationLexer.Error _ -> parse acc + let continue, acc = + try + (parser + | [< '("QSTRING", s) >] -> + (* because of alias id qstring = qstring :-( *) + (try + true, (UriDep (UriManager.uri_of_string s) :: acc) + with + UriManager.IllFormedUri _ -> true, acc) + | [< '("URI", u) >] -> + true, (UriDep (UriManager.uri_of_string u) :: acc) + | [< '("IDENT", "include"); '("QSTRING", fname) >] -> + true, (IncludeDep fname :: acc) + | [< '("IDENT", "include'"); '("QSTRING", fname) >] -> + true, (IncludeDep fname :: acc) + | [< '("EOI", _) >] -> false, acc + | [< 'tok >] -> true, acc + | [< >] -> false, acc) tok_stream + with + Stream.Error _ -> false, acc + | CicNotationLexer.Error _ -> true, acc + in + if continue then parse acc else acc in List.rev (parse []) -let make_absolute paths path = - let rec aux = function - | [] -> ignore (Unix.stat path); path - | p :: tl -> - let path = p ^ "/" ^ path in - try - ignore (Unix.stat path); - HLog.debug ("Including "^path^" with path: " ^ p); - path - with Unix.Unix_error _ -> aux tl - in - try - aux paths - with Unix.Unix_error _ -> raise (UnableToInclude path) +let deps_of_file ma_file = + try + let ic = open_in ma_file in + let istream = Ulexing.from_utf8_channel ic in + let dependencies = parse_dependencies istream in + close_in ic; + dependencies + with End_of_file -> [] ;; - -let baseuri_of_script ~include_paths file = - let file = make_absolute include_paths file in - let ic = open_in file in - let istream = Ulexing.from_utf8_channel ic in - let rec find_baseuri = - function - [] -> failwith ("No baseuri defined in " ^ file) - | BaseuriDep s::_ -> s - | _::tl -> find_baseuri tl in - let buri = find_baseuri (parse_dependencies istream) in - let uri = Http_getter_misc.strip_trailing_slash buri in - if String.length uri < 5 || String.sub uri 0 5 <> "cic:/" then - HLog.error (file ^ " sets an incorrect baseuri: " ^ buri); - uri,file diff --git a/helm/software/components/grafite_parser/dependenciesParser.mli b/helm/software/components/grafite_parser/dependenciesParser.mli index 6a8d2ae21..1b4a03a71 100644 --- a/helm/software/components/grafite_parser/dependenciesParser.mli +++ b/helm/software/components/grafite_parser/dependenciesParser.mli @@ -28,13 +28,8 @@ exception UnableToInclude of string (* statements meaningful for matitadep *) type dependency = | IncludeDep of string - | BaseuriDep of string | UriDep of UriManager.uri val pp_dependency: dependency -> string - (** @raise End_of_file *) -val parse_dependencies: Ulexing.lexbuf -> dependency list - -(* returns baseuri and the full path of the script *) -val baseuri_of_script : include_paths:string list -> string -> string * string +val deps_of_file: string -> dependency list diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index 53142e252..ca3bc0b90 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -406,7 +406,7 @@ let rec disambiguate_tactic metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont) -let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) = +let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let uri = match obj with | CicNotationPt.Inductive (_,(name,_,_,_)::_) @@ -426,7 +426,7 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) = let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in lexicon_status, metasenv, cic -let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)= +let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= match cmd with | GrafiteAst.Index(loc,key,uri) -> let lexicon_status_ref = ref lexicon_status in @@ -451,7 +451,7 @@ let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)= lexicon_status,metasenv,cmd | GrafiteAst.Obj (loc,obj) -> let lexicon_status,metasenv,obj = - disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj)in + disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj)in lexicon_status, metasenv, GrafiteAst.Obj (loc,obj) | GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) -> let lexicon_status_ref = ref lexicon_status in diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.mli b/helm/software/components/grafite_parser/grafiteDisambiguate.mli index 7a2e2dda8..798fa75f5 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.mli +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.mli @@ -43,7 +43,7 @@ val disambiguate_tactic: val disambiguate_command: LexiconEngine.status -> - baseuri:string option -> + ?baseuri:string -> Cic.metasenv -> ((CicNotationPt.term,CicNotationPt.term CicNotationPt.obj) GrafiteAst.command) Disambiguate.disambiguator_input -> LexiconEngine.status * Cic.metasenv * (Cic.term,Cic.obj) GrafiteAst.command diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index 50a373e49..df18135ac 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -30,6 +30,8 @@ let set_callback f = out := f module Ast = CicNotationPt +exception NoInclusionPerformed of string (* full path *) + type 'a localized_option = LSome of 'a | LNone of GrafiteAst.loc @@ -41,6 +43,7 @@ type ast_statement = GrafiteAst.statement type statement = + ?never_include:bool -> include_paths:string list -> LexiconEngine.status -> LexiconEngine.status * ast_statement localized_option @@ -687,17 +690,18 @@ EXTEND ]; statement: [ [ ex = executable -> - fun ~include_paths status -> status,LSome(GrafiteAst.Executable (loc,ex)) + fun ?(never_include=false) ~include_paths status -> status,LSome(GrafiteAst.Executable (loc,ex)) | com = comment -> - fun ~include_paths status -> status,LSome (GrafiteAst.Comment (loc, com)) + fun ?(never_include=false) ~include_paths status -> status,LSome (GrafiteAst.Comment (loc, com)) | (iloc,fname,mode) = include_command ; SYMBOL "." -> - fun ~include_paths status -> - let buri, fullpath = - DependenciesParser.baseuri_of_script ~include_paths fname + fun ?(never_include=false) ~include_paths status -> + let _root, buri, fullpath, _rrelpath = + Librarian.baseuri_of_script ~include_paths fname in let status = - LexiconEngine.eval_command status - (LexiconAst.Include (iloc,buri,mode,fullpath)) + if never_include then raise (NoInclusionPerformed fullpath) + else LexiconEngine.eval_command status + (LexiconAst.Include (iloc,buri,mode,fullpath)) in !out fname; status, @@ -706,7 +710,7 @@ EXTEND (loc,GrafiteAst.Command (loc,GrafiteAst.Include (iloc,buri)))) | scom = lexicon_command ; SYMBOL "." -> - fun ~include_paths status -> + fun ?(never_include=false) ~include_paths status -> let status = LexiconEngine.eval_command status scom in status,LNone loc | EOI -> raise End_of_file @@ -728,3 +732,4 @@ let exc_located_wrapper f = let parse_statement lexbuf = exc_located_wrapper (fun () -> (Grammar.Entry.parse statement (Obj.magic lexbuf))) + diff --git a/helm/software/components/grafite_parser/grafiteParser.mli b/helm/software/components/grafite_parser/grafiteParser.mli index f8754df0c..47f0af02b 100644 --- a/helm/software/components/grafite_parser/grafiteParser.mli +++ b/helm/software/components/grafite_parser/grafiteParser.mli @@ -33,7 +33,11 @@ type ast_statement = CicNotationPt.term CicNotationPt.obj, string) GrafiteAst.statement +exception NoInclusionPerformed of string (* full path *) + type statement = + ?never_include:bool -> + (* do not call LexiconEngine to do includes, always raise NoInclusionPerformed *) include_paths:string list -> LexiconEngine.status -> LexiconEngine.status * ast_statement localized_option diff --git a/helm/software/components/grafite_parser/grafiteWalker.ml b/helm/software/components/grafite_parser/grafiteWalker.ml index 742532113..7e722bccf 100644 --- a/helm/software/components/grafite_parser/grafiteWalker.ml +++ b/helm/software/components/grafite_parser/grafiteWalker.ml @@ -34,10 +34,8 @@ let get_loc = loc let grep_statement ?(status = LexiconEngine.initial_status) ?(callback = ignore) - ~fname test + ~fname ~include_paths test = - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in let content = HExtlib.input_file fname in let lexbuf = Ulexing.from_utf8_string content in let parse_fun status = @@ -61,7 +59,7 @@ let grep_statement ?(status = LexiconEngine.initial_status) ?(callback = ignore) let ma_extension_test fname = Filename.check_suffix fname ".ma" let rgrep_statement ?status ?callback ?(fname_test = ma_extension_test) - ~dirname test + ~dirname ~include_paths test = let files = HExtlib.find ~test:fname_test dirname in List.flatten @@ -72,6 +70,6 @@ let rgrep_statement ?status ?callback ?(fname_test = ma_extension_test) | None -> None | Some f -> Some (fun s -> f (fname, s)) in List.map (fun raw -> fname, raw) - (grep_statement ?status ?callback ~fname test)) + (grep_statement ?status ?callback ~fname ~include_paths test)) files) diff --git a/helm/software/components/grafite_parser/grafiteWalker.mli b/helm/software/components/grafite_parser/grafiteWalker.mli index b4ca6f0d7..c9df8ab48 100644 --- a/helm/software/components/grafite_parser/grafiteWalker.mli +++ b/helm/software/components/grafite_parser/grafiteWalker.mli @@ -33,7 +33,9 @@ type statement_test = val grep_statement: ?status: LexiconEngine.status -> ?callback: (string -> unit) -> - fname:string -> statement_test -> + fname:string -> + include_paths: string list -> + statement_test -> string list (** As above, but act on all file (recursively) located under directory @@ -43,6 +45,8 @@ val grep_statement: val rgrep_statement: ?status: LexiconEngine.status -> ?callback: (string * string -> unit) -> - ?fname_test:(string -> bool) -> dirname:string -> statement_test -> + ?fname_test:(string -> bool) -> dirname:string -> + include_paths: string list -> + statement_test -> (string * string) list diff --git a/helm/software/components/grafite_parser/test_dep.ml b/helm/software/components/grafite_parser/test_dep.ml index 2d0f7813f..b397df31b 100644 --- a/helm/software/components/grafite_parser/test_dep.ml +++ b/helm/software/components/grafite_parser/test_dep.ml @@ -26,15 +26,10 @@ (* $Id$ *) let _ = - let ic = ref stdin in + let ic = ref "/dev/fd/0" in let usage = "test_coarse_parser [ file ]" in - let open_file fname = - if !ic <> stdin then close_in !ic; - ic := open_in fname - in + let open_file fname = ic := fname in Arg.parse [] open_file usage; - let deps = - DependenciesParser.parse_dependencies (Ulexing.from_utf8_channel !ic) - in + let deps = DependenciesParser.deps_of_file !ic in List.iter (fun dep -> print_endline (DependenciesParser.pp_dependency dep)) deps diff --git a/helm/software/components/lexicon/cicNotation.ml b/helm/software/components/lexicon/cicNotation.ml index d514c0273..bea67a0b4 100644 --- a/helm/software/components/lexicon/cicNotation.ml +++ b/helm/software/components/lexicon/cicNotation.ml @@ -96,3 +96,7 @@ let set_active_notations ids = in TermAcicContent.set_active_interpretations interp_ids +let reset () = + TermContentPres.reset (); + TermAcicContent.reset () +;; diff --git a/helm/software/components/lexicon/cicNotation.mli b/helm/software/components/lexicon/cicNotation.mli index 944438df8..81b01aa45 100644 --- a/helm/software/components/lexicon/cicNotation.mli +++ b/helm/software/components/lexicon/cicNotation.mli @@ -30,7 +30,7 @@ val process_notation: LexiconAst.command -> notation_id list val remove_notation: notation_id -> unit (** {2 Notation enabling/disabling} - * Right now, only disabling of notation during pretty printing is supporting. + * Right now, only disabling of notation during pretty printing is supported. * If it is useful to disable it also for the input phase is still to be * understood ... *) @@ -38,3 +38,10 @@ val get_all_notations: unit -> (notation_id * string) list (* id, dsc *) val get_active_notations: unit -> notation_id list val set_active_notations: notation_id list -> unit +(* resets internal couenters. this is an hack used in matitaScript. + * if you are in the middle of a script (with an history you may use to undo + * with some notations id inside) and you want to compile an external file + * in an empty environment you need, after its compilation, to restore + * the previous environment (re-executing all notations commands) and this must + * produce the same ids as before, otherwise history is wrong. *) + val reset: unit -> unit diff --git a/helm/software/components/library/.depend b/helm/software/components/library/.depend index e99436e05..fefbf93ec 100644 --- a/helm/software/components/library/.depend +++ b/helm/software/components/library/.depend @@ -1,5 +1,7 @@ cicCoercion.cmi: coercDb.cmi librarySync.cmi: refinementTool.cmo +librarian.cmo: librarian.cmi +librarian.cmx: librarian.cmi cicElim.cmo: cicElim.cmi cicElim.cmx: cicElim.cmi cicRecord.cmo: cicRecord.cmi diff --git a/helm/software/components/library/.depend.opt b/helm/software/components/library/.depend.opt index 190aaf9b7..d8ff04797 100644 --- a/helm/software/components/library/.depend.opt +++ b/helm/software/components/library/.depend.opt @@ -1,5 +1,7 @@ cicCoercion.cmi: coercDb.cmi librarySync.cmi: refinementTool.cmx +librarian.cmo: librarian.cmi +librarian.cmx: librarian.cmi cicElim.cmo: cicElim.cmi cicElim.cmx: cicElim.cmi cicRecord.cmo: cicRecord.cmi diff --git a/helm/software/components/library/Makefile b/helm/software/components/library/Makefile index a484846a9..e3c921dd7 100644 --- a/helm/software/components/library/Makefile +++ b/helm/software/components/library/Makefile @@ -2,6 +2,7 @@ PACKAGE = library PREDICATES = INTERFACE_FILES = \ + librarian.mli \ cicElim.mli \ cicRecord.mli \ libraryMisc.mli \ diff --git a/helm/software/components/library/coercDb.ml b/helm/software/components/library/coercDb.ml index 0ca40eb1c..80222ad34 100644 --- a/helm/software/components/library/coercDb.ml +++ b/helm/software/components/library/coercDb.ml @@ -190,3 +190,7 @@ let add_coercion (src,tgt,u,saturations) = db := (src,tgt,(u,1,saturations)::l)::tl @ rest ;; + +type coerc_db = (coerc_carr * coerc_carr * (UriManager.uri * int * int) list) list +let dump () = !db +let restore coerc_db = db := coerc_db diff --git a/helm/software/components/library/coercDb.mli b/helm/software/components/library/coercDb.mli index e1afd61aa..3071aecc4 100644 --- a/helm/software/components/library/coercDb.mli +++ b/helm/software/components/library/coercDb.mli @@ -50,6 +50,10 @@ val to_list: unit -> (coerc_carr * coerc_carr * (UriManager.uri * int) list) list +type coerc_db +val dump: unit -> coerc_db +val restore: coerc_db -> unit + val add_coercion: coerc_carr * coerc_carr * UriManager.uri * int -> unit diff --git a/helm/software/components/library/librarian.ml b/helm/software/components/library/librarian.ml new file mode 100644 index 000000000..124b1a1f5 --- /dev/null +++ b/helm/software/components/library/librarian.ml @@ -0,0 +1,326 @@ +let debug = false;; + +exception NoRootFor of string + +let absolutize path = + let path = + if String.length path > 0 && path.[0] <> '/' then + Sys.getcwd () ^ "/" ^ path + else + path + in + HExtlib.normalize_path path +;; + + +let find_root path = + let path = absolutize path in + let paths = List.rev (Str.split (Str.regexp "/") path) in + let rec build = function + | he::tl as l -> ("/" ^ String.concat "/" (List.rev l) ^ "/") :: build tl + | [] -> ["/"] + in + let paths = List.map HExtlib.normalize_path (build paths) in + try HExtlib.find_in paths "root" + with Failure "find_in" -> + raise (NoRootFor (path ^ " (" ^ String.concat ", " paths ^ ")")) +;; + +let ensure_trailing_slash s = + if s = "" then "/" else + if s.[String.length s-1] <> '/' then s^"/" else s +;; + +let remove_trailing_slash s = + if s = "" then "" else + let len = String.length s in + if s.[len-1] = '/' then String.sub s 0 (len-1) else s +;; + +let load_root_file rootpath = + let data = HExtlib.input_file rootpath in + let lines = Str.split (Str.regexp "\n") data in + let clean s = Pcre.replace ~pat:"^ *" (Pcre.replace ~pat:" *$" s) in + List.map + (fun l -> + match Str.split (Str.regexp "=") l with + | [k;v] -> clean k, Http_getter_misc.strip_trailing_slash (clean v) + | _ -> raise (Failure ("Malformed root file: " ^ rootpath))) + lines +;; + +let find_root_for ~include_paths file = + let include_paths = "" :: Sys.getcwd () :: include_paths in + try + let path = HExtlib.find_in include_paths file in + let path = absolutize path in +(* HLog.debug ("file "^file^" resolved as "^path); *) + let rootpath, root, buri = + try + let mburi = Helm_registry.get "matita.baseuri" in + match Str.split (Str.regexp " ") mburi with + | [root; buri] when HExtlib.is_prefix_of root path -> + ":registry:", root, buri + | _ -> raise (Helm_registry.Key_not_found "matita.baseuri") + with Helm_registry.Key_not_found "matita.baseuri" -> + let rootpath = find_root path in + let buri = List.assoc "baseuri" (load_root_file rootpath) in + rootpath, Filename.dirname rootpath, buri + in +(* HLog.debug ("file "^file^" rooted by "^rootpath^""); *) + let uri = Http_getter_misc.strip_trailing_slash buri in + if String.length uri < 5 || String.sub uri 0 5 <> "cic:/" then + HLog.error (rootpath ^ " sets an incorrect baseuri: " ^ buri); + ensure_trailing_slash root, remove_trailing_slash uri, path + with Failure "find_in" -> + HLog.error ("We are in: " ^ Sys.getcwd ()); + HLog.error ("Unable to find: "^file^"\nPaths explored:"); + List.iter (fun x -> HLog.error (" - "^x)) include_paths; + raise (NoRootFor file) +;; + +let baseuri_of_script ~include_paths file = + let root, buri, path = find_root_for ~include_paths file in + let path = HExtlib.normalize_path path in + let root = HExtlib.normalize_path root in + let lpath = Str.split (Str.regexp "/") path in + let lroot = Str.split (Str.regexp "/") root in + let rec substract l1 l2 = + match l1, l2 with + | h1::tl1,h2::tl2 when h1 = h2 -> substract tl1 tl2 + | l,[] -> l + | _ -> raise (NoRootFor (file ^" "^path^" "^root)) + in + let extra_buri = substract lpath lroot in + let chop name = + assert(Filename.check_suffix name ".ma" || + Filename.check_suffix name ".mma"); + try Filename.chop_extension name + with Invalid_argument "Filename.chop_extension" -> name + in + let extra = String.concat "/" extra_buri in + root, + remove_trailing_slash (HExtlib.normalize_path + (buri ^ "/" ^ chop extra)), + path, + extra +;; + +let find_roots_in_dir dir = + HExtlib.find ~test:(fun f -> + Filename.basename f = "root" && + try (Unix.stat f).Unix.st_kind = Unix.S_REG + with Unix.Unix_error _ -> false) + dir +;; + +(* make *) +let load_deps_file f = + let deps = ref [] in + let ic = open_in f in + try + while true do + begin + let l = input_line ic in + match Str.split (Str.regexp " ") l with + | [] -> + HLog.error ("Malformed deps file: " ^ f); + raise (Failure ("Malformed deps file: " ^ f)) + | he::tl -> deps := (he,tl) :: !deps + end + done; !deps + with End_of_file -> !deps +;; + +type options = (string * string) list + +module type Format = + sig + type source_object + type target_object + val load_deps_file: string -> (source_object * source_object list) list + val string_of_source_object: source_object -> string + val string_of_target_object: target_object -> string + val build: options -> source_object -> bool + val root_and_target_of: + options -> source_object -> string option * target_object + val mtime_of_source_object: source_object -> float option + val mtime_of_target_object: target_object -> float option + end + +module Make = functor (F:Format) -> struct + + let prerr_endline s = if debug then prerr_endline ("make: "^s);; + + let unopt_or_call x f y = match x with Some _ -> x | None -> f y;; + + let younger_s_t a fa b fb = + let a = unopt_or_call a F.mtime_of_source_object fa in + let b = unopt_or_call b F.mtime_of_target_object fb in + match a,b with + | Some a, Some b -> a < b + | _ -> false + ;; + + let younger_t_t a fa b fb = + let a = unopt_or_call a F.mtime_of_target_object fa in + let b = unopt_or_call b F.mtime_of_target_object fb in + match a, b with + | Some a, Some b -> a < b + | _ -> false + ;; + + let is_built opts mt t mtgt tgt = + younger_s_t mt t mtgt tgt + ;; + + let assoc6 l k = List.find (fun (k1,_,_,_,_,_) -> k1 = k) l;; + + let fst6 = function (x,_,_,_,_,_) -> x;; + + let rec needs_build opts deps compiled (t,dependencies,root,tgt,mt,mtgt) = + prerr_endline ("Checking if "^F.string_of_source_object t^ + " needs to be built"); + if List.mem t compiled then + (prerr_endline "already compiled"; + false) + else + if not (is_built opts mt t mtgt tgt) then + (prerr_endline (F.string_of_source_object t^ + " is not built, thus needs to be built"); + true) + else + try + let unsat = + List.find + (needs_build opts deps compiled) + (List.map (assoc6 deps) dependencies) + in + prerr_endline + (F.string_of_source_object t^" depends on "^ + F.string_of_source_object (fst6 unsat)^ + " that needs to be built, thus needs to be built"); + true + with Not_found -> + try + let _,_,_,unsat,_,_ = + List.find + (fun (_,_,_,tgt1,_,mtgt1) -> younger_t_t mtgt tgt mtgt1 tgt1) + (List.map (assoc6 deps) dependencies) + in + prerr_endline + (F.string_of_source_object t^" depends on "^F.string_of_target_object + unsat^" and "^F.string_of_source_object t^".o is younger than "^ + F.string_of_target_object unsat^", thus needs to be built"); + true + with Not_found -> false + ;; + + let is_buildable opts compiled deps (t,dependencies,root,tgt,_,_ as what) = + prerr_endline ("Checking if "^F.string_of_source_object t^" is buildable"); + let b = needs_build opts deps compiled what in + if not b then + (prerr_endline (F.string_of_source_object t^ + " does not need to be built, thus it not buildable"); + false) + else + try + let unsat,_,_,_,_,_ = + List.find (needs_build opts deps compiled) + (List.map (assoc6 deps) dependencies) + in + prerr_endline + (F.string_of_source_object t^" depends on "^ + F.string_of_source_object unsat^ + " that needs build, thus is not buildable"); + false + with Not_found -> + prerr_endline + ("None of "^F.string_of_source_object t^ + " dependencies needs to be built, thus it is buildable"); + true + ;; + + let rec purge_unwanted_roots wanted deps = + let roots, rest = + List.partition + (fun (t,d,_,_,_,_) -> + not (List.exists (fun (_,d1,_,_,_,_) -> List.mem t d1) deps)) + deps + in + let newroots = List.filter (fun (t,_,_,_,_,_) -> List.mem t wanted) roots in + if newroots = roots then + deps + else + purge_unwanted_roots wanted (newroots @ rest) + ;; + + + let rec make_aux root local_options compiled failed deps = + let todo = List.filter (is_buildable local_options compiled deps) deps in + let todo = List.filter (fun (f,_,_,_,_,_)->not (List.mem f failed)) todo in + if todo <> [] then + let compiled, failed = + let todo = + let local, remote = + List.partition (fun (_,_,froot,_,_,_) -> froot = Some root) todo + in + remote @ local + in + List.fold_left + (fun (c,f) (file,_,froot,_,_,_) -> + let rc = + match froot with + | Some froot when froot = root -> + F.build local_options file + | Some froot -> + make froot [file] + | None -> + HLog.error ("No root for: "^F.string_of_source_object file); + false + in + if rc then (file::c,f) + else (c,file::f)) + (compiled,failed) todo + in + make_aux root local_options compiled failed deps + else + compiled, failed + + and make root targets = + HLog.debug ("Entering directory '"^root^"'"); + let old_root = Sys.getcwd () in + Sys.chdir root; + let deps = F.load_deps_file (root^"/depends") in + let local_options = load_root_file (root^"/root") in + let deps = + List.map + (fun (file,d) -> + HLog.debug (F.string_of_source_object file); + let r,tgt = F.root_and_target_of local_options file in + file, d, r, tgt, F.mtime_of_source_object file, + F.mtime_of_target_object tgt) + deps + in + let _compiled, failed = + if targets = [] then + make_aux root local_options [] [] deps + else + make_aux root local_options [] [] (purge_unwanted_roots targets deps) + in + HLog.debug ("Leaving directory '"^root^"'"); + Sys.chdir old_root; + failed = [] + ;; + +end + +let write_deps_file root deps = + let oc = open_out (root ^ "/depends") in + List.iter + (fun (t,d) -> output_string oc (t^" "^String.concat " " d^"\n")) + deps; + close_out oc; + HLog.message ("Generated: " ^ root ^ "/depends") +;; + diff --git a/helm/software/components/library/librarian.mli b/helm/software/components/library/librarian.mli new file mode 100644 index 000000000..0db8a83ef --- /dev/null +++ b/helm/software/components/library/librarian.mli @@ -0,0 +1,44 @@ +exception NoRootFor of string + +val absolutize: string -> string + +val find_root: string -> string +val load_root_file: string -> (string*string) list + +(* baseuri_of_script ?(inc:REG[matita.includes]) fname + * -> + * root, buri, fullpath, rootrelativepath + * sample: baseuri_of_script a.ma -> /home/pippo/devel/, cic:/matita/a, + * /home/pippo/devel/a.ma, a.ma *) +val baseuri_of_script: + include_paths:string list -> string -> string * string * string * string + +(* finds all the roots files in the specified dir *) +val find_roots_in_dir: string -> string list + +(* make *) +type options = (string * string) list + +module type Format = + sig + type source_object + type target_object + val load_deps_file: string -> (source_object * source_object list) list + val string_of_source_object: source_object -> string + val string_of_target_object: target_object -> string + val build: options -> source_object -> bool + val root_and_target_of: + options -> source_object -> string option * target_object + val mtime_of_source_object: source_object -> float option + val mtime_of_target_object: target_object -> float option + end + +module Make : + functor (F : Format) -> + sig + (* make [root dir] [targets], targets = [] means make all *) + val make : string -> F.source_object list -> bool + end + +val load_deps_file: string -> (string * string list) list +val write_deps_file: string -> (string * string list) list -> unit diff --git a/helm/software/components/library/libraryClean.ml b/helm/software/components/library/libraryClean.ml index a1f2a0cfc..9a3b17245 100644 --- a/helm/software/components/library/libraryClean.ml +++ b/helm/software/components/library/libraryClean.ml @@ -34,14 +34,17 @@ module HGT = Http_getter_types;; module HG = Http_getter;; module UM = UriManager;; -let cache_of_processed_baseuri = Hashtbl.create 1024 -let one_step_depend suri dbtype dbd = - let buri = - try - UM.buri_of_uri (UM.uri_of_string suri) - with UM.IllFormedUri _ -> suri - in +let strip_xpointer s = Pcre.replace ~pat:"#.*$" s ;; + +let safe_buri_of_suri suri = + try + UM.buri_of_uri (UM.uri_of_string suri) + with + UM.IllFormedUri _ -> suri + +let one_step_depend cache_of_processed_baseuri suri dbtype dbd = + let buri = safe_buri_of_suri suri in if Hashtbl.mem cache_of_processed_baseuri buri then [] else @@ -53,18 +56,22 @@ let one_step_depend suri dbtype dbd = let obj_tbl = MetadataTypes.obj_tbl () in if HSql.isMysql dbtype dbd then sprintf ("SELECT source, h_occurrence FROM %s WHERE " - ^^ "h_occurrence REGEXP '^%s[^/]*$'") obj_tbl buri + ^^ "h_occurrence REGEXP '"^^ + "^%s\\([^/]+\\|[^/]+#xpointer.*\\)$"^^"'") + obj_tbl buri else - begin + begin sprintf ("SELECT source, h_occurrence FROM %s WHERE " - ^^ "REGEXP(h_occurrence, '^%s[^/]*$')") obj_tbl buri - (* implementation with vanilla ocaml-sqlite3 - HLog.debug "Warning SELECT without REGEXP"; - sprintf - ("SELECT source, h_occurrence FROM %s WHERE " ^^ - "h_occurrence LIKE '%s%%' " ^^ HSql.escape_string_for_like) - obj_tbl buri*) - end + ^^ "REGEXP(h_occurrence, '"^^ + "^%s\\([^/]+\\|[^/]+#xpointer.*\\)$"^^"')") + obj_tbl buri + (* implementation with vanilla ocaml-sqlite3 + HLog.debug "Warning SELECT without REGEXP"; + sprintf + ("SELECT source, h_occurrence FROM %s WHERE " ^^ + "h_occurrence LIKE '%s%%' " ^^ HSql.escape_string_for_like) + obj_tbl buri*) + end in try let rc = HSql.exec dbtype dbd query in @@ -72,8 +79,9 @@ let one_step_depend suri dbtype dbd = HSql.iter rc ( fun row -> match row.(0), row.(1) with - | Some uri, Some occ when Filename.dirname occ = buri -> - l := uri :: !l + | Some uri, Some occ when + Filename.dirname (strip_xpointer occ) = buri -> + l := uri :: !l | _ -> ()); let l = List.sort Pervasives.compare !l in HExtlib.list_uniq l @@ -81,12 +89,6 @@ let one_step_depend suri dbtype dbd = exn -> raise exn (* no errors should be accepted *) end -let safe_buri_of_suri suri = - try - UM.buri_of_uri (UM.uri_of_string suri) - with - UM.IllFormedUri _ -> suri - let db_uris_of_baseuri buri = let dbd = LibraryDb.instance () in let dbtype = @@ -107,22 +109,20 @@ let db_uris_of_baseuri buri = in try let rc = HSql.exec dbtype dbd query in - let strip_xpointer s = Pcre.replace ~pat:"#.*$" s in let l = ref [] in HSql.iter rc ( fun row -> match row.(0) with | Some uri when Filename.dirname (strip_xpointer uri) = buri -> l := uri :: !l - | _ -> - ()); + | _ -> ()); let l = List.sort Pervasives.compare !l in HExtlib.list_uniq l with exn -> raise exn (* no errors should be accepted *) ;; -let close_uri_list uri_to_remove = +let close_uri_list cache_of_processed_baseuri uri_to_remove = let dbd = LibraryDb.instance () in let dbtype = if Helm_registry.get_bool "matita.system" then HSql.Library else HSql.User @@ -176,17 +176,22 @@ let close_uri_list uri_to_remove = (* now we want the list of all uri that depend on them *) let depend = List.fold_left - (fun acc u -> one_step_depend u dbtype dbd @ acc) [] uri_to_remove + (fun acc u -> one_step_depend cache_of_processed_baseuri u dbtype dbd @ acc) + [] uri_to_remove in let depend = HExtlib.list_uniq (List.fast_sort Pervasives.compare depend) in uri_to_remove, depend +;; -let rec close_db uris next = +let rec close_db cache_of_processed_baseuri uris next = match next with | [] -> uris - | l -> let uris, next = close_uri_list l in close_db uris next @ uris + | l -> + let uris, next = close_uri_list cache_of_processed_baseuri l in + close_db cache_of_processed_baseuri uris next @ uris +;; let cleaned_no = ref 0;; @@ -203,10 +208,11 @@ let moo_root_dir = lazy ( | _ -> assert false) (Helm_registry.get_list Helm_registry.string "getter.prefix")) in - String.sub url 7 (String.length url - 7) (* remove heading "file:///" *) -) + String.sub url 7 (String.length url - 7)) +;; let clean_baseuris ?(verbose=true) buris = + let cache_of_processed_baseuri = Hashtbl.create 1024 in let dbd = LibraryDb.instance () in let dbtype = if Helm_registry.get_bool "matita.system" then HSql.Library else HSql.User @@ -216,7 +222,7 @@ let clean_baseuris ?(verbose=true) buris = debug_prerr "clean_baseuris called on:"; if debug then List.iter debug_prerr buris; - let l = close_db [] buris in + let l = close_db cache_of_processed_baseuri [] buris in let l = HExtlib.list_uniq (List.fast_sort Pervasives.compare l) in let l = List.map UriManager.uri_of_string l in debug_prerr "clean_baseuri will remove:"; @@ -242,7 +248,7 @@ let clean_baseuris ?(verbose=true) buris = let buri = UriManager.buri_of_uri uri in if buri <> !last_baseuri then begin - if Helm_registry.get_bool "matita.bench" then + if not (Helm_registry.get_bool "matita.verbose") then (print_endline ("matitaclean " ^ buri ^ "/");flush stdout) else HLog.message ("Removing: " ^ buri ^ "/*"); diff --git a/helm/software/components/library/librarySync.ml b/helm/software/components/library/librarySync.ml index c36d84c90..630b51be8 100644 --- a/helm/software/components/library/librarySync.ml +++ b/helm/software/components/library/librarySync.ml @@ -243,6 +243,29 @@ let remove_all_coercions () = UriManager.UriHashtbl.clear coercion_hashtbl; CoercDb.remove_coercion (fun (_,_,_,_) -> true) +let stack = ref [];; + +let h2l h = + UriManager.UriHashtbl.fold + (fun k v acc -> (k,v) :: acc) h [] +;; + +let push () = + stack := (CoercDb.dump (), h2l coercion_hashtbl) :: !stack; + remove_all_coercions () +;; + +let pop () = + match !stack with + | [] -> raise (Failure "Unable to POP from librarySync.ml") + | (db,h) :: tl -> + stack := tl; + remove_all_coercions (); + CoercDb.restore db; + List.iter (fun (k,v) -> UriManager.UriHashtbl.add coercion_hashtbl k v) + h +;; + let add_coercion ~add_composites refinement_toolkit uri arity saturations baseuri = diff --git a/helm/software/components/library/librarySync.mli b/helm/software/components/library/librarySync.mli index d8e432e75..9dd3f5c3c 100644 --- a/helm/software/components/library/librarySync.mli +++ b/helm/software/components/library/librarySync.mli @@ -57,6 +57,8 @@ val add_coercion: (* coercions and the information that [uri] and the composites are coercion *) val remove_coercion: UriManager.uri -> unit -(* mh... *) +(* this is used when resetting, but the more gracefull push/pop can be used to + * suspend/resume an execution *) val remove_all_coercions: unit -> unit - +val push: unit -> unit +val pop: unit -> unit diff --git a/helm/software/components/syntax_extensions/pa_unicode_macro.ml b/helm/software/components/syntax_extensions/pa_unicode_macro.ml index 436766862..d81ec2131 100644 --- a/helm/software/components/syntax_extensions/pa_unicode_macro.ml +++ b/helm/software/components/syntax_extensions/pa_unicode_macro.ml @@ -51,9 +51,8 @@ EXTEND String.sub q (pos + 1) (String.length q - pos - 1)) in debug_print (lazy (Printf.sprintf "QUOTATION = %s; ARG = %s" quotation arg)); - if quotation = "unicode" then - let text = TXtok (loc, x, expand_unicode_macro arg) in - {used = []; text = text; styp = STlid (loc, "string")} + if quotation = "unicode" then + AStok (loc, x, Some (ATexpr (loc, expand_unicode_macro arg))) else assert false ] diff --git a/helm/software/components/tactics/tactics.mli b/helm/software/components/tactics/tactics.mli index 8c97039fb..69f415ee1 100644 --- a/helm/software/components/tactics/tactics.mli +++ b/helm/software/components/tactics/tactics.mli @@ -1,4 +1,4 @@ -(* GENERATED FILE, DO NOT EDIT. STAMP:Wed Nov 14 12:07:32 CET 2007 *) +(* GENERATED FILE, DO NOT EDIT. STAMP:Fri Jan 4 11:45:29 CET 2008 *) val absurd : term:Cic.term -> ProofEngineTypes.tactic val apply : term:Cic.term -> ProofEngineTypes.tactic val applyS : diff --git a/helm/software/configure.ac b/helm/software/configure.ac index a20df9d4c..e0f59b499 100644 --- a/helm/software/configure.ac +++ b/helm/software/configure.ac @@ -5,7 +5,7 @@ AC_INIT(matita/matitaTypes.ml) DEBUG_DEFAULT="true" DEFAULT_DBHOST="mysql://mowgli.cs.unibo.it" RT_BASE_DIR_DEFAULT="`pwd`/matita" -MATITA_VERSION="0.4.97" +MATITA_VERSION="0.4.99" DISTRIBUTED="no" # "yes" for distributed tarballs # End of distribution settings @@ -62,8 +62,8 @@ expat \ gdome2 \ http \ lablgtk2 \ +lablgtksourceview.gtksourceview \ lablgtkmathview \ -lablgtksourceview \ mysql \ netstring \ ulex08 \ @@ -91,7 +91,7 @@ FINDLIB_REQUIRES="\ $FINDLIB_CREQUIRES \ lablgtk2.glade \ lablgtkmathview \ -lablgtksourceview \ +lablgtksourceview.gtksourceview \ helm-xmldiff \ " for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES diff --git a/helm/software/make/main.ml b/helm/software/make/main.ml deleted file mode 100644 index df20a35f2..000000000 --- a/helm/software/make/main.ml +++ /dev/null @@ -1,34 +0,0 @@ - -module F = struct - type source_object = string - type target_object = string - let string_of_source_object s = s - let string_of_target_object s = s - let target_of s = s ^ ".o" - let build t = - print_string ("build "^t^"\n"); flush stdout; - ignore(Unix.system ("touch "^target_of t)) - ;; - let mtime_of_source_object s = - try Some (Unix.stat s).Unix.st_mtime - with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> - prerr_endline ("Source file not found: "^s);assert false - ;; - let mtime_of_target_object t = - try Some (Unix.stat t).Unix.st_mtime - with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = t -> None - ;; -end - -module M = Make.Make(F) - -let deps = [ - "a.c", [ "b.c"; "d.c" ]; - "b.c", [ "c.c"; "d.c" ]; - "c.c", []; - "d.c", ["e.c"]; - "e.c", []; - ] -;; - -M.make deps;; diff --git a/helm/software/make/make.ml b/helm/software/make/make.ml deleted file mode 100644 index c243d7935..000000000 --- a/helm/software/make/make.ml +++ /dev/null @@ -1,103 +0,0 @@ - -module type Format = sig - - type source_object - type target_object - - val target_of : source_object -> target_object - val string_of_source_object : source_object -> string - val string_of_target_object : target_object -> string - - val build : source_object -> unit - - val mtime_of_source_object : source_object -> float option - val mtime_of_target_object : target_object -> float option -end - -module Make = functor (F:Format) -> struct - - let prerr_endline _ = ();; - - let younger_s_t a b = - match F.mtime_of_source_object a, F.mtime_of_target_object b with - | Some a, Some b -> a < b - | _ -> false (* XXX check if correct *) - ;; - let younger_t_t a b = - match F.mtime_of_target_object a, F.mtime_of_target_object b with - | Some a, Some b -> a < b - | _ -> false (* XXX check if correct *) - ;; - - let is_built t = younger_s_t t (F.target_of t);; - - let rec needs_build deps compiled (t,dependencies) = - prerr_endline ("Checking if "^F.string_of_source_object t^" needs to be built"); - if List.mem t compiled then - (prerr_endline "already compiled"; - false) - else - if not (is_built t) then - (prerr_endline (F.string_of_source_object t^ - " is not built, thus needs to be built"); - true) - else - try - let unsat = - List.find - (needs_build deps compiled) - (List.map (fun x -> x, List.assoc x deps) dependencies) - in - prerr_endline - (F.string_of_source_object t^" depends on "^F.string_of_source_object (fst unsat)^ - " that needs to be built, thus needs to be built"); - true - with Not_found -> - try - let unsat = - List.find (younger_t_t (F.target_of t)) (List.map F.target_of dependencies) - in - prerr_endline - (F.string_of_source_object t^" depends on "^F.string_of_target_object - unsat^" and "^F.string_of_source_object t^".o is younger than "^ - F.string_of_target_object unsat^", thus needs to be built"); - true - with Not_found -> false - ;; - - let is_buildable compiled deps (t,dependencies) = - prerr_endline ("Checking if "^F.string_of_source_object t^" is buildable"); - let b = needs_build deps compiled (t,dependencies) in - if not b then - (prerr_endline (F.string_of_source_object t^ - " does not need to be built, thus it not buildable"); - false) - else - try - let unsat = - List.find (needs_build deps compiled) - (List.map (fun x -> x, List.assoc x deps) dependencies) - in - prerr_endline - (F.string_of_source_object t^" depends on "^ - F.string_of_source_object (fst unsat)^ - " that needs build, thus is not buildable"); - false - with Not_found -> - prerr_endline - ("None of "^F.string_of_source_object t^ - " dependencies needs to be built, thus it is buildable"); - true - ;; - - let rec make compiled deps = - let todo = List.filter (is_buildable compiled deps) deps in - if todo <> [] then - (List.iter F.build (List.map fst todo); - make (compiled@List.map fst todo) deps) - ;; - - let make deps = make [] deps - -end - diff --git a/helm/software/make/make.mli b/helm/software/make/make.mli deleted file mode 100644 index 8830a8319..000000000 --- a/helm/software/make/make.mli +++ /dev/null @@ -1,18 +0,0 @@ - -module type Format = - sig - type source_object - type target_object - val target_of : source_object -> target_object - val string_of_source_object : source_object -> string - val string_of_target_object : target_object -> string - val build : source_object -> unit - val mtime_of_source_object : source_object -> float option - val mtime_of_target_object : target_object -> float option - end - -module Make : - functor (F : Format) -> - sig - val make : (F.source_object * F.source_object list) list -> unit - end diff --git a/helm/software/make/test/a.c b/helm/software/make/test/a.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/software/make/test/b.c b/helm/software/make/test/b.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/software/make/test/c.c b/helm/software/make/test/c.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/software/make/test/d.c b/helm/software/make/test/d.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/software/make/test/e.c b/helm/software/make/test/e.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/software/matita/.depend b/helm/software/matita/.depend index b0d8efc5b..97149bc33 100644 --- a/helm/software/matita/.depend +++ b/helm/software/matita/.depend @@ -2,8 +2,6 @@ applyTransformation.cmo: applyTransformation.cmi applyTransformation.cmx: applyTransformation.cmi dump_moo.cmo: buildTimeConf.cmo dump_moo.cmx: buildTimeConf.cmx -gragrep.cmo: matitaInit.cmi buildTimeConf.cmo gragrep.cmi -gragrep.cmx: matitaInit.cmx buildTimeConf.cmx gragrep.cmi lablGraphviz.cmo: lablGraphviz.cmi lablGraphviz.cmx: lablGraphviz.cmi matitaAutoGui.cmo: matitaGeneratedGui.cmo applyTransformation.cmi \ @@ -12,50 +10,40 @@ matitaAutoGui.cmx: matitaGeneratedGui.cmx applyTransformation.cmx \ matitaAutoGui.cmi matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi -matitacLib.cmo: matitamakeLib.cmi matitaMisc.cmi matitaInit.cmi \ - matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmo \ +matitacLib.cmo: matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmo \ applyTransformation.cmi matitacLib.cmi -matitacLib.cmx: matitamakeLib.cmx matitaMisc.cmx matitaInit.cmx \ - matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ +matitacLib.cmx: matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ applyTransformation.cmx matitacLib.cmi -matitac.cmo: matitaprover.cmi matitamake.cmi matitadep.cmi matitaclean.cmi \ - matitacLib.cmi matitaWiki.cmo matitaInit.cmi matitaEngine.cmi gragrep.cmi -matitac.cmx: matitaprover.cmx matitamake.cmx matitadep.cmx matitaclean.cmx \ - matitacLib.cmx matitaWiki.cmx matitaInit.cmx matitaEngine.cmx gragrep.cmx +matitac.cmo: matitadep.cmi matitaclean.cmi matitacLib.cmi matitaWiki.cmo \ + matitaMisc.cmi matitaInit.cmi +matitac.cmx: matitadep.cmx matitaclean.cmx matitacLib.cmx matitaWiki.cmx \ + matitaMisc.cmx matitaInit.cmx matitadep.cmo: matitaInit.cmi matitadep.cmi matitadep.cmx: matitaInit.cmx matitadep.cmi matitaEngine.cmo: matitaEngine.cmi matitaEngine.cmx: matitaEngine.cmi -matitaExcPp.cmo: matitaExcPp.cmi -matitaExcPp.cmx: matitaExcPp.cmi +matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi +matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmo buildTimeConf.cmo \ matitaGtkMisc.cmi matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \ matitaGtkMisc.cmi -matitaGui.cmo: matitaprover.cmi matitamakeLib.cmi matitaTypes.cmi \ - matitaScript.cmi matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi \ - matitaGeneratedGui.cmo matitaExcPp.cmi matitaAutoGui.cmi \ - buildTimeConf.cmo matitaGui.cmi -matitaGui.cmx: matitaprover.cmx matitamakeLib.cmx matitaTypes.cmx \ - matitaScript.cmx matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx \ - matitaGeneratedGui.cmx matitaExcPp.cmx matitaAutoGui.cmx \ - buildTimeConf.cmx matitaGui.cmi -matitaInit.cmo: matitamakeLib.cmi matitaExcPp.cmi buildTimeConf.cmo \ - matitaInit.cmi -matitaInit.cmx: matitamakeLib.cmx matitaExcPp.cmx buildTimeConf.cmx \ - matitaInit.cmi -matitamakeLib.cmo: buildTimeConf.cmo matitamakeLib.cmi -matitamakeLib.cmx: buildTimeConf.cmx matitamakeLib.cmi -matitamake.cmo: matitamakeLib.cmi matitaInit.cmi matitamake.cmi -matitamake.cmx: matitamakeLib.cmx matitaInit.cmx matitamake.cmi -matitaMathView.cmo: matitamakeLib.cmi matitaTypes.cmi matitaScript.cmi \ - matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi \ - lablGraphviz.cmi buildTimeConf.cmo applyTransformation.cmi \ - matitaMathView.cmi -matitaMathView.cmx: matitamakeLib.cmx matitaTypes.cmx matitaScript.cmx \ - matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx \ - lablGraphviz.cmx buildTimeConf.cmx applyTransformation.cmx \ - matitaMathView.cmi +matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \ + matitaMathView.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmo \ + matitaExcPp.cmi matitaAutoGui.cmi buildTimeConf.cmo matitaGui.cmi +matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \ + matitaMathView.cmx matitaGtkMisc.cmx matitaGeneratedGui.cmx \ + matitaExcPp.cmx matitaAutoGui.cmx buildTimeConf.cmx matitaGui.cmi +matitaInit.cmo: matitacLib.cmi matitaExcPp.cmi matitaEngine.cmi \ + buildTimeConf.cmo matitaInit.cmi +matitaInit.cmx: matitacLib.cmx matitaExcPp.cmx matitaEngine.cmx \ + buildTimeConf.cmx matitaInit.cmi +matitaMathView.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \ + matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi lablGraphviz.cmi \ + buildTimeConf.cmo applyTransformation.cmi matitaMathView.cmi +matitaMathView.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \ + matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx lablGraphviz.cmx \ + buildTimeConf.cmx applyTransformation.cmx matitaMathView.cmi matitaMisc.cmo: buildTimeConf.cmo matitaMisc.cmi matitaMisc.cmx: buildTimeConf.cmx matitaMisc.cmi matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ @@ -64,15 +52,11 @@ matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ matita.cmx: matitaTypes.cmx matitaScript.cmx matitaMathView.cmx \ matitaInit.cmx matitaGui.cmx matitaGtkMisc.cmx matitaAutoGui.cmx \ buildTimeConf.cmx applyTransformation.cmx -matitaprover.cmo: matitaInit.cmi matitaExcPp.cmi matitaEngine.cmi \ - buildTimeConf.cmo matitaprover.cmi -matitaprover.cmx: matitaInit.cmx matitaExcPp.cmx matitaEngine.cmx \ - buildTimeConf.cmx matitaprover.cmi -matitaScript.cmo: matitamakeLib.cmi matitaTypes.cmi matitaMisc.cmi \ - matitaGtkMisc.cmi matitaEngine.cmi buildTimeConf.cmo \ +matitaScript.cmo: matitacLib.cmi matitaTypes.cmi matitaMisc.cmi \ + matitaGtkMisc.cmi matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmo \ applyTransformation.cmi matitaScript.cmi -matitaScript.cmx: matitamakeLib.cmx matitaTypes.cmx matitaMisc.cmx \ - matitaGtkMisc.cmx matitaEngine.cmx buildTimeConf.cmx \ +matitaScript.cmx: matitacLib.cmx matitaTypes.cmx matitaMisc.cmx \ + matitaGtkMisc.cmx matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ applyTransformation.cmx matitaScript.cmi matitaTypes.cmo: matitaTypes.cmi matitaTypes.cmx: matitaTypes.cmi diff --git a/helm/software/matita/.depend.opt b/helm/software/matita/.depend.opt index 933d2bb51..8477d5640 100644 --- a/helm/software/matita/.depend.opt +++ b/helm/software/matita/.depend.opt @@ -2,58 +2,48 @@ applyTransformation.cmo: applyTransformation.cmi applyTransformation.cmx: applyTransformation.cmi dump_moo.cmo: buildTimeConf.cmx dump_moo.cmx: buildTimeConf.cmx -gragrep.cmo: matitaInit.cmi buildTimeConf.cmx gragrep.cmi -gragrep.cmx: matitaInit.cmx buildTimeConf.cmx gragrep.cmi lablGraphviz.cmo: lablGraphviz.cmi lablGraphviz.cmx: lablGraphviz.cmi -matitaAutoGui.cmo: matitaGeneratedGui.cmx matitaAutoGui.cmi -matitaAutoGui.cmx: matitaGeneratedGui.cmx matitaAutoGui.cmi +matitaAutoGui.cmo: matitaGeneratedGui.cmx applyTransformation.cmi \ + matitaAutoGui.cmi +matitaAutoGui.cmx: matitaGeneratedGui.cmx applyTransformation.cmx \ + matitaAutoGui.cmi matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi -matitacLib.cmo: matitamakeLib.cmi matitaMisc.cmi matitaInit.cmi \ - matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmx \ +matitacLib.cmo: matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmx \ applyTransformation.cmi matitacLib.cmi -matitacLib.cmx: matitamakeLib.cmx matitaMisc.cmx matitaInit.cmx \ - matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ +matitacLib.cmx: matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ applyTransformation.cmx matitacLib.cmi -matitac.cmo: matitaprover.cmi matitamake.cmi matitadep.cmi matitaclean.cmi \ - matitacLib.cmi matitaWiki.cmx matitaInit.cmi matitaEngine.cmi gragrep.cmi -matitac.cmx: matitaprover.cmx matitamake.cmx matitadep.cmx matitaclean.cmx \ - matitacLib.cmx matitaWiki.cmx matitaInit.cmx matitaEngine.cmx gragrep.cmx +matitac.cmo: matitadep.cmi matitaclean.cmi matitacLib.cmi matitaWiki.cmx \ + matitaMisc.cmi matitaInit.cmi +matitac.cmx: matitadep.cmx matitaclean.cmx matitacLib.cmx matitaWiki.cmx \ + matitaMisc.cmx matitaInit.cmx matitadep.cmo: matitaInit.cmi matitadep.cmi matitadep.cmx: matitaInit.cmx matitadep.cmi matitaEngine.cmo: matitaEngine.cmi matitaEngine.cmx: matitaEngine.cmi -matitaExcPp.cmo: matitaExcPp.cmi -matitaExcPp.cmx: matitaExcPp.cmi +matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi +matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmx buildTimeConf.cmx \ matitaGtkMisc.cmi matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \ matitaGtkMisc.cmi -matitaGui.cmo: matitaprover.cmi matitamakeLib.cmi matitaTypes.cmi \ - matitaScript.cmi matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi \ - matitaGeneratedGui.cmx matitaExcPp.cmi matitaAutoGui.cmi \ - buildTimeConf.cmx matitaGui.cmi -matitaGui.cmx: matitaprover.cmx matitamakeLib.cmx matitaTypes.cmx \ - matitaScript.cmx matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx \ - matitaGeneratedGui.cmx matitaExcPp.cmx matitaAutoGui.cmx \ - buildTimeConf.cmx matitaGui.cmi -matitaInit.cmo: matitamakeLib.cmi matitaExcPp.cmi buildTimeConf.cmx \ - matitaInit.cmi -matitaInit.cmx: matitamakeLib.cmx matitaExcPp.cmx buildTimeConf.cmx \ - matitaInit.cmi -matitamakeLib.cmo: buildTimeConf.cmx matitamakeLib.cmi -matitamakeLib.cmx: buildTimeConf.cmx matitamakeLib.cmi -matitamake.cmo: matitamakeLib.cmi matitaInit.cmi matitamake.cmi -matitamake.cmx: matitamakeLib.cmx matitaInit.cmx matitamake.cmi -matitaMathView.cmo: matitamakeLib.cmi matitaTypes.cmi matitaScript.cmi \ - matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi \ - lablGraphviz.cmi buildTimeConf.cmx applyTransformation.cmi \ - matitaMathView.cmi -matitaMathView.cmx: matitamakeLib.cmx matitaTypes.cmx matitaScript.cmx \ - matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx \ - lablGraphviz.cmx buildTimeConf.cmx applyTransformation.cmx \ - matitaMathView.cmi +matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \ + matitaMathView.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmx \ + matitaExcPp.cmi matitaAutoGui.cmi buildTimeConf.cmx matitaGui.cmi +matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \ + matitaMathView.cmx matitaGtkMisc.cmx matitaGeneratedGui.cmx \ + matitaExcPp.cmx matitaAutoGui.cmx buildTimeConf.cmx matitaGui.cmi +matitaInit.cmo: matitacLib.cmi matitaExcPp.cmi matitaEngine.cmi \ + buildTimeConf.cmx matitaInit.cmi +matitaInit.cmx: matitacLib.cmx matitaExcPp.cmx matitaEngine.cmx \ + buildTimeConf.cmx matitaInit.cmi +matitaMathView.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \ + matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi lablGraphviz.cmi \ + buildTimeConf.cmx applyTransformation.cmi matitaMathView.cmi +matitaMathView.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \ + matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx lablGraphviz.cmx \ + buildTimeConf.cmx applyTransformation.cmx matitaMathView.cmi matitaMisc.cmo: buildTimeConf.cmx matitaMisc.cmi matitaMisc.cmx: buildTimeConf.cmx matitaMisc.cmi matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ @@ -62,15 +52,11 @@ matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ matita.cmx: matitaTypes.cmx matitaScript.cmx matitaMathView.cmx \ matitaInit.cmx matitaGui.cmx matitaGtkMisc.cmx matitaAutoGui.cmx \ buildTimeConf.cmx applyTransformation.cmx -matitaprover.cmo: matitaInit.cmi matitaExcPp.cmi matitaEngine.cmi \ - buildTimeConf.cmx matitaprover.cmi -matitaprover.cmx: matitaInit.cmx matitaExcPp.cmx matitaEngine.cmx \ - buildTimeConf.cmx matitaprover.cmi -matitaScript.cmo: matitamakeLib.cmi matitaTypes.cmi matitaMisc.cmi \ - matitaGtkMisc.cmi matitaEngine.cmi buildTimeConf.cmx \ +matitaScript.cmo: matitacLib.cmi matitaTypes.cmi matitaMisc.cmi \ + matitaGtkMisc.cmi matitaExcPp.cmi matitaEngine.cmi buildTimeConf.cmx \ applyTransformation.cmi matitaScript.cmi -matitaScript.cmx: matitamakeLib.cmx matitaTypes.cmx matitaMisc.cmx \ - matitaGtkMisc.cmx matitaEngine.cmx buildTimeConf.cmx \ +matitaScript.cmx: matitacLib.cmx matitaTypes.cmx matitaMisc.cmx \ + matitaGtkMisc.cmx matitaExcPp.cmx matitaEngine.cmx buildTimeConf.cmx \ applyTransformation.cmx matitaScript.cmi matitaTypes.cmo: matitaTypes.cmi matitaTypes.cmx: matitaTypes.cmi diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile index 6595af73e..97d74fdc4 100644 --- a/helm/software/matita/Makefile +++ b/helm/software/matita/Makefile @@ -18,8 +18,8 @@ OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS) OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS) OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS) INSTALL_PROGRAMS= matita matitac -INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser -INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover matitawiki +INSTALL_PROGRAMS_LINKS_MATITA= +INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitaclean matitawiki MATITA_FLAGS = -noprofile NODB=false @@ -31,14 +31,12 @@ MLI = \ lablGraphviz.mli \ matitaTypes.mli \ matitaMisc.mli \ - matitamakeLib.mli \ - matitaExcPp.mli \ - matitaInit.mli \ matitaEngine.mli \ + matitaExcPp.mli \ applyTransformation.mli \ - matitaAutoGui.mli \ matitacLib.mli \ - matitaprover.mli \ + matitaInit.mli \ + matitaAutoGui.mli \ matitaGtkMisc.mli \ matitaScript.mli \ matitaMathView.mli \ @@ -47,20 +45,16 @@ MLI = \ CMLI = \ matitaTypes.mli \ matitaMisc.mli \ - matitamakeLib.mli \ - matitaExcPp.mli \ - matitaInit.mli \ matitaEngine.mli \ + matitaExcPp.mli \ applyTransformation.mli \ matitacLib.mli \ + matitaInit.mli \ matitaWiki.mli \ - matitaprover.mli \ $(NULL) MAINCMLI = \ matitadep.mli \ matitaclean.mli \ - matitamake.mli \ - gragrep.mli \ $(NULL) # objects for matita (GTK GUI) ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml) @@ -69,11 +63,11 @@ CML = buildTimeConf.ml $(CMLI:%.mli=%.ml) MAINCML = $(MAINCMLI:%.mli=%.ml) PROGRAMS_BYTE = \ - matita matitac cicbrowser matitadep matitaclean \ - matitamake matitaprover matitawiki -PROGRAMS = $(PROGRAMS_BYTE) matitatop + matita matitac matitadep matitaclean \ + matitawiki +PROGRAMS = $(PROGRAMS_BYTE) PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE)) -NOINST_PROGRAMS = dump_moo gragrep +NOINST_PROGRAMS = dump_moo NOINST_PROGRAMS_OPT = $(patsubst %,%.opt,$(EXTRA_PROGRAMS)) .PHONY: all @@ -113,9 +107,9 @@ links: linkonly: $(H)echo " OCAMLC matita.ml" - $(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) matita.ml + $(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) $(OCAML_DEBUG_FLAGS) matita.ml $(H)echo " OCAMLC matitac.ml" - $(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) matitac.ml + $(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) $(OCAML_DEBUG_FLAGS) matitac.ml .PHONY: linkonly matita: matita.ml $(LIB_DEPS) $(CMOS) $(H)echo " OCAMLC $<" @@ -147,15 +141,6 @@ rottener.opt: rottener.ml $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) clean-rottened: find . -type f -name "*.ma.*.rottened" -exec rm {} \; -matitatop: matitatop.ml $(CLIB_DEPS) $(CCMOS) - $(H)echo " OCAMLC $<" - $(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ toplevellib.cma $(CCMOS) $< - -matitaprover: matitac - $(H)test -f $@ || ln -s $< $@ -matitaprover.opt: matitac.opt - $(H)test -f $@ || ln -s $< $@ - matitadep: matitac $(H)test -f $@ || ln -s $< $@ matitadep.opt: matitac.opt @@ -171,21 +156,6 @@ matitaclean: matitac matitaclean.opt: matitac.opt $(H)test -f $@ || ln -s $< $@ -matitamake: matitac - $(H)test -f $@ || ln -s $< $@ -matitamake.opt: matitac.opt - $(H)test -f $@ || ln -s $< $@ - -gragrep: matitac - $(H)test -f $@ || ln -s $< $@ -gragrep.opt: matitac.opt - $(H)test -f $@ || ln -s $< $@ - -cicbrowser: matita - $(H)test -f $@ || ln -s $< $@ -cicbrowser.opt: matita.opt - $(H)test -f $@ || ln -s $< $@ - matitaGeneratedGui.ml: matita.glade $(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml @@ -246,14 +216,14 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt) ifeq ($(DISTRIBUTED),yes) -dist_library: install_preliminaries dist_library@standard-library +dist_library: install_preliminaries dist_library@library dist_library@%: - $(H)echo "MATITAMAKE init $*" - $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake init $* $(WHERE)/ma/$*) - $(H)echo "MATITAMAKE publish $*" - $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake publish $*) - $(H)echo "MATITAMAKE destroy $*" - $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake destroy $*) + $(H)echo "depend $*" + $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep) + $(H)echo "publish $*" + $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes) + $(H)echo "destroy $*" + $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean) # sqlite3 only $(H)cp $(WHERE)/.matita/matita.db $(WHERE)/metadata.db || true #$(H)rm -rf $(WHERE)/.matita/ @@ -275,7 +245,6 @@ INSTALL_STUFF = \ matita.conf.xml \ closed.xml \ gtkmathview.matita.conf.xml \ - template_makefile.in \ AUTHORS \ LICENSE \ $(NULL) @@ -369,23 +338,12 @@ matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \ $(STATIC_EXTRA_CLIBS) strip $@ -matitaprover.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml - $(STATIC_LINK) $(STATIC_CLIBS_PROVER) -- \ - $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \ - $(STATIC_EXTRA_CLIBS); - strip $@ matitadep.opt.static: matitac.opt.static $(H)test -f $@ || ln -s $< $@ matitaclean.opt.static: matitac.opt.static $(H)test -f $@ || ln -s $< $@ matitawiki.opt.static: matitac.opt.static $(H)test -f $@ || ln -s $< $@ -matitamake.opt.static: matitac.opt.static - $(H)test -f $@ || ln -s $< $@ -cicbrowser.opt.static: matita.opt.static - $(H)test -f $@ || ln -s $< $@ -cicbrowser.opt.static.upx: matita.opt.static.upx - $(H)test -f $@ || ln -s $< $@ %.upx: % cp $< $@ diff --git a/helm/software/matita/bench_disamberrors b/helm/software/matita/bench_disamberrors deleted file mode 100755 index 87ece78ee..000000000 --- a/helm/software/matita/bench_disamberrors +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -#set -x -TEMP=`getopt -o c:d:m: -- "$@"` -libdir="`pwd`/library" -matitac="`pwd`/matitac.opt" -devel="library" -matitadep="./matitadep.opt" -eval set -- "$TEMP" -while true ; do - case "$1" in - -d) libdir="$2"; shift 2 ;; - -c) matitac="$2"; shift 2 ;; - -m) devel="$2"; shift 2 ;; - --) shift; break ;; - *) echo "Usage: errors_bench [-c MATITAC_PATH] [-d LIBRARY_DIR] [-m MATITAMAKE_DEVEL]"; exit 1 ;; - esac -done -if ! [ -d "$libdir" ] ; then - echo "Can't find library directory '$libdir'" - exit 2 -fi -if ! [ -x "$matitac" ] ; then - echo "Can't find executable Matita compiler '$matitac'" - exit 2 -fi - -ma_s=$(find $libdir -name "*.ma" -type f) -sorted_ma_s=$($matitadep -order $ma_s) - -log="bench_disamberrors.txt" -rm -f "$log" -echo -e "# FILENAME\tOUTCOME\tEXPECTED_ERROR\tERRORS\tSPURIOUS_ERRORS" > $log -# format: tab-separated fields: -# FILENAME OUTCOME EXPECTED_ERROR ERRORS SPURIOUS_ERRORS -# field descriptions: -# OUTCOME is one of {"OK","KO","UNKNOWN(n)"}, n is an exit code -# EXPECTED_ERROR is FROM-TO, where FROM and TO are character counts -# ERRORS, same format as above (FROM-TO) -# SPURIOUS_ERRORS, same format as above (FROM-TO) -log_outcome () -{ - echo -e "$1|$2|$3|$4|$5" >> "$log" -} - -for ma in $sorted_ma_s ; do - mo=`echo $ma | sed 's/\.ma$/.mo/'` - make -C $libdir $mo # ensure deps for $mo have been built - rotten_mas=$(ls $libdir/$ma.*.rottened) - for rotten_ma in $rotten_mas ; do - rotten_ma=$(echo $rotten_ma | sed s@^$(pwd)/@@) # prettier names - echo "$rotten_ma ..." - tmp="bench_disamberrors.tmp" - $matitac $rotten_ma &> $tmp - outcome=$? - if [ "$outcome" = 3 ] ; then - outcome="KO" - elif [ "$outcome" = 0 ] ; then - outcome="OK" - else - outcome="UNKNOWN($outcome)" - fi - supposed_error=$(grep ^error-at: $rotten_ma | cut -f 2 -d' ') - errors="" - spurious_errors="" - error_pass="" - error_loc="" - while read e ; do - if echo "$e" | grep -q "Error at" && [ -n "$error_pass" ] ; then - # this is an error location line - if echo "$e" | grep -q "Spurious" ; then - loc=$(echo "$e" | sed 's/:.*$//' | cut -f 4 -d ' ') - if ! echo "$spurious_errors" | grep -q "$loc"; then - if ! [ -z "$spurious_errors" ] ; then spurious_errors="$spurious_errors," ; fi - spurious_errors="$spurious_errors$loc" - fi - else - loc=$(echo "$e" | sed 's/:.*$//' | cut -f 3 -d ' ') - if ! echo "$errors" | grep -q "$loc"; then - if ! [ -z "$errors" ] ; then errors="$errors," ; fi - errors="$errors$loc" - fi - fi - fi - error_pass=$(echo "$e" | grep "during phases " | sed 's/:.*$//' | cut -f 6 -d' ' | grep "4\|6") - done < $tmp - log_outcome $rotten_ma $outcome $supposed_error $errors $spurious_errors - done -done - -echo "See $log for benchmark results" diff --git a/helm/software/matita/bench_summary.py b/helm/software/matita/bench_summary.py deleted file mode 100755 index 32df4b017..000000000 --- a/helm/software/matita/bench_summary.py +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/python -import sys - -stats = {} -stats['total'] = [] -stats['precise'] = [] -stats['imprecise'] = [] -stats['false-positives'] = [] -stats['undetected'] = [] - -for line in open(sys.argv[1]): - line = line.rstrip() - if line[0] == '#': - continue - cols = line.split('|') - name = cols[0] - if cols[1] != 'KO': - print "Warning: outcome of %s is %s, skipping it" % (name, cols[1]) - continue - expected_error = cols[2] - real_errors = cols[3].split(',') - spurious_errors = cols[4].split(',') - - stats['total'].append((name,real_errors)) - if set([expected_error]) == set(real_errors): - if expected_error in spurious_errors: - stats['false-positives'].append((name,real_errors)) - else: - stats['precise'].append((name,real_errors)) - elif expected_error in real_errors: - if expected_error in spurious_errors: - stats['false-positives'].append((name,real_errors)) - else: - stats['imprecise'].append((name,real_errors)) - else: - if expected_error in spurious_errors: - stats['false-positives'].append((name,real_errors)) - else: - stats['undetected'].append((name,real_errors)) - -for field in ['undetected', 'imprecise', 'false-positives']: - print "====================" - print "%s:" % field - for name,_ in stats[field]: - print " %s" % name - -def average(l): - if not(len(l)): - return "N/A" - else: - return "%6.1f" % (reduce(lambda acc,x: acc+x,l,0)/float(len(l))) - -def mymax(l): - if not(len(l)): - return 0 - else: - return max(l) - -def format_stat(field): - global stats - lista = stats[field] - errors = map(lambda x: len(x[1]),lista) - locations = map(lambda x: len(set(x[1])),lista) - return r'%-15s & %6d & %6s & %6d & %6s & %6d & %6.1f\%% \\' % \ - (field, len(lista), average(locations),mymax(locations), - average(errors),mymax(errors),float(len(lista)) / - len(stats['total']) * 100) - -print "\n" -print format_stat('precise') -print format_stat('imprecise') -print format_stat('false-positives') -print format_stat('undetected') -print r'\hline' -print format_stat('total') diff --git a/helm/software/matita/buildTimeConf.ml.in b/helm/software/matita/buildTimeConf.ml.in index ec01152c4..6f693a138 100644 --- a/helm/software/matita/buildTimeConf.ml.in +++ b/helm/software/matita/buildTimeConf.ml.in @@ -50,9 +50,6 @@ let core_notation_script = runtime_base_dir ^ "/core_notation.moo" let matita_conf = runtime_base_dir ^ "/matita.conf.xml" let closed_xml = runtime_base_dir ^ "/closed.xml" let gtkmathview_conf = runtime_base_dir ^ "/gtkmathview.matita.conf.xml" -let matitamake_makefile_template = runtime_base_dir ^ "/template_makefile.in" -let matitamake_makefile_template_devel = - runtime_base_dir ^ "/template_makefile_devel.in" let stdlib_dir_devel = runtime_base_dir ^ "/library" let stdlib_dir_installed = runtime_base_dir ^ "/ma/standard-library" let help_dir = runtime_base_dir ^ "/help" diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/Makefile new file mode 100644 index 000000000..7fd5e9ccb --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../../../matitac +$(DIR).opt opt all.opt: + ../../../matitac.opt +clean: + ../../../matitaclean +clean.opt: + ../../../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/defs.ma index 4864a2c86..a7dbfcbd6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/blt/defs". + include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/props.ma index c7952ebd2..0f735ac5f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/blt/props". + include "blt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/definitions.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/definitions.ma index ec3212d25..240efefe0 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/definitions.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/definitions.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/definitions". + include "types/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/depends b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/depends new file mode 100644 index 000000000..9bb223d98 --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/depends @@ -0,0 +1,13 @@ +definitions.ma blt/defs.ma plist/defs.ma types/defs.ma +preamble.ma coq.ma +theory.ma blt/props.ma ext/arith.ma ext/tactics.ma plist/props.ma types/props.ma +spare.ma theory.ma +plist/props.ma plist/defs.ma +plist/defs.ma preamble.ma +ext/tactics.ma preamble.ma +ext/arith.ma preamble.ma +types/props.ma types/defs.ma +types/defs.ma preamble.ma +blt/props.ma blt/defs.ma +blt/defs.ma preamble.ma +coq.ma diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/arith.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/arith.ma index e8a076513..95d322b55 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/arith.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/arith.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith". + include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/tactics.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/tactics.ma index 4a7946c68..c23428942 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/tactics.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/tactics.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics". + include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile deleted file mode 100644 index 3198e94cf..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H= @ - -RT_BASEDIR=../../../ -OPTIONS=-bench -onepass -system -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/defs.ma index 1ca1142d9..71cbd156a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/plist/defs". + include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/props.ma index 7338262f1..d40a3a887 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/plist/props". + include "plist/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma index f5ad380c9..29ebdfeff 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/preamble". -include' "../../../legacy/coq.ma". + +include "coq.ma". alias symbol "eq" = "Coq's leibnitz's equality". alias symbol "leq" = "Coq's natural 'less or equal to'". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/root b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/root new file mode 100644 index 000000000..43a60f943 --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/LAMBDA-TYPES/Base-1 +include_paths= ../../../legacy diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/spare.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/spare.ma index e19f961cc..fbcaab295 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/spare.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/spare.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/spare". + include "theory.ma". (* diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/theory.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/theory.ma index d89a21858..9aae1717a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/theory.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/theory.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/theory". + include "ext/tactics.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/defs.ma index 638fd2e49..0f0b999ad 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/types/defs". + include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/props.ma index 1c9b499bb..6917ec13d 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/types/props". + include "types/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/Makefile new file mode 100644 index 000000000..f67b79581 --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/Makefile @@ -0,0 +1,26 @@ +DIR=$(shell basename $$PWD) + +MMAS = $(shell find -name "*.mma") +MAS = $(MMAS:%.mma=%.ma) + +%.ma: %.mma + echo -e "$< preamble.ma \npreamble.ma" > depends + ../../../matitac.opt -dump $@ $< 2>/dev/null + ../../../matitadep.opt + ../../../matitac.opt $@ + +$(DIR) all: $(MAS) + ../../../matitac +$(DIR).opt opt all.opt: $(MAS) + ../../../matitac.opt +clean: + ../../../matitaclean + rm -f $(MAS) +clean.opt: + ../../../matitaclean.opt + rm -f $(MAS) + +theory2.ma: theory2.mma ext/tactics2.ma ext/arith2.ma types/props2.ma blt/props2.ma plist/props2.ma +types/props2.ma: types/props2.mma types/defs2.ma +blt/props2.ma: blt/props2.mma blt/defs2.ma +plist/props2.ma: plist/props2.mma plist/defs2.ma diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs2.mma similarity index 94% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs2.mma index 12438b398..6eb948342 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs2.mma @@ -14,10 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/blt/defs". - include "preamble.ma". - (* object blt not inlined *) diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma similarity index 94% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma index d24466394..1fd2047fd 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma @@ -14,9 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/blt/props". - -include "blt/defs.ma". +include "blt/defs2.ma". inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/lt_blt.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/depend b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/depend deleted file mode 100644 index 4ac4a61a6..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/depend +++ /dev/null @@ -1,9 +0,0 @@ -theory.ma: theory.mma ext/tactics.ma ext/arith.ma types/props.ma blt/props.ma plist/props.ma | ext/tactics.mo.opt ext/arith.mo.opt types/props.mo.opt blt/props.mo.opt plist/props.mo.opt -ext/tactics.ma: ext/tactics.mma preamble.ma | preamble.mo.opt -ext/arith.ma: ext/arith.mma preamble.ma | preamble.mo.opt -types/defs.ma: types/defs.mma preamble.ma | preamble.mo.opt -types/props.ma: types/props.mma types/defs.ma | types/defs.mo.opt -blt/defs.ma: blt/defs.mma preamble.ma | preamble.mo.opt -blt/props.ma: blt/props.mma blt/defs.ma | blt/defs.mo.opt -plist/defs.ma: plist/defs.mma preamble.ma | preamble.mo.opt -plist/props.ma: plist/props.mma plist/defs.ma | plist/defs.mo.opt diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma similarity index 98% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma index ee4663a51..436b497c9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma @@ -14,8 +14,6 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/ext/arith". - include "preamble.ma". inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/nat_dec.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma similarity index 95% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma index 18de7f71a..e6b75198a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma @@ -14,8 +14,6 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/ext/tactics". - include "preamble.ma". inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/insert_eq.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/makefile deleted file mode 100644 index f20e608d8..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/makefile +++ /dev/null @@ -1,58 +0,0 @@ -H=@ - -RT_BASEDIR=../../../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: build_mas preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: clean_mas preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: clean_mas preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: build_mas preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: clean_mas preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: clean_mas preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) - -# FG: added part ############################################################ - -MATITAC = $(RT_BASEDIR)/matitac.opt - -MMAS = $(shell find -name "*.mma") -MAS = $(MMAS:%.mma=%.ma) - -build_mas: preall.opt $(MAS) - -clean_mas: - $(H)rm -f $(MAS) - -%.ma: %.mma - $(H)$(MATITAC) -dump $@ $< $(OPTIONS) - -include depend - -.DELETE_ON_ERROR: diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma similarity index 95% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma index 3dc03da0b..4ae6d5156 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma @@ -14,8 +14,6 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/plist/defs". - include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props2.mma similarity index 93% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props2.mma index 29357a88a..f9cec902e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props2.mma @@ -14,9 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/plist/props". - -include "plist/defs.ma". +include "plist/defs2.ma". inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/plist/props/papp_ss.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/preamble.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/preamble.ma deleted file mode 100644 index f04df2037..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/preamble.ma +++ /dev/null @@ -1,30 +0,0 @@ -(**************************************************************************) -(* ___ *) -(* ||M|| *) -(* ||A|| A project by Andrea Asperti *) -(* ||T|| *) -(* ||I|| Developers: *) -(* ||T|| The HELM team. *) -(* ||A|| http://helm.cs.unibo.it *) -(* \ / *) -(* \ / This file is distributed under the terms of the *) -(* v GNU General Public License Version 2 *) -(* *) -(**************************************************************************) - -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/preamble". - -include "../Base-1/definitions.ma". - -default "equality" - cic:/Coq/Init/Logic/eq.ind - cic:/matita/LAMBDA-TYPES/Base-1/preamble/sym_eq.con - cic:/matita/LAMBDA-TYPES/Base-1/preamble/trans_eq.con - cic:/Coq/Init/Logic/eq_ind.con - cic:/Coq/Init/Logic/eq_ind_r.con - cic:/Coq/Init/Logic/eq_rec.con - cic:/Coq/Init/Logic/eq_rec_r.con - cic:/Coq/Init/Logic/eq_rect.con - cic:/Coq/Init/Logic/eq_rect_r.con - cic:/matita/LAMBDA-TYPES/Base-1/preamble/f_equal.con - cic:/matita/legacy/coq/f_equal1.con. diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/root b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/root new file mode 100644 index 000000000..229adbd73 --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/LAMBDA-TYPES/Base-2 +include_paths= ../Base-1 ../../../legacy diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma similarity index 85% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma index 1adab3e2b..d1a0ca8b4 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma @@ -14,15 +14,13 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/theory". +include "ext/tactics2.ma". -include "ext/tactics.ma". +include "ext/arith2.ma". -include "ext/arith.ma". +include "types/props2.ma". -include "types/props.ma". +include "blt/props2.ma". -include "blt/props.ma". - -include "plist/props.ma". +include "plist/props2.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma similarity index 96% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma index 000f283aa..594edd269 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma @@ -14,8 +14,6 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/types/defs". - include "preamble.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma similarity index 93% rename from helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma rename to helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma index d79bfc46b..10b502461 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma @@ -14,9 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/types/props". - -include "types/defs.ma". +include "types/defs2.ma". inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/types/props/ex2_sym.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/A/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/A/defs.ma index 1c592efd2..b1c263edc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/A/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/A/defs.ma @@ -14,9 +14,9 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/A/defs". -include "preamble.ma". + +include "preamble3.ma". inductive A: Set \def | ASort: nat \to (nat \to A) diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/defs.ma index 0022395ce..ed683a835 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/C/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/props.ma index 30901423e..c983c7864 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/C/props". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/G/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/G/defs.ma index d66873d06..10d9d9d54 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/G/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/G/defs.ma @@ -14,9 +14,9 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/G/defs". -include "preamble.ma". + +include "preamble3.ma". record G : Set \def { next: (nat \to nat); diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/Makefile new file mode 100644 index 000000000..7fd5e9ccb --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../../../matitac +$(DIR).opt opt all.opt: + ../../../matitac.opt +clean: + ../../../matitaclean +clean.opt: + ../../../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/dec.ma index 0d05ba97f..18fe43977 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/dec". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/defs.ma index 236063dcf..f98aaf418 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/defs.ma @@ -14,9 +14,9 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs". -include "preamble.ma". + +include "preamble3.ma". inductive B: Set \def | Abbr: B diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/props.ma index 1c661524e..c9b9619f4 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/props". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma index 0a1c35ea2..9789157aa 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/aplus/defs". + include "asucc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma index 16adef5c3..7ea6fb43a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/aplus/props". + include "aplus/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma index 258037275..e8da5937c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/aprem/defs". + include "A/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma index 60264bca2..7b8320a9c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/aprem/props". + include "aprem/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma index e3a36f11c..84bd49b7e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/aprem". + include "arity/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma index 2af721d15..6e6662c26 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/cimp". + include "arity/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma index 410400d5f..38edb49c1 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/defs". + include "leq/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma index fbdcd3848..e2a3e0792 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/fwd". + include "arity/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma index 46e4c8c86..cf2844c30 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/lift1". + include "arity/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma index 7b60c2af4..eaedb44aa 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/pr3". + include "csuba/arity.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/props.ma index 6c9662aeb..ec9fdb595 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/props". + include "arity/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/subst0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/subst0.ma index 4592f394a..d826c0155 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/subst0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/subst0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/arity/subst0". + include "arity/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma index ae2233051..eb22b192e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/asucc/defs". + include "A/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma index d2c77132e..b6f65337a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd". + include "asucc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma index c5390f97b..75eb7959b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/cimp/defs". + include "getl/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma index ae0f6a567..263d95fd2 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/cimp/props". + include "cimp/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma index 118dc7ccf..4fffe08a3 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clear/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma index 2cfcaa874..142bf6ce7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clear/drop". + include "clear/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma index 4749583de..ef2a4d4d9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clear/fwd". + include "clear/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/props.ma index a1880711d..2d3a7b623 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clear/props". + include "clear/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma index 2885518ea..85679b7fb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clen/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma index 8773297ca..cd4c81674 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/clen/getl". + include "clen/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma index f9b4334e1..946a9c476 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/cnt/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma index 81620ce9e..483834e82 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/cnt/props". + include "cnt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma index ff9d01c9e..6b8cf3462 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/arity". + include "csuba/getl.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma index 036ca2882..43f490004 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/clear". + include "csuba/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma index 1b8612a2f..a47262249 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/defs". + include "arity/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma index 003b18a5e..01ed2fb11 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/drop". + include "csuba/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma index 2b56bc7a0..0ba50cbbd 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd". + include "csuba/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma index d93e4d618..5e9baff2c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/getl". + include "csuba/drop.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma index 62e10c095..590a89f2e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csuba/props". + include "csuba/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma index d697f1257..b705f618e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/arity". + include "csubc/csuba.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma index 059c359ab..1ddc85ae2 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/clear". + include "csubc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma index 646247a79..c4a7269fb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba". + include "csubc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma index 6348a632b..08943ec39 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/defs". + include "sc3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma index 301cba935..748c71484 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/drop". + include "csubc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma index 75651a172..181f3601e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1". + include "csubc/drop.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma index dd2a0397c..6bfecf5a3 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/getl". + include "csubc/drop.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma index d13d2b09f..ccebb72e8 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubc/props". + include "csubc/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear.ma index fb9fdf5a5..2fc335e58 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear". + include "csubst0/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs.ma index 5d90ea599..df56d48aa 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop.ma index b1a063208..98f094101 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop". + include "csubst0/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma index 7980be5fc..1b55e2acb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd". + include "csubst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl.ma index d4ccb6ee5..175c1ae27 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl". + include "csubst0/clear.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/props.ma index 24e20c400..692dbfd87 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst0/props". + include "csubst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs.ma index a298dfc8c..f2b0df4c9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs". + include "csubst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma index 96e86eea5..0f4e479e9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd". + include "csubst1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl.ma index a6af74625..8ade743e9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl". + include "csubst1/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/props.ma index 9cafa826f..c9c7528e6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubst1/props". + include "csubst1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma index 22581895b..69b533d26 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/clear". + include "csubt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma index 3f90ff3ce..22ce12082 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/defs". + include "ty3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma index 7a7efe4ce..567fcce7d 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/drop". + include "csubt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma index 92e19a503..f541ecb34 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd". + include "csubt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma index a0f89e0fa..b8da01d6c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/getl". + include "csubt/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma index d8a6ad246..3330b56b2 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3". + include "csubt/getl.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma index 5d88520a9..115ddda34 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/props". + include "csubt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma index 3fbcb516f..23677feed 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3". + include "csubt/pc3.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma similarity index 96% rename from helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions.ma rename to helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma index 620154782..61d77ed54 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/definitions". + include "tlt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/depends b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/depends new file mode 100644 index 000000000..23eb363fd --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/depends @@ -0,0 +1,200 @@ +definitions3.ma aprem/defs.ma cimp/defs.ma clen/defs.ma cnt/defs.ma csuba/defs.ma csubc/defs.ma csubst1/defs.ma csubt/defs.ma ex0/defs.ma ex1/defs.ma ex2/defs.ma flt/defs.ma fsubst0/defs.ma iso/defs.ma llt/defs.ma next_plus/defs.ma nf2/defs.ma pc1/defs.ma subst1/defs.ma tau1/defs.ma tlt/defs.ma wcpr0/defs.ma +preamble3.ma theory.ma +spare.ma theory.ma +theory3.ma ex0/props.ma ex1/props.ma ex2/props.ma pr3/wcpr0.ma subst0/tlt.ma tau1/cnt.ma ty3/dec.ma ty3/nf2.ma ty3/tau0.ma wcpr0/fwd.ma +tlist/props.ma tlist/defs.ma +tlist/defs.ma T/defs.ma +clen/defs.ma C/defs.ma s/defs.ma +clen/getl.ma clen/defs.ma getl/props.ma +leq/props.ma aplus/props.ma leq/defs.ma +leq/asucc.ma aplus/props.ma leq/props.ma +leq/defs.ma aplus/defs.ma +leq/fwd.ma leq/defs.ma +pr3/props.ma pr1/props.ma pr2/props.ma pr3/pr1.ma +pr3/pr3.ma pr2/pr2.ma pr3/props.ma +pr3/defs.ma pr2/defs.ma +pr3/fwd.ma pr2/fwd.ma pr3/props.ma +pr3/subst1.ma pr2/subst1.ma pr3/defs.ma +pr3/iso.ma iso/props.ma pr3/fwd.ma tlist/props.ma +pr3/wcpr0.ma pr3/props.ma wcpr0/getl.ma +pr3/pr1.ma pr1/defs.ma pr3/defs.ma +ty3/fsubst0.ma csubst0/props.ma getl/getl.ma pc3/fsubst0.ma ty3/props.ma +ty3/nf2.ma nf2/arity.ma pc3/nf2.ma ty3/arity.ma +ty3/props.ma pc3/fwd.ma ty3/fwd.ma +ty3/arity_props.ma sc3/arity.ma ty3/arity.ma ty3/fwd.ma +ty3/arity.ma arity/pr3.ma asucc/fwd.ma ty3/pr3_props.ma +ty3/pr3_props.ma ty3/pr3.ma +ty3/tau0.ma tau0/defs.ma ty3/pr3_props.ma +ty3/pr3.ma csubt/ty3.ma pc1/props.ma pc3/pc1.ma pc3/wcpr0.ma ty3/fsubst0.ma ty3/subst1.ma +ty3/defs.ma G/defs.ma pc3/defs.ma +ty3/fwd.ma pc3/props.ma ty3/defs.ma +ty3/dec.ma getl/dec.ma getl/flt.ma pc3/dec.ma ty3/pr3_props.ma +ty3/subst1.ma csubst1/fwd.ma csubst1/getl.ma getl/getl.ma pc3/fwd.ma pc3/subst1.ma ty3/props.ma +cnt/props.ma cnt/defs.ma lift/fwd.ma +cnt/defs.ma T/defs.ma +fsubst0/defs.ma csubst0/defs.ma subst0/defs.ma +fsubst0/fwd.ma fsubst0/defs.ma +iso/props.ma iso/fwd.ma +iso/defs.ma T/defs.ma +iso/fwd.ma iso/defs.ma tlist/defs.ma +lift/props.ma lift/fwd.ma s/props.ma tlist/defs.ma +lift/defs.ma T/defs.ma s/defs.ma tlist/defs.ma +lift/tlt.ma lift/fwd.ma tlt/props.ma +lift/fwd.ma lift/defs.ma +flt/props.ma C/props.ma flt/defs.ma +flt/defs.ma C/defs.ma +A/defs.ma preamble3.ma +subst0/props.ma lift/props.ma subst0/fwd.ma +subst0/defs.ma lift/defs.ma +subst0/tlt.ma lift/props.ma lift/tlt.ma subst0/defs.ma +subst0/fwd.ma lift/props.ma subst0/defs.ma +subst0/subst0.ma subst0/props.ma +subst0/dec.ma lift/props.ma subst0/defs.ma +pr1/props.ma T/props.ma pr0/subst1.ma pr1/defs.ma subst1/props.ma +pr1/defs.ma pr0/defs.ma +pr1/pr1.ma pr0/pr0.ma pr1/props.ma +T/props.ma T/defs.ma +T/defs.ma preamble3.ma +T/dec.ma T/defs.ma +sc3/props.ma arity/aprem.ma arity/lift1.ma csuba/arity.ma drop1/getl.ma drop1/props.ma lift1/props.ma llt/props.ma nf2/lift1.ma sc3/defs.ma sn3/lift1.ma +sc3/arity.ma csubc/arity.ma csubc/drop1.ma csubc/getl.ma csubc/props.ma +sc3/defs.ma arity/defs.ma drop1/defs.ma sn3/defs.ma +tau1/props.ma tau0/props.ma tau1/defs.ma +tau1/defs.ma tau0/defs.ma +tau1/cnt.ma cnt/props.ma tau1/props.ma +aplus/props.ma aplus/defs.ma next_plus/props.ma +aplus/defs.ma asucc/defs.ma +asucc/defs.ma A/defs.ma G/defs.ma +asucc/fwd.ma asucc/defs.ma +aprem/props.ma aprem/defs.ma leq/defs.ma +aprem/defs.ma A/defs.ma +nf2/props.ma nf2/defs.ma pr2/fwd.ma +nf2/arity.ma arity/subst0.ma nf2/fwd.ma +nf2/pr3.ma nf2/defs.ma pr3/pr3.ma +nf2/defs.ma pr2/defs.ma +nf2/fwd.ma T/props.ma nf2/defs.ma pr2/clen.ma subst0/dec.ma +nf2/dec.ma C/props.ma nf2/defs.ma pr0/dec.ma pr2/clen.ma pr2/fwd.ma +nf2/lift1.ma drop1/defs.ma nf2/props.ma +nf2/iso.ma iso/props.ma nf2/pr3.ma pr3/fwd.ma +drop/props.ma drop/fwd.ma lift/props.ma r/props.ma +drop/defs.ma C/defs.ma lift/defs.ma r/defs.ma +drop/fwd.ma drop/defs.ma +csuba/drop.ma csuba/fwd.ma drop/fwd.ma +csuba/clear.ma clear/fwd.ma csuba/defs.ma +csuba/props.ma csuba/defs.ma +csuba/arity.ma T/props.ma arity/props.ma csuba/getl.ma csuba/props.ma +csuba/defs.ma arity/defs.ma +csuba/fwd.ma csuba/defs.ma +csuba/getl.ma csuba/clear.ma csuba/drop.ma getl/clear.ma +C/props.ma C/defs.ma T/props.ma +C/defs.ma T/defs.ma +csubt/drop.ma csubt/defs.ma drop/fwd.ma +csubt/clear.ma clear/fwd.ma csubt/defs.ma +csubt/props.ma csubt/defs.ma +csubt/pc3.ma csubt/getl.ma pc3/left.ma +csubt/defs.ma ty3/defs.ma +csubt/fwd.ma csubt/defs.ma +csubt/ty3.ma csubt/pc3.ma csubt/props.ma +csubt/getl.ma csubt/clear.ma csubt/drop.ma csubt/fwd.ma getl/clear.ma +cimp/props.ma cimp/defs.ma getl/getl.ma +cimp/defs.ma getl/defs.ma +drop1/props.ma drop/props.ma drop1/defs.ma getl/defs.ma +drop1/defs.ma drop/defs.ma lift1/defs.ma +drop1/getl.ma drop1/defs.ma getl/drop.ma +lift1/props.ma drop1/defs.ma lift/props.ma lift1/defs.ma +lift1/defs.ma lift/defs.ma +lift1/fwd.ma lift/fwd.ma lift1/defs.ma +pr2/pr2.ma getl/props.ma pr0/pr0.ma pr2/defs.ma +pr2/props.ma getl/clear.ma getl/drop.ma pr0/props.ma pr2/defs.ma +pr2/defs.ma getl/defs.ma pr0/defs.ma +pr2/fwd.ma getl/clear.ma getl/drop.ma pr0/fwd.ma pr2/defs.ma +pr2/subst1.ma csubst1/fwd.ma csubst1/getl.ma getl/drop.ma pr0/fwd.ma pr0/subst1.ma pr2/defs.ma subst1/subst1.ma +pr2/clen.ma clen/getl.ma pr2/props.ma +pc3/fsubst0.ma csubst0/getl.ma fsubst0/defs.ma pc3/left.ma +pc3/nf2.ma nf2/pr3.ma pc3/defs.ma +pc3/pc1.ma pc1/defs.ma pc3/defs.ma pr3/pr1.ma +pc3/props.ma pc3/defs.ma pr3/pr3.ma +pc3/left.ma pc3/props.ma +pc3/defs.ma pr3/defs.ma +pc3/fwd.ma pc3/props.ma pr3/fwd.ma +pc3/dec.ma nf2/fwd.ma ty3/arity_props.ma ty3/pr3.ma +pc3/subst1.ma pc3/props.ma pr3/subst1.ma +pc3/wcpr0.ma pc3/props.ma wcpr0/getl.ma +pr0/props.ma pr0/defs.ma subst0/subst0.ma +pr0/pr0.ma lift/tlt.ma pr0/fwd.ma +pr0/defs.ma subst0/defs.ma +pr0/fwd.ma pr0/props.ma +pr0/dec.ma T/dec.ma T/props.ma pr0/fwd.ma subst0/dec.ma +pr0/subst1.ma pr0/props.ma subst1/defs.ma +subst1/props.ma subst0/props.ma subst1/defs.ma +subst1/defs.ma subst0/defs.ma +subst1/fwd.ma subst0/props.ma subst1/defs.ma +subst1/subst1.ma subst0/subst0.ma subst1/fwd.ma +tlt/props.ma tlt/defs.ma +tlt/defs.ma T/defs.ma +r/props.ma r/defs.ma s/defs.ma +r/defs.ma T/defs.ma +wcpr0/defs.ma C/defs.ma pr0/defs.ma +wcpr0/fwd.ma wcpr0/defs.ma +wcpr0/getl.ma getl/props.ma wcpr0/defs.ma +G/defs.ma preamble3.ma +csubst0/drop.ma csubst0/fwd.ma drop/fwd.ma s/props.ma +csubst0/clear.ma clear/fwd.ma csubst0/fwd.ma +csubst0/props.ma csubst0/defs.ma +csubst0/defs.ma C/defs.ma subst0/defs.ma +csubst0/fwd.ma csubst0/defs.ma +csubst0/getl.ma csubst0/clear.ma csubst0/drop.ma getl/fwd.ma +next_plus/props.ma next_plus/defs.ma +next_plus/defs.ma G/defs.ma +tau0/props.ma getl/drop.ma tau0/defs.ma +tau0/defs.ma G/defs.ma getl/defs.ma +csubc/drop.ma csubc/defs.ma sc3/props.ma +csubc/clear.ma csubc/defs.ma +csubc/props.ma csubc/defs.ma sc3/props.ma +csubc/arity.ma arity/defs.ma csubc/csuba.ma +csubc/drop1.ma csubc/drop.ma +csubc/defs.ma sc3/defs.ma +csubc/csuba.ma csuba/defs.ma csubc/defs.ma sc3/props.ma +csubc/getl.ma csubc/clear.ma csubc/drop.ma +arity/props.ma arity/fwd.ma +arity/aprem.ma aprem/props.ma arity/cimp.ma arity/props.ma +arity/pr3.ma arity/subst0.ma csuba/arity.ma pr0/fwd.ma pr1/defs.ma pr3/defs.ma wcpr0/getl.ma +arity/defs.ma getl/defs.ma leq/defs.ma +arity/fwd.ma arity/defs.ma getl/drop.ma leq/asucc.ma leq/fwd.ma +arity/subst0.ma arity/props.ma csubst0/getl.ma csubst0/props.ma fsubst0/fwd.ma getl/getl.ma subst0/dec.ma subst0/fwd.ma +arity/lift1.ma arity/props.ma drop1/defs.ma +arity/cimp.ma arity/defs.ma cimp/props.ma +ex2/props.ma arity/fwd.ma ex2/defs.ma nf2/defs.ma pr2/fwd.ma +ex2/defs.ma C/defs.ma +getl/drop.ma clear/drop.ma getl/props.ma r/props.ma +getl/clear.ma clear/drop.ma getl/props.ma +getl/props.ma clear/props.ma drop/props.ma getl/fwd.ma +getl/defs.ma clear/defs.ma drop/defs.ma +getl/fwd.ma clear/fwd.ma drop/fwd.ma getl/defs.ma +getl/dec.ma getl/props.ma +getl/flt.ma clear/props.ma flt/props.ma getl/fwd.ma +getl/getl.ma getl/clear.ma getl/drop.ma +clear/drop.ma clear/fwd.ma drop/fwd.ma +clear/props.ma clear/fwd.ma +clear/defs.ma C/defs.ma +clear/fwd.ma clear/defs.ma +s/props.ma s/defs.ma +s/defs.ma T/defs.ma +pc1/props.ma pc1/defs.ma pr1/pr1.ma +pc1/defs.ma pr1/defs.ma +sn3/nf2.ma nf2/dec.ma nf2/pr3.ma sn3/defs.ma +sn3/props.ma iso/props.ma nf2/iso.ma pr3/iso.ma sn3/fwd.ma sn3/nf2.ma +sn3/defs.ma pr3/defs.ma +sn3/fwd.ma pr3/props.ma sn3/defs.ma +sn3/lift1.ma drop1/defs.ma lift1/fwd.ma sn3/props.ma +llt/props.ma leq/defs.ma llt/defs.ma +llt/defs.ma A/defs.ma +ex1/props.ma arity/defs.ma ex1/defs.ma leq/props.ma nf2/pr3.ma nf2/props.ma pc3/fwd.ma ty3/fwd.ma +ex1/defs.ma C/defs.ma +ex0/props.ma aplus/props.ma ex0/defs.ma leq/defs.ma +ex0/defs.ma A/defs.ma G/defs.ma +csubst1/props.ma csubst1/defs.ma subst1/defs.ma +csubst1/defs.ma csubst0/defs.ma +csubst1/fwd.ma csubst0/fwd.ma csubst1/defs.ma subst1/props.ma +csubst1/getl.ma csubst0/getl.ma csubst0/props.ma csubst1/props.ma drop/props.ma subst1/props.ma +theory.ma diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma index e0b46886f..eea831c6b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma index af9e245f3..bb9c1347c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop/fwd". + include "drop/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/props.ma index 029720727..e4b21a1a7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop/props". + include "drop/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma index dea03ca70..2a44cd4d5 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop1/defs". + include "drop/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma index f8ec287e3..254873dfc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop1/getl". + include "drop1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma index 5d1e9dc29..1a84d0fe5 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/drop1/props". + include "drop1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma index 078545c74..a2ce931e4 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex0/defs". + include "A/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma index 66350ed9c..d293ade39 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex0/props". + include "ex0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma index 3e16c05ed..3963c2b0e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex1/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma index 218efc455..cbba091bc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex1/props". + include "ex1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma index 482249d5e..5e30cd913 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex2/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma index f35ee3579..85b21716f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ex2/props". + include "ex2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma index 9143b89a2..7ce10924a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/flt/defs". + include "C/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/props.ma index a8d7daff3..f152ce601 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/flt/props". + include "flt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs.ma index d3eccba43..9d80d9cab 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs". + include "csubst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma index 773e57278..ae79197b8 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd". + include "fsubst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma index 8b7c55259..f7b873198 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/clear". + include "getl/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma index f22b7b333..17082d903 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/dec". + include "getl/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma index 0d97227a1..c7e9a4ffb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/defs". + include "drop/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma index c176ca62d..67607225f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/drop". + include "getl/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma index 81a47ff2e..aa9461616 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/flt". + include "getl/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma index 538165227..99bf27b3f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/fwd". + include "getl/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma index 62218d746..6ab30e2b8 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/getl". + include "getl/drop.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/props.ma index a5228d950..0f49cdaac 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/getl/props". + include "getl/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma index fa327f922..46e832ff6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/iso/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma index 5a6607941..fc801e762 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/iso/fwd". + include "iso/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/props.ma index edc9758a9..0393ee140 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/iso/props". + include "iso/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma index 25f9dfd07..73fff7f79 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/leq/asucc". + include "leq/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma index d14a0e535..83f68a21a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/leq/defs". + include "aplus/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma index 36c26579b..649eb872b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/leq/fwd". + include "leq/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/props.ma index 0ad16f9e7..d879be152 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/leq/props". + include "leq/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma index 9a03fcd17..de61fc39f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma index 5a80f43e6..a68695a33 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift/fwd". + include "lift/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/props.ma index 6a8cc0ac0..3805df7db 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift/props". + include "tlist/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma index 0e041d02d..316ebe839 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift/tlt". + include "lift/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma index 4042efeee..3764b6b25 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift1/defs". + include "lift/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma index bbdef6d1f..426af9e10 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd". + include "lift1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma index db5d76536..7b8ce0c79 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/lift1/props". + include "lift1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma index 19ef14486..ba4d1f3ba 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/llt/defs". + include "A/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/props.ma index d34488300..22fcde732 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/llt/props". + include "llt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile deleted file mode 100644 index 8f20b3276..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../../../ -OPTIONS=-bench -onepass -system -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs.ma index 1764e8610..f5922b8e7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs". + include "G/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/props.ma index e0f2654ac..57f461e50 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/next_plus/props". + include "next_plus/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma index d67f67282..75db60a37 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/arity". + include "nf2/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma index d7aa80992..25245ac11 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/dec". + include "nf2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma index 23868ee8b..b219352e9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/defs". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma index 849e86090..531f5979b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd". + include "nf2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma index 54b097c04..7d90db0fc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/iso". + include "nf2/pr3.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma index 33c44778d..9049b7518 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1". + include "nf2/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma index 2206469dc..b33e7c851 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3". + include "nf2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma index 499cd5fdc..47c82fd63 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/nf2/props". + include "nf2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma index c81142f5d..20029263c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc1/defs". + include "pr1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma index 0bd48d44c..279297229 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc1/props". + include "pc1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma index 01f4fc13b..9877b5b84 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/dec". + include "ty3/arity_props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma index 91d5eaf8b..c475349cf 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/defs". + include "pr3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma index 6ab7daf1c..e286c315d 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0". + include "pc3/left.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma index cd70ecf45..9c94e0f44 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd". + include "pc3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma index 3a6db7706..a44249eea 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/left". + include "pc3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma index 41136207b..7bd86cafc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2". + include "pc3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma index 0893239e4..7d592cbbc 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1". + include "pc3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma index 98a40de4e..f72ad7a2b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/props". + include "pc3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma index 510b2d649..6a9dd2464 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1". + include "pc3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma index 5ed59a431..e1a302b8e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0". + include "pc3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma index 26c4a21b6..429de32f7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/dec". + include "pr0/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma index 4086f5beb..8f4ecf549 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/defs". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma index 5d1ef3b24..1adb47749 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd". + include "pr0/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma index 59e04cef8..00f623b69 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0". + include "pr0/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma index 5e8396c47..18496c895 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/props". + include "pr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma index 0aa55239f..f5722a372 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1". + include "pr0/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma index 85540bde7..7a551d6b4 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr1/defs". + include "pr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma index 98a21a512..3aae64c40 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1". + include "pr1/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma index 7840b3cd2..330d11f05 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr1/props". + include "pr1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma index 27275fa3a..e354ba5c4 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/clen". + include "pr2/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma index 77932c984..743e68703 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/defs". + include "pr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma index 848d216fa..7333bbf05 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma index 307d55398..d060f68a0 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma index 2cb35e582..2f8498c59 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/props". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma index 27a0221d5..051b6d50e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma index 3baff8a16..a53549dde 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/defs". + include "pr2/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma index 5e6137217..32626a34c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd". + include "pr3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma index 1f628e9b2..7ec0ba521 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/iso". + include "pr3/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma index 21344033e..df0a92d5b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1". + include "pr3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma index c29781a0e..c3511368c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3". + include "pr3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma index c07efa64d..fa44c4bf3 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/props". + include "pr3/pr1.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma index 4894993fc..b6e5688be 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1". + include "pr3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma index dd20dae41..0d8c422ba 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0". + include "pr3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma similarity index 96% rename from helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble.ma rename to helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma index f9dc333af..4bff57162 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/preamble". -include "../Base-1/theory.ma". + +include "theory.ma". alias id "and_ind" = "cic:/Coq/Init/Logic/and_ind.con". alias id "bool_ind" = "cic:/Coq/Init/Datatypes/bool_ind.con". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/defs.ma index 005f3a107..08a744024 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/r/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/props.ma index 505d1e450..f494453e7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/r/props". + include "r/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/root b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/root new file mode 100644 index 000000000..cca019073 --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/LAMBDA-TYPES/LambdaDelta-1 +include_paths= ../Base-1 diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/defs.ma index 6cb9d340f..8c499e16d 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/s/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/props.ma index 7acdf612f..f77a611e5 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/s/props". + include "s/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma index e7f13ac61..0f1ed1937 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sc3/arity". + include "csubc/arity.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma index fd161f395..ae5754fb9 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sc3/defs". + include "sn3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma index c1d3787b8..2bdf487cf 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sc3/props". + include "sc3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma index 0d38de3a8..92be59104 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sn3/defs". + include "pr3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma index 779e4a8cf..1283e6967 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd". + include "sn3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma index d84d094a2..3428c0e63 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1". + include "sn3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma index 7b5c1d1bb..fa21c378f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2". + include "sn3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma index 8cdfff89e..b47e2a185 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/sn3/props". + include "sn3/nf2.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma similarity index 99% rename from helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare.ma rename to helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma index 70b94347b..891665097 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/spare". + include "theory.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma index cfa2bbe3f..2f299659b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/dec". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma index c675bc6ab..c2e4e2161 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/defs". + include "lift/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma index e16f362b0..c710b9670 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/props.ma index 7b147c20e..fc02e10ce 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/props". + include "subst0/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0.ma index 9b9c0bb54..89253ee4e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0". + include "subst0/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma index fd0ba2f0c..4d2195d14 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma index 304adc590..56a33fe6c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst1/defs". + include "subst0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma index 317086097..2db6e6c65 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd". + include "subst1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/props.ma index a933775b7..ef21270ff 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst1/props". + include "subst1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1.ma index dc20f3ff3..514dd8f99 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1". + include "subst1/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma index 0a1853ded..8fac9e2d5 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tau0/defs". + include "G/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma index 9baf6cb96..c3e134c10 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tau0/props". + include "tau0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma index 845ea8933..3a5824df6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt". + include "tau1/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma index 09a531fbc..ced0a2668 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tau1/defs". + include "tau0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma index 30ee3158c..d74e3bfa6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tau1/props". + include "tau1/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma similarity index 95% rename from helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory.ma rename to helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma index daf2a250e..b0d977422 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/theory". + include "subst0/tlt.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma index ad412abf3..144bb25e1 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tlist/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma index 9f37ad2b4..6ee6bf5d8 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tlist/props". + include "tlist/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma index f5acb3e27..63c0ce597 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tlt/defs". + include "T/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma index b75bc8053..2e3cfc998 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/tlt/props". + include "tlt/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma index ba58219da..5dba1793e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/arity". + include "ty3/pr3_props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props.ma index 2f758d80c..0e221591c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props". + include "ty3/arity.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma index 4ad1efbd4..9357365d7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/dec". + include "ty3/pr3_props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma index eff4d8e7b..a91d36ccd 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/defs". + include "G/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma index 1370b3d79..9fa96ff7f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0". + include "ty3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma index 5267f5c6a..bc861903c 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd". + include "ty3/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma index 358626faa..300238885 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2". + include "ty3/arity.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma index d0f9999d4..dc9fde8e6 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3". + include "csubt/ty3.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props.ma index 4693788ce..fd73008bb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props". + include "ty3/pr3.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma index 9809bc5ef..7fbddf8eb 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/props". + include "ty3/fwd.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma index 60e08dbe1..44d68dd1b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1". + include "ty3/props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma index a470e0d0c..2055522bf 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0". + include "ty3/pr3_props.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma index dff8bb8cc..28aca266a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs". + include "pr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma index 359d38544..adde06ff8 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd". + include "wcpr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma index f52805131..1f5e14c44 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma @@ -14,7 +14,7 @@ (* This file was automatically generated: do not edit *********************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl". + include "wcpr0/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/defs.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/defs.ma index b8a4e2a85..fb71d3976 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/defs.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/defs". + (* LIFT RELATION - Usage: invoke with positive polarity diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/fun.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/fun.ma index 86e8031b4..d26bdb0e7 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/fun.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/fun.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/fun". + include "Lift/inv.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/inv.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/inv.ma index 95630e43e..bbd8d744e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/inv.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/inv". + include "Lift/defs.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/props.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/props.ma index 9df9cbd63..8e50c477b 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/props.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/props.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/props". + include "Lift/fun.ma". diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Makefile new file mode 100644 index 000000000..7fd5e9ccb --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../../../matitac +$(DIR).opt opt all.opt: + ../../../matitac.opt +clean: + ../../../matitaclean +clean.opt: + ../../../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Context.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Context.ma index f5c63fd0b..d63ffcf2e 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Context.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Context.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/datatypes/Context". + (* FLAT CONTEXTS - Naming policy: diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Term.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Term.ma index a7f5e7f07..e1f090d1a 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Term.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Term.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/datatypes/Term". + (* POLARIZED TERMS - Naming policy: @@ -24,7 +24,7 @@ set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/datatypes/Term". - terms : t u *) -include "preamble.ma". +include "preamble4.ma". inductive Bind: Type \def | abbr: Bind diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/depends b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/depends new file mode 100644 index 000000000..82206df5e --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/depends @@ -0,0 +1,12 @@ +preamble4.ma NLE/nplus.ma NLE/props.ma NPlus/monoid.ma datatypes/Bool.ma logic/equality.ma +datatypes/Context.ma datatypes/Term.ma +datatypes/Term.ma preamble4.ma +Lift/props.ma Lift/fun.ma +Lift/inv.ma Lift/defs.ma +Lift/defs.ma datatypes/Term.ma +Lift/fun.ma Lift/inv.ma +NLE/nplus.ma +NLE/props.ma +NPlus/monoid.ma +datatypes/Bool.ma +logic/equality.ma diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/makefile deleted file mode 100644 index d7a63e5f1..000000000 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../../../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma similarity index 85% rename from helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble.ma rename to helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma index d889c3995..1449c154f 100644 --- a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble.ma +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma @@ -14,16 +14,16 @@ (* Project started Tue Aug 22, 2006 ***************************************) -set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/preamble". + (* PREAMBLE *) include "logic/equality.ma". -include "../../RELATIONAL/datatypes/Bool.ma". -include "../../RELATIONAL/NPlus/monoid.ma". -include "../../RELATIONAL/NLE/props.ma". -include "../../RELATIONAL/NLE/nplus.ma". +include "datatypes/Bool.ma". +include "NPlus/monoid.ma". +include "NLE/props.ma". +include "NLE/nplus.ma". axiom f_equal_3: \forall (A,B,C,D:Set). \forall (f:A \to B \to C \to D). diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/root b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/root new file mode 100644 index 000000000..e3402e0be --- /dev/null +++ b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/LAMBDA-TYPES/Unified-Sub +include_paths= ../../RELATIONAL/ diff --git a/helm/software/matita/contribs/LOGIC/CLE/defs.ma b/helm/software/matita/contribs/LOGIC/CLE/defs.ma index 5b3ba49b7..03065ada0 100644 --- a/helm/software/matita/contribs/LOGIC/CLE/defs.ma +++ b/helm/software/matita/contribs/LOGIC/CLE/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/CLE/defs". + (* ORDER RELATION BETWEEN POSITIONS AND CONTEXTS *) diff --git a/helm/software/matita/contribs/LOGIC/Insert/defs.ma b/helm/software/matita/contribs/LOGIC/Insert/defs.ma index 821fd99c2..c3109a5f6 100644 --- a/helm/software/matita/contribs/LOGIC/Insert/defs.ma +++ b/helm/software/matita/contribs/LOGIC/Insert/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Insert/defs". + (* INSERT RELATION FOR CONTEXTS *) diff --git a/helm/software/matita/contribs/LOGIC/Insert/fun.ma b/helm/software/matita/contribs/LOGIC/Insert/fun.ma index 7c7aba28a..d06a7e29c 100644 --- a/helm/software/matita/contribs/LOGIC/Insert/fun.ma +++ b/helm/software/matita/contribs/LOGIC/Insert/fun.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Insert/fun". + include "CLE/defs.ma". include "Insert/inv.ma". diff --git a/helm/software/matita/contribs/LOGIC/Insert/inv.ma b/helm/software/matita/contribs/LOGIC/Insert/inv.ma index 9053183f9..df5ca04f3 100644 --- a/helm/software/matita/contribs/LOGIC/Insert/inv.ma +++ b/helm/software/matita/contribs/LOGIC/Insert/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Insert/inv". + (* *) diff --git a/helm/software/matita/contribs/LOGIC/Insert/props.ma b/helm/software/matita/contribs/LOGIC/Insert/props.ma index 17148e27e..3289e68a7 100644 --- a/helm/software/matita/contribs/LOGIC/Insert/props.ma +++ b/helm/software/matita/contribs/LOGIC/Insert/props.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Insert/props". + (* *) diff --git a/helm/software/matita/contribs/LOGIC/Lift/defs.ma b/helm/software/matita/contribs/LOGIC/Lift/defs.ma index f770bcf8d..86d588e3e 100644 --- a/helm/software/matita/contribs/LOGIC/Lift/defs.ma +++ b/helm/software/matita/contribs/LOGIC/Lift/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Lift/defs". + (* PROOF RELOCATION *) diff --git a/helm/software/matita/contribs/LOGIC/Makefile b/helm/software/matita/contribs/LOGIC/Makefile new file mode 100644 index 000000000..c925bddff --- /dev/null +++ b/helm/software/matita/contribs/LOGIC/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../../matitac +$(DIR).opt opt all.opt: + ../../matitac.opt +clean: + ../../matitaclean +clean.opt: + ../../matitaclean.opt +depend: + ../../matitadep +depend.opt: + ../../matitadep.opt diff --git a/helm/software/matita/contribs/LOGIC/NTrack/defs.ma b/helm/software/matita/contribs/LOGIC/NTrack/defs.ma index 1bf18389f..15560f19c 100644 --- a/helm/software/matita/contribs/LOGIC/NTrack/defs.ma +++ b/helm/software/matita/contribs/LOGIC/NTrack/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/NTrack/defs". + (* NORMAL PROOF TREE TRACKS *) diff --git a/helm/software/matita/contribs/LOGIC/NTrack/inv.ma b/helm/software/matita/contribs/LOGIC/NTrack/inv.ma index f272bd518..68e7d7b1f 100644 --- a/helm/software/matita/contribs/LOGIC/NTrack/inv.ma +++ b/helm/software/matita/contribs/LOGIC/NTrack/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/NTrack/inv". + include "NTrack/defs.ma". (* diff --git a/helm/software/matita/contribs/LOGIC/NTrack/order.ma b/helm/software/matita/contribs/LOGIC/NTrack/order.ma index 11868b6ef..d136c47ba 100644 --- a/helm/software/matita/contribs/LOGIC/NTrack/order.ma +++ b/helm/software/matita/contribs/LOGIC/NTrack/order.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/NTrack/order". + include "Track/order.ma". include "NTrack/props.ma". diff --git a/helm/software/matita/contribs/LOGIC/NTrack/props.ma b/helm/software/matita/contribs/LOGIC/NTrack/props.ma index bdd23748f..3fdd5de61 100644 --- a/helm/software/matita/contribs/LOGIC/NTrack/props.ma +++ b/helm/software/matita/contribs/LOGIC/NTrack/props.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/NTrack/props". + include "Insert/props.ma". include "Track/defs.ma". diff --git a/helm/software/matita/contribs/LOGIC/PEq/defs.ma b/helm/software/matita/contribs/LOGIC/PEq/defs.ma index 1ffe5b20b..ec6b29679 100644 --- a/helm/software/matita/contribs/LOGIC/PEq/defs.ma +++ b/helm/software/matita/contribs/LOGIC/PEq/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/PEq/defs". + (* EQUALITY PREDICATE FOR PROOFS IN CONTEXT *) diff --git a/helm/software/matita/contribs/LOGIC/PNF/defs.ma b/helm/software/matita/contribs/LOGIC/PNF/defs.ma index 4f11e8c56..77fe6d577 100644 --- a/helm/software/matita/contribs/LOGIC/PNF/defs.ma +++ b/helm/software/matita/contribs/LOGIC/PNF/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/PNF/defs". + (* NORMAL FORM PREDICATE FOR PROOFS IN CONTEXT For cut elimination diff --git a/helm/software/matita/contribs/LOGIC/PRed/defs.ma b/helm/software/matita/contribs/LOGIC/PRed/defs.ma index 85a4c3bf9..bee77f1ed 100644 --- a/helm/software/matita/contribs/LOGIC/PRed/defs.ma +++ b/helm/software/matita/contribs/LOGIC/PRed/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/PRed/defs". + (* SINGLE STEP PARALLEL REDUCTION For cut elimination diff --git a/helm/software/matita/contribs/LOGIC/PRed/wlt.ma b/helm/software/matita/contribs/LOGIC/PRed/wlt.ma index 3e7d727ed..c48cfb078 100644 --- a/helm/software/matita/contribs/LOGIC/PRed/wlt.ma +++ b/helm/software/matita/contribs/LOGIC/PRed/wlt.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/PRed/wlt". + (**) diff --git a/helm/software/matita/contribs/LOGIC/Track/defs.ma b/helm/software/matita/contribs/LOGIC/Track/defs.ma index 25cf7c0b5..e3779f837 100644 --- a/helm/software/matita/contribs/LOGIC/Track/defs.ma +++ b/helm/software/matita/contribs/LOGIC/Track/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Track/defs". + (* PROOF TREE TRACKS *) diff --git a/helm/software/matita/contribs/LOGIC/Track/inv.ma b/helm/software/matita/contribs/LOGIC/Track/inv.ma index d38d3f120..51935b4e0 100644 --- a/helm/software/matita/contribs/LOGIC/Track/inv.ma +++ b/helm/software/matita/contribs/LOGIC/Track/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Track/inv". + include "Track/defs.ma". diff --git a/helm/software/matita/contribs/LOGIC/Track/order.ma b/helm/software/matita/contribs/LOGIC/Track/order.ma index 2c90f3303..934632cd4 100644 --- a/helm/software/matita/contribs/LOGIC/Track/order.ma +++ b/helm/software/matita/contribs/LOGIC/Track/order.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Track/order". + include "Insert/fun.ma". include "Track/defs.ma". diff --git a/helm/software/matita/contribs/LOGIC/Track/pred.ma b/helm/software/matita/contribs/LOGIC/Track/pred.ma index cce6c7800..7cf152b94 100644 --- a/helm/software/matita/contribs/LOGIC/Track/pred.ma +++ b/helm/software/matita/contribs/LOGIC/Track/pred.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Track/pred". + (**) diff --git a/helm/software/matita/contribs/LOGIC/WLT/defs.ma b/helm/software/matita/contribs/LOGIC/WLT/defs.ma index 5a844a60a..8d1b7abdc 100644 --- a/helm/software/matita/contribs/LOGIC/WLT/defs.ma +++ b/helm/software/matita/contribs/LOGIC/WLT/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/WLT/defs". + (* ORDER RELATION BETWEEN PROOFS IN CONTEXT *) diff --git a/helm/software/matita/contribs/LOGIC/Weight/defs.ma b/helm/software/matita/contribs/LOGIC/Weight/defs.ma index 5dfcdde5c..7e6439363 100644 --- a/helm/software/matita/contribs/LOGIC/Weight/defs.ma +++ b/helm/software/matita/contribs/LOGIC/Weight/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/Weight/defs". + (* PROOF WEIGHT For cut elimination and confluence diff --git a/helm/software/matita/contribs/LOGIC/datatypes_defs/Context.ma b/helm/software/matita/contribs/LOGIC/datatypes_defs/Context.ma index e5dba4aaf..60c38f70c 100644 --- a/helm/software/matita/contribs/LOGIC/datatypes_defs/Context.ma +++ b/helm/software/matita/contribs/LOGIC/datatypes_defs/Context.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Context". + (* FLAT CONTEXTS - Naming policy: diff --git a/helm/software/matita/contribs/LOGIC/datatypes_defs/Formula.ma b/helm/software/matita/contribs/LOGIC/datatypes_defs/Formula.ma index ec6441dd1..5080b2600 100644 --- a/helm/software/matita/contribs/LOGIC/datatypes_defs/Formula.ma +++ b/helm/software/matita/contribs/LOGIC/datatypes_defs/Formula.ma @@ -12,14 +12,14 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Formula". + (* FORMULAE - Naming policy: - formulae: a b c d *) -include "preamble.ma". +include "preamble0.ma". inductive Formula: Type \def | posr: Nat \to Formula diff --git a/helm/software/matita/contribs/LOGIC/datatypes_defs/Proof.ma b/helm/software/matita/contribs/LOGIC/datatypes_defs/Proof.ma index fa2c29ffa..1f56cd976 100644 --- a/helm/software/matita/contribs/LOGIC/datatypes_defs/Proof.ma +++ b/helm/software/matita/contribs/LOGIC/datatypes_defs/Proof.ma @@ -12,14 +12,14 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Proof". + (* PROOFS - Naming policy: - proofs: p q r s *) -include "preamble.ma". +include "preamble0.ma". inductive Proof: Type \def | lref: Nat \to Proof (* projection *) diff --git a/helm/software/matita/contribs/LOGIC/datatypes_defs/Sequent.ma b/helm/software/matita/contribs/LOGIC/datatypes_defs/Sequent.ma index 09d826991..cc06ccb5d 100644 --- a/helm/software/matita/contribs/LOGIC/datatypes_defs/Sequent.ma +++ b/helm/software/matita/contribs/LOGIC/datatypes_defs/Sequent.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Sequent". + (* SEQUENTS - Naming policy: diff --git a/helm/software/matita/contribs/LOGIC/datatypes_props/Sequent.ma b/helm/software/matita/contribs/LOGIC/datatypes_props/Sequent.ma index f7c44a81f..335a10bf3 100644 --- a/helm/software/matita/contribs/LOGIC/datatypes_props/Sequent.ma +++ b/helm/software/matita/contribs/LOGIC/datatypes_props/Sequent.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/LOGIC/datatypes_props/Sequent". + include "datatypes_defs/Sequent.ma". diff --git a/helm/software/matita/contribs/LOGIC/depends b/helm/software/matita/contribs/LOGIC/depends new file mode 100644 index 000000000..452f04c22 --- /dev/null +++ b/helm/software/matita/contribs/LOGIC/depends @@ -0,0 +1,27 @@ +preamble0.ma NLE/defs.ma +Insert/props.ma Insert/fun.ma +Insert/inv.ma Insert/defs.ma +Insert/defs.ma Lift/defs.ma datatypes_defs/Context.ma +Insert/fun.ma CLE/defs.ma Insert/inv.ma +datatypes_defs/Context.ma datatypes_defs/Proof.ma datatypes_defs/Sequent.ma +datatypes_defs/Sequent.ma datatypes_defs/Formula.ma +datatypes_defs/Proof.ma preamble0.ma +datatypes_defs/Formula.ma preamble0.ma +PRed/wlt.ma PEq/defs.ma PRed/defs.ma WLT/defs.ma +PRed/defs.ma Insert/defs.ma +Track/inv.ma Track/defs.ma +Track/pred.ma PRed/defs.ma Track/inv.ma datatypes_props/Sequent.ma +Track/defs.ma Insert/defs.ma +Track/order.ma Insert/fun.ma Track/defs.ma +Lift/defs.ma datatypes_defs/Proof.ma +PNF/defs.ma PEq/defs.ma PRed/defs.ma +datatypes_props/Sequent.ma datatypes_defs/Sequent.ma +Weight/defs.ma datatypes_defs/Context.ma +CLE/defs.ma datatypes_defs/Context.ma +NTrack/props.ma Insert/props.ma NTrack/inv.ma Track/defs.ma +NTrack/inv.ma NTrack/defs.ma +NTrack/defs.ma Insert/defs.ma +NTrack/order.ma NTrack/props.ma Track/order.ma +PEq/defs.ma datatypes_defs/Context.ma +WLT/defs.ma Weight/defs.ma +NLE/defs.ma diff --git a/helm/software/matita/contribs/LOGIC/makefile b/helm/software/matita/contribs/LOGIC/makefile deleted file mode 100644 index e5ac91fc8..000000000 --- a/helm/software/matita/contribs/LOGIC/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/contribs/LOGIC/preamble.ma b/helm/software/matita/contribs/LOGIC/preamble0.ma similarity index 93% rename from helm/software/matita/contribs/LOGIC/preamble.ma rename to helm/software/matita/contribs/LOGIC/preamble0.ma index b1e50f811..8aa350f69 100644 --- a/helm/software/matita/contribs/LOGIC/preamble.ma +++ b/helm/software/matita/contribs/LOGIC/preamble0.ma @@ -14,9 +14,9 @@ (* Project started Sat Apr 7, 2007 ****************************************) -set "baseuri" "cic:/matita/LOGIC/preamble". + (* PREAMBLE *) -include "../RELATIONAL/NLE/defs.ma". +include "NLE/defs.ma". diff --git a/helm/software/matita/contribs/LOGIC/root b/helm/software/matita/contribs/LOGIC/root new file mode 100644 index 000000000..33cc9a789 --- /dev/null +++ b/helm/software/matita/contribs/LOGIC/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/LOGIC +include_paths= ../RELATIONAL diff --git a/helm/software/matita/contribs/Makefile b/helm/software/matita/contribs/Makefile index 9c104f361..7e4aa7046 100644 --- a/helm/software/matita/contribs/Makefile +++ b/helm/software/matita/contribs/Makefile @@ -1,6 +1,6 @@ GOALS = all opt clean clean.opt -DEVELS = ../library ../legacy RELATIONAL LOGIC LAMBDA-TYPES +DEVELS = RELATIONAL LOGIC LAMBDA-TYPES $(GOALS): @$(foreach DEVEL, $(DEVELS), $(MAKE) -C $(DEVEL) $@;) diff --git a/helm/software/matita/contribs/RELATIONAL/Makefile b/helm/software/matita/contribs/RELATIONAL/Makefile new file mode 100644 index 000000000..c925bddff --- /dev/null +++ b/helm/software/matita/contribs/RELATIONAL/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../../matitac +$(DIR).opt opt all.opt: + ../../matitac.opt +clean: + ../../matitaclean +clean.opt: + ../../matitaclean.opt +depend: + ../../matitadep +depend.opt: + ../../matitadep.opt diff --git a/helm/software/matita/contribs/RELATIONAL/NLE/defs.ma b/helm/software/matita/contribs/RELATIONAL/NLE/defs.ma index 18fc87b10..535b717aa 100644 --- a/helm/software/matita/contribs/RELATIONAL/NLE/defs.ma +++ b/helm/software/matita/contribs/RELATIONAL/NLE/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NLE/defs". + include "NPlus/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NLE/inv.ma b/helm/software/matita/contribs/RELATIONAL/NLE/inv.ma index 013cd67f1..af2fa812b 100644 --- a/helm/software/matita/contribs/RELATIONAL/NLE/inv.ma +++ b/helm/software/matita/contribs/RELATIONAL/NLE/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NLE/inv". + include "NLE/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NLE/nplus.ma b/helm/software/matita/contribs/RELATIONAL/NLE/nplus.ma index d90adb926..85dac01a9 100644 --- a/helm/software/matita/contribs/RELATIONAL/NLE/nplus.ma +++ b/helm/software/matita/contribs/RELATIONAL/NLE/nplus.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NLE/nplus". + include "NLE/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NLE/order.ma b/helm/software/matita/contribs/RELATIONAL/NLE/order.ma index cc3cc3030..6918bbc0f 100644 --- a/helm/software/matita/contribs/RELATIONAL/NLE/order.ma +++ b/helm/software/matita/contribs/RELATIONAL/NLE/order.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NLE/order". + include "NLE/inv.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NLE/props.ma b/helm/software/matita/contribs/RELATIONAL/NLE/props.ma index 576a079ae..1eb0455fe 100644 --- a/helm/software/matita/contribs/RELATIONAL/NLE/props.ma +++ b/helm/software/matita/contribs/RELATIONAL/NLE/props.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NLE/props". + include "NLE/order.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlus/defs.ma b/helm/software/matita/contribs/RELATIONAL/NPlus/defs.ma index 8d8b304c3..34f4e3491 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlus/defs.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlus/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlus/defs". + include "datatypes/Nat.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlus/fun.ma b/helm/software/matita/contribs/RELATIONAL/NPlus/fun.ma index 03dd7d0ef..271a7c6e4 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlus/fun.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlus/fun.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlus/fun". + include "NPlus/inv.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlus/inv.ma b/helm/software/matita/contribs/RELATIONAL/NPlus/inv.ma index b6ac60873..e3ec16898 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlus/inv.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlus/inv.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlus/inv". + include "NPlus/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlus/monoid.ma b/helm/software/matita/contribs/RELATIONAL/NPlus/monoid.ma index a521c9a1d..7fc798878 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlus/monoid.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlus/monoid.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlus/monoid". + include "NPlus/fun.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlusList/defs.ma b/helm/software/matita/contribs/RELATIONAL/NPlusList/defs.ma index 86d023165..cac07f91a 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlusList/defs.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlusList/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlusList/defs". + include "datatypes/List.ma". include "NPlus/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/NPlusList/props.ma b/helm/software/matita/contribs/RELATIONAL/NPlusList/props.ma index f7fc4305e..4b70088a2 100644 --- a/helm/software/matita/contribs/RELATIONAL/NPlusList/props.ma +++ b/helm/software/matita/contribs/RELATIONAL/NPlusList/props.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/NPlusList/props". + include "NPlusList/defs.ma". (* diff --git a/helm/software/matita/contribs/RELATIONAL/ZEq/defs.ma b/helm/software/matita/contribs/RELATIONAL/ZEq/defs.ma index 6d270cab3..91beaef0e 100644 --- a/helm/software/matita/contribs/RELATIONAL/ZEq/defs.ma +++ b/helm/software/matita/contribs/RELATIONAL/ZEq/defs.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/ZEq/defs". + include "datatypes/Zah.ma". include "NPlus/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/ZEq/setoid.ma b/helm/software/matita/contribs/RELATIONAL/ZEq/setoid.ma index 37ca8f619..587470bfc 100644 --- a/helm/software/matita/contribs/RELATIONAL/ZEq/setoid.ma +++ b/helm/software/matita/contribs/RELATIONAL/ZEq/setoid.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/ZEq/setoid". + include "NPlus/fun.ma". include "ZEq/defs.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/datatypes/Bool.ma b/helm/software/matita/contribs/RELATIONAL/datatypes/Bool.ma index 58345281b..970d6694c 100644 --- a/helm/software/matita/contribs/RELATIONAL/datatypes/Bool.ma +++ b/helm/software/matita/contribs/RELATIONAL/datatypes/Bool.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/datatypes/Bool". + include "preamble.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/datatypes/List.ma b/helm/software/matita/contribs/RELATIONAL/datatypes/List.ma index 313362e5d..b8abed54d 100644 --- a/helm/software/matita/contribs/RELATIONAL/datatypes/List.ma +++ b/helm/software/matita/contribs/RELATIONAL/datatypes/List.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/datatypes/List". + include "preamble.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/datatypes/Nat.ma b/helm/software/matita/contribs/RELATIONAL/datatypes/Nat.ma index 75a3c58d3..ed45a35fe 100644 --- a/helm/software/matita/contribs/RELATIONAL/datatypes/Nat.ma +++ b/helm/software/matita/contribs/RELATIONAL/datatypes/Nat.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/datatypes/Nat". + include "preamble.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/datatypes/Zah.ma b/helm/software/matita/contribs/RELATIONAL/datatypes/Zah.ma index 87f61d7d1..45ce72c56 100644 --- a/helm/software/matita/contribs/RELATIONAL/datatypes/Zah.ma +++ b/helm/software/matita/contribs/RELATIONAL/datatypes/Zah.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/datatypes/Zah". + include "datatypes/Nat.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/depends b/helm/software/matita/contribs/RELATIONAL/depends new file mode 100644 index 000000000..9d79219ac --- /dev/null +++ b/helm/software/matita/contribs/RELATIONAL/depends @@ -0,0 +1,21 @@ +preamble.ma datatypes/constructors.ma logic/connectives.ma logic/equality.ma +datatypes/Nat.ma preamble.ma +datatypes/Zah.ma datatypes/Nat.ma +datatypes/List.ma preamble.ma +datatypes/Bool.ma preamble.ma +ZEq/setoid.ma NPlus/fun.ma ZEq/defs.ma +ZEq/defs.ma NPlus/defs.ma datatypes/Zah.ma +NLE/nplus.ma NLE/defs.ma +NLE/props.ma NLE/order.ma +NLE/inv.ma NLE/defs.ma +NLE/defs.ma NPlus/defs.ma datatypes/Nat.ma +NLE/order.ma NLE/inv.ma +NPlusList/props.ma NPlusList/defs.ma +NPlusList/defs.ma NPlus/defs.ma datatypes/List.ma +NPlus/inv.ma NPlus/defs.ma +NPlus/monoid.ma NPlus/fun.ma +NPlus/defs.ma datatypes/Nat.ma +NPlus/fun.ma NPlus/inv.ma +datatypes/constructors.ma +logic/connectives.ma +logic/equality.ma diff --git a/helm/software/matita/contribs/RELATIONAL/makefile b/helm/software/matita/contribs/RELATIONAL/makefile deleted file mode 100644 index e5ac91fc8..000000000 --- a/helm/software/matita/contribs/RELATIONAL/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/contribs/RELATIONAL/preamble.ma b/helm/software/matita/contribs/RELATIONAL/preamble.ma index d52da9701..e030ad1ad 100644 --- a/helm/software/matita/contribs/RELATIONAL/preamble.ma +++ b/helm/software/matita/contribs/RELATIONAL/preamble.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/RELATIONAL/preamble". + include "logic/equality.ma". include "logic/connectives.ma". diff --git a/helm/software/matita/contribs/RELATIONAL/root b/helm/software/matita/contribs/RELATIONAL/root new file mode 100644 index 000000000..eadc56b03 --- /dev/null +++ b/helm/software/matita/contribs/RELATIONAL/root @@ -0,0 +1 @@ +baseuri=cic:/matita/RELATIONAL diff --git a/helm/software/matita/contribs/prova.ma b/helm/software/matita/contribs/prova.ma deleted file mode 100644 index a0cab9867..000000000 --- a/helm/software/matita/contribs/prova.ma +++ /dev/null @@ -1,236 +0,0 @@ -(**************************************************************************) -(* ___ *) -(* ||M|| *) -(* ||A|| A project by Andrea Asperti *) -(* ||T|| *) -(* ||I|| Developers: *) -(* ||T|| The HELM team. *) -(* ||A|| http://helm.cs.unibo.it *) -(* \ / *) -(* \ / This file is distributed under the terms of the *) -(* v GNU General Public License Version 2 *) -(* *) -(**************************************************************************) - -set "baseuri" "cic:/matita/test/prova". - -include "../legacy/coq.ma". - -theorem pippo: \forall (A,B:Prop). A \land B \to A. - intros; decompose; assumption. -qed. - -inline procedural "cic:/matita/test/prova/pippo.con". - -alias id "plus" = "cic:/Coq/Init/Peano/plus.con". -alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". -alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". -theorem plus_comm: \forall n:nat.\forall m:nat.eq nat (plus n m) (plus m n). - intros; alias id "plus_comm" = "cic:/Coq/Arith/Plus/plus_comm.con". -apply plus_comm. -qed. -(* -include "LAMBDA-TYPES/LambdaDelta-1/preamble.ma". -alias id "ty3" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/defs/ty3.ind#xpointer(1/1)". -alias id "pc3" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/defs/pc3.con". -alias id "THead" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/T.ind#xpointer(1/1/3)". -alias id "T" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/T.ind#xpointer(1/1)". -alias id "G" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/G/defs/G.ind#xpointer(1/1)". -alias id "Flat" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/K.ind#xpointer(1/1/2)". -alias id "Cast" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/F.ind#xpointer(1/1/2)". -alias id "C" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/C/defs/C.ind#xpointer(1/1)". -theorem ty3_gen_cast: - (\forall g:G - .\forall c:C - .\forall t1:T - .\forall t2:T - .\forall x:T - .ty3 g c (THead (Flat Cast) t2 t1) x - \rarr pc3 c t2 x\land ty3 g c t1 t2) -. -(* tactics: 80 *) -intros 6 (g c t1 t2 x H). -apply insert_eq;(* 6 P P P C I I 3 0 *) -[apply T(* dependent *) -|apply (THead (Flat Cast) t2 t1)(* dependent *) -|apply (\lambda t:T.ty3 g c t x)(* dependent *) -|intros 2 (y H0). -alias id "ty3_ind" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/ty3/defs/ty3_ind.con". -elim H0 using ty3_ind names 0;(* 13 P C I I I I I I I C C C I 12 3 *) -[intros 11 (c0 t0 t UNUSED UNUSED u t3 UNUSED H4 H5 H6). -letin H7 \def (f_equal T T (\lambda e:T.e) u (THead (Flat Cast) t2 t1) H6).(* 6 C C C C C I *) -rewrite > H7 in H4:(%) as (H8). -cut (pc3 c0 t2 t3\land ty3 g c0 t1 t2) as H10; -[id -|apply H8.(* 1 I *) -apply refl_equal(* 2 C C *) -]. -elim H10 using and_ind names 0.(* 5 P P C I I 3 0 *) -intros 2 (H11 H12). -apply conj;(* 4 C C I I *) -[alias id "pc3_t" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/props/pc3_t.con". -apply pc3_t;(* 6 P C C I C I *) -[apply t3(* dependent *) -|apply H11(* assumption *) -|apply H5(* assumption *) -] -|apply H12(* assumption *) -] -|intros 3 (c0 m H1). -alias id "K" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/K.ind#xpointer(1/1)". -cut match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr True -|TLRef (_:nat)\rArr False -|THead (_:K) (_:T) (_:T)\rArr False] as H2; -[id -|rewrite < H1 in \vdash (%). -apply I -]. -clearbody H2. -change in H2:(%) with match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr True -|TLRef (_:nat)\rArr False -|THead (_:K) (_:T) (_:T)\rArr False]. -elim H2 using False_ind names 0(* 2 C I 2 0 *) -|intros 9 (n c0 d u UNUSED t UNUSED UNUSED H4). -cut match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr True -|THead (_:K) (_:T) (_:T)\rArr False] as H5; -[id -|rewrite < H4 in \vdash (%). -apply I -]. -clearbody H5. -change in H5:(%) with match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr True -|THead (_:K) (_:T) (_:T)\rArr False]. -elim H5 using False_ind names 0(* 2 C I 2 0 *) -|intros 9 (n c0 d u UNUSED t UNUSED UNUSED H4). -cut match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr True -|THead (_:K) (_:T) (_:T)\rArr False] as H5; -[id -|rewrite < H4 in \vdash (%). -apply I -]. -clearbody H5. -change in H5:(%) with match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr True -|THead (_:K) (_:T) (_:T)\rArr False]. -elim H5 using False_ind names 0(* 2 C I 2 0 *) -|intros 14 (c0 u t UNUSED UNUSED b t0 t3 UNUSED UNUSED t4 UNUSED UNUSED H7). -alias id "F" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/F.ind#xpointer(1/1)". -alias id "B" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/T/defs/B.ind#xpointer(1/1)". -cut match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr False -|THead (k:K) (_:T) (_:T)\rArr - match k in K return \lambda _:K.Prop with - [Bind (_:B)\rArr True|Flat (_:F)\rArr False]] as H8; -[id -|rewrite < H7 in \vdash (%). -apply I -]. -clearbody H8. -change in H8:(%) with match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr False -|THead (k:K) (_:T) (_:T)\rArr - match k in K return \lambda _:K.Prop with - [Bind (_:B)\rArr True|Flat (_:F)\rArr False]]. -elim H8 using False_ind names 0(* 2 C I 2 0 *) -|intros 10 (c0 w u UNUSED UNUSED v t UNUSED UNUSED H5). -cut match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr False -|THead (k:K) (_:T) (_:T)\rArr - match k in K return \lambda _:K.Prop with - [Bind (_:B)\rArr False - |Flat (f:F)\rArr - match f in F return \lambda _:F.Prop with - [Appl\rArr True|Cast\rArr False]]] as H6; -[id -|rewrite < H5 in \vdash (%). -apply I -]. -clearbody H6. -change in H6:(%) with match THead (Flat Cast) t2 t1 in T return \lambda _:T.Prop with -[TSort (_:nat)\rArr False -|TLRef (_:nat)\rArr False -|THead (k:K) (_:T) (_:T)\rArr - match k in K return \lambda _:K.Prop with - [Bind (_:B)\rArr False - |Flat (f:F)\rArr - match f in F return \lambda _:F.Prop with - [Appl\rArr True|Cast\rArr False]]]. -elim H6 using False_ind names 0(* 2 C I 2 0 *) -|intros 9 (c0 t0 t3 H1 H2 t4 UNUSED UNUSED H5). -letin H6 \def (f_equal T T - (\lambda e:T - .match e in T return \lambda _:T.T with - [TSort (_:nat)\rArr t3 - |TLRef (_:nat)\rArr t3 - |THead (_:K) (t:T) (_:T)\rArr t]) (THead (Flat Cast) t3 t0) - (THead (Flat Cast) t2 t1) H5).(* 6 C C C C C I *) -letin H7 \def (f_equal T T - (\lambda e:T - .match e in T return \lambda _:T.T with - [TSort (_:nat)\rArr t0 - |TLRef (_:nat)\rArr t0 - |THead (_:K) (_:T) (t:T)\rArr t]) (THead (Flat Cast) t3 t0) - (THead (Flat Cast) t2 t1) H5).(* 6 C C C C C I *) -cut (t3=t2\rarr pc3 c0 t2 t3\land ty3 g c0 t1 t2) as DEFINED; -[id -|intros 1 (H8). -rewrite > H8 in H2:(%) as (UNUSED). -rewrite > H8 in H1:(%) as (H12). -rewrite > H8 in \vdash (%). -clearbody H7. -change in H7:(%) with (match THead (Flat Cast) t3 t0 in T return \lambda _:T.T with - [TSort (_:nat)\rArr t0 - |TLRef (_:nat)\rArr t0 - |THead (_:K) (_:T) (t:T)\rArr t] - =match THead (Flat Cast) t2 t1 in T return \lambda _:T.T with - [TSort (_:nat)\rArr t0 - |TLRef (_:nat)\rArr t0 - |THead (_:K) (_:T) (t:T)\rArr t]). -rewrite > H7 in H12:(%) as (H14). -apply conj;(* 4 C C I I *) -[alias id "pc3_refl" = "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/pc3/props/pc3_refl.con". -apply pc3_refl(* 2 C C *) -|apply H14(* assumption *) -] -]. -apply DEFINED.(* 1 I *) -apply H6(* assumption *) -] -|apply H(* assumption *) -]. -qed. -*) -(* -include "nat/orders.ma". - -theorem le_inv: - \forall P:nat \to Prop - .\forall p2 - .\forall p1 - .p2 <= p1 \to - (p1 = p2 \to P p2) \to - (\forall n1 - .p2 <= n1 \to - (p1 = n1 \to P n1) \to - p1 = S n1 \to P (S n1)) \to - P p1. - intros 4; elim H names 0; clear H p1; intros; - [ apply H; reflexivity - | apply H3; clear H3; intros; - [ apply H | apply H1; clear H1; intros; subst; - [ apply H2; apply H3 | ] - | reflexivity - ] -*) diff --git a/helm/software/matita/dama/Makefile b/helm/software/matita/dama/Makefile new file mode 100644 index 000000000..2eefa0cbd --- /dev/null +++ b/helm/software/matita/dama/Makefile @@ -0,0 +1,10 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../matitac +$(DIR).opt opt all.opt: + ../matitac.opt +clean: + ../matitaclean +clean.opt: + ../matitaclean.opt diff --git a/helm/software/matita/dama/Q_is_orded_divisble_group.ma b/helm/software/matita/dama/Q_is_orded_divisble_group.ma new file mode 100644 index 000000000..762554dd0 --- /dev/null +++ b/helm/software/matita/dama/Q_is_orded_divisble_group.ma @@ -0,0 +1,272 @@ +(**************************************************************************) +(* ___ *) +(* ||M|| *) +(* ||A|| A project by Andrea Asperti *) +(* ||T|| *) +(* ||I|| Developers: *) +(* ||T|| The HELM team. *) +(* ||A|| http://helm.cs.unibo.it *) +(* \ / *) +(* \ / This file is distributed under the terms of the *) +(* v GNU General Public License Version 2 *) +(* *) +(**************************************************************************) + + + +include "Q/q.ma". +include "ordered_divisible_group.ma". + +definition strong_decidable ≝ + λA:Prop.A ∨ ¬ A. + +theorem strong_decidable_to_Not_Not_eq: + ∀T:Type.∀eq: T → T → Prop.∀x,y:T. + strong_decidable (x=y) → ¬x≠y → x=y. + intros; + cases s; + [ assumption + | elim (H H1) + ] +qed. + +definition apartness_of_strong_decidable: + ∀T:Type.(∀x,y:T.strong_decidable (x=y)) → apartness. + intros; + constructor 1; + [ apply T + | apply (λx,y:T.x ≠ y); + | simplify; + intros 2; + apply (H (refl_eq ??)); + | simplify; + intros 4; + apply H; + symmetry; + assumption + | simplify; + intros; + elim (f x z); + [ elim (f z y); + [ elim H; + transitivity z; + assumption + | right; + assumption + ] + | left; + assumption + ] + ] +qed. + +theorem strong_decidable_to_strong_ext: + ∀T:Type.∀sd:∀x,y:T.strong_decidable (x=y). + ∀op:T→T. strong_ext (apartness_of_strong_decidable ? sd) op. + intros 6; + intro; + apply a; + apply eq_f; + assumption; +qed. + +theorem strong_decidable_to_transitive_to_cotransitive: + ∀T:Type.∀le:T→T→Prop.(∀x,y:T.strong_decidable (le x y)) → + transitive ? le → cotransitive ? (λx,y.¬ (le x y)). + intros; + whd; + simplify; + intros; + elim (f x z); + [ elim (f z y); + [ elim H; + apply (t ? z); + assumption + | right; + assumption + ] + | left; + assumption + ] +qed. + +theorem reflexive_to_coreflexive: + ∀T:Type.∀le:T→T→Prop.reflexive ? le → coreflexive ? (λx,y.¬(le x y)). + intros; + unfold; + simplify; + intros 2; + apply H1; + apply H; +qed. + +definition ordered_set_of_strong_decidable: + ∀T:Type.∀le:T→T→Prop.(∀x,y:T.strong_decidable (le x y)) → + transitive ? le → reflexive ? le → excess. + intros; + constructor 1; + [ apply T + | apply (λx,y.¬(le x y)); + | apply reflexive_to_coreflexive; + assumption + | apply strong_decidable_to_transitive_to_cotransitive; + assumption + ] +qed. + +definition abelian_group_of_strong_decidable: + ∀T:Type.∀plus:T→T→T.∀zero:T.∀opp:T→T. + (∀x,y:T.strong_decidable (x=y)) → + associative ? plus (eq T) → + commutative ? plus (eq T) → + (∀x:T. plus zero x = x) → + (∀x:T. plus (opp x) x = zero) → + abelian_group. + intros; + constructor 1; + [apply (apartness_of_strong_decidable ? f);] + try assumption; + [ change with (associative ? plus (λx,y:T.¬x≠y)); + simplify; + intros; + intro; + apply H2; + apply a; + | intros 2; + intro; + apply a1; + apply c; + | intro; + intro; + apply a1; + apply H + | intro; + intro; + apply a1; + apply H1 + | intros; + apply strong_decidable_to_strong_ext; + assumption + ] +qed. + +definition left_neutral ≝ λC:Type.λop.λe:C. ∀x:C. op e x = x. +definition left_inverse ≝ λC:Type.λop.λe:C.λinv:C→C. ∀x:C. op (inv x) x = e. + +record nabelian_group : Type ≝ + { ncarr:> Type; + nplus: ncarr → ncarr → ncarr; + nzero: ncarr; + nopp: ncarr → ncarr; + nplus_assoc: associative ? nplus (eq ncarr); + nplus_comm: commutative ? nplus (eq ncarr); + nzero_neutral: left_neutral ? nplus nzero; + nopp_inverse: left_inverse ? nplus nzero nopp + }. + +definition abelian_group_of_nabelian_group: + ∀G:nabelian_group.(∀x,y:G.strong_decidable (x=y)) → abelian_group. + intros; + apply abelian_group_of_strong_decidable; + [2: apply (nplus G) + | skip + | apply (nzero G) + | apply (nopp G) + | assumption + | apply nplus_assoc; + | apply nplus_comm; + | apply nzero_neutral; + | apply nopp_inverse + ] +qed. + +definition Z_abelian_group: abelian_group. + apply abelian_group_of_nabelian_group; + [ constructor 1; + [ apply Z + | apply Zplus + | apply OZ + | apply Zopp + | whd; + intros; + symmetry; + apply associative_Zplus + | apply sym_Zplus + | intro; + reflexivity + | intro; + rewrite > sym_Zplus; + apply Zplus_Zopp; + ] + | simplify; + intros; + unfold; + generalize in match (eqZb_to_Prop x y); + elim (eqZb x y); + simplify in H; + [ left ; assumption + | right; assumption + ] + ] +qed. + +record nordered_set: Type ≝ + { nos_carr:> Type; + nos_le: nos_carr → nos_carr → Prop; + nos_reflexive: reflexive ? nos_le; + nos_transitive: transitive ? nos_le + }. + +definition excess_of_nordered_group: + ∀O:nordered_set.(∀x,y:O. strong_decidable (nos_le ? x y)) → excess. + intros; + constructor 1; + [ apply (nos_carr O) + | apply (λx,y.¬(nos_le ? x y)) + | apply reflexive_to_coreflexive; + apply nos_reflexive + | apply strong_decidable_to_transitive_to_cotransitive; + [ assumption + | apply nos_transitive + ] + ] +qed. + +lemma non_deve_stare_qui: reflexive ? Zle. + intro; + elim x; + [ exact I + |2,3: simplify; + apply le_n; + ] +qed. + +axiom non_deve_stare_qui3: ∀x,y:Z. x < y → x ≤ y. + +axiom non_deve_stare_qui4: ∀x,y:Z. x < y → y ≰ x. + +definition Z_excess: excess. + apply excess_of_nordered_group; + [ constructor 1; + [ apply Z + | apply Zle + | apply non_deve_stare_qui + | apply transitive_Zle + ] + | simplify; + intros; + unfold; + generalize in match (Z_compare_to_Prop x y); + cases (Z_compare x y); simplify; intro; + [ left; + apply non_deve_stare_qui3; + assumption + | left; + rewrite > H; + apply non_deve_stare_qui + | right; + apply non_deve_stare_qui4; + assumption + ] + ] +qed. \ No newline at end of file diff --git a/helm/software/matita/dama/attic/fields.ma b/helm/software/matita/dama/attic/fields.ma index 194a39110..824fdfa9e 100644 --- a/helm/software/matita/dama/attic/fields.ma +++ b/helm/software/matita/dama/attic/fields.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/fields/". + include "attic/rings.ma". diff --git a/helm/software/matita/dama/attic/integration_algebras.ma b/helm/software/matita/dama/attic/integration_algebras.ma index 50bf063a4..1b775fa78 100644 --- a/helm/software/matita/dama/attic/integration_algebras.ma +++ b/helm/software/matita/dama/attic/integration_algebras.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/integration_algebras/". + include "attic/vector_spaces.ma". include "lattice.ma". @@ -60,7 +60,7 @@ lemma rs_lattice: ∀K.pre_riesz_space K → lattice. ]. qed. -coercion cic:/matita/integration_algebras/rs_lattice.con. +coercion cic:/matita/attic/integration_algebras/rs_lattice.con. lemma rs_ordered_abelian_group: ∀K.pre_riesz_space K → ordered_abelian_group. intros (K V); @@ -99,7 +99,7 @@ lemma rs_ordered_abelian_group: ∀K.pre_riesz_space K → ordered_abelian_group ] qed. -coercion cic:/matita/integration_algebras/rs_ordered_abelian_group.con. +coercion cic:/matita/attic/integration_algebras/rs_ordered_abelian_group.con. record is_riesz_space (K:ordered_field_ch0) (V:pre_riesz_space K) : Prop ≝ { rs_compat_le_times: ∀a:K.∀f:V. 0≤a → 0≤f → 0≤a*f @@ -141,7 +141,7 @@ definition rn_function ≝ λR:real.λV:riesz_space R.λnorm:riesz_norm ? V. n_function R V (rn_norm ? ? norm). -coercion cic:/matita/integration_algebras/rn_function.con 1. +coercion cic:/matita/attic/integration_algebras/rn_function.con 1. (************************** L-SPACES *************************************) (* @@ -313,14 +313,14 @@ record algebra (K: field) : Type \def }. interpretation "Algebra product" 'times a b = - (cic:/matita/integration_algebras/a_mult.con _ a b). + (cic:/matita/attic/integration_algebras/a_mult.con _ a b). definition ring_of_algebra ≝ λK.λA:algebra K. mk_ring A (a_mult ? A) (a_one ? A) (a_ring ? ? ? ? (a_algebra_properties ? A)). -coercion cic:/matita/integration_algebras/ring_of_algebra.con. +coercion cic:/matita/attic/integration_algebras/ring_of_algebra.con. record pre_f_algebra (K:ordered_field_ch0) : Type ≝ { fa_archimedean_riesz_space:> archimedean_riesz_space K; @@ -338,7 +338,7 @@ lemma fa_algebra: ∀K:ordered_field_ch0.pre_f_algebra K → algebra K. ] qed. -coercion cic:/matita/integration_algebras/fa_algebra.con. +coercion cic:/matita/attic/integration_algebras/fa_algebra.con. record is_f_algebra (K) (A:pre_f_algebra K) : Prop ≝ { compat_mult_le: ∀f,g:A.0 ≤ f → 0 ≤ g → 0 ≤ f*g; @@ -365,4 +365,4 @@ record integration_f_algebra (R:real) : Type \def axiom ifa_f_algebra: ∀R:real.integration_f_algebra R → f_algebra R. -coercion cic:/matita/integration_algebras/ifa_f_algebra.con. +coercion cic:/matita/attic/integration_algebras/ifa_f_algebra.con. diff --git a/helm/software/matita/dama/attic/ordered_fields_ch0.ma b/helm/software/matita/dama/attic/ordered_fields_ch0.ma index 5be3c9da4..898148d6c 100644 --- a/helm/software/matita/dama/attic/ordered_fields_ch0.ma +++ b/helm/software/matita/dama/attic/ordered_fields_ch0.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/ordered_fields_ch0/". + include "attic/fields.ma". include "ordered_group.ma". @@ -55,7 +55,7 @@ lemma of_ordered_abelian_group: pre_ordered_field_ch0 → ordered_abelian_group. ] qed. -coercion cic:/matita/ordered_fields_ch0/of_ordered_abelian_group.con. +coercion cic:/matita/attic/ordered_fields_ch0/of_ordered_abelian_group.con. (*CSC: I am not able to prove this since unfold is undone by coercion composition*) axiom of_with1: @@ -74,7 +74,7 @@ lemma of_cotransitively_ordered_set : pre_ordered_field_ch0 → cotransitively_o ] qed. -coercion cic:/matita/ordered_fields_ch0/of_cotransitively_ordered_set.con. +coercion cic:/matita/attic/ordered_fields_ch0/of_cotransitively_ordered_set.con. record is_ordered_field_ch0 (F:pre_ordered_field_ch0) : Type \def { of_mult_compat: ∀a,b:F. 0≤a → 0≤b → 0≤a*b; diff --git a/helm/software/matita/dama/attic/reals.ma b/helm/software/matita/dama/attic/reals.ma index eaa6a2437..872cfea50 100644 --- a/helm/software/matita/dama/attic/reals.ma +++ b/helm/software/matita/dama/attic/reals.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/reals/". + include "attic/ordered_fields_ch0.ma". diff --git a/helm/software/matita/dama/attic/rings.ma b/helm/software/matita/dama/attic/rings.ma index 2ea188847..d4db003dc 100644 --- a/helm/software/matita/dama/attic/rings.ma +++ b/helm/software/matita/dama/attic/rings.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/rings/". + include "group.ma". @@ -66,13 +66,13 @@ theorem not_eq_zero_one: ∀R:ring.0 ≠ one R. qed. interpretation "Ring mult" 'times a b = - (cic:/matita/rings/mult.con _ a b). + (cic:/matita/attic/rings/mult.con _ a b). notation "1" with precedence 89 for @{ 'one }. interpretation "Ring one" 'one = - (cic:/matita/rings/one.con _). + (cic:/matita/attic/rings/one.con _). lemma eq_mult_zero_x_zero: ∀R:ring.∀x:R.0*x=0. intros; diff --git a/helm/software/matita/dama/attic/vector_spaces.ma b/helm/software/matita/dama/attic/vector_spaces.ma index 1e29bee24..5002b022c 100644 --- a/helm/software/matita/dama/attic/vector_spaces.ma +++ b/helm/software/matita/dama/attic/vector_spaces.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/vector_spaces/". + include "attic/reals.ma". @@ -31,7 +31,7 @@ record vector_space (K:field): Type \def }. interpretation "Vector space external product" 'times a b = - (cic:/matita/vector_spaces/emult.con _ _ a b). + (cic:/matita/attic/vector_spaces/emult.con _ _ a b). record is_semi_norm (R:real) (V: vector_space R) (semi_norm:V→R) : Prop \def { sn_positive: ∀x:V. zero R ≤ semi_norm x; diff --git a/helm/software/matita/dama/classical_pointfree/ordered_sets.ma b/helm/software/matita/dama/classical_pointfree/ordered_sets.ma index 5d9c2da67..2630da77c 100644 --- a/helm/software/matita/dama/classical_pointfree/ordered_sets.ma +++ b/helm/software/matita/dama/classical_pointfree/ordered_sets.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/classical_pointwise/ordered_sets/". + include "excess.ma". @@ -320,10 +320,10 @@ notation "hvbox(〈a〉)" for @{ 'hide_everything_but $a }. interpretation "mk_bounded_above_sequence" 'hide_everything_but a -= (cic:/matita/ordered_set/bounded_above_sequence.ind#xpointer(1/1/1) _ _ a _). += (cic:/matita/classical_pointfree/ordered_sets/bounded_above_sequence.ind#xpointer(1/1/1) _ _ a _). interpretation "mk_bounded_below_sequence" 'hide_everything_but a -= (cic:/matita/ordered_set/bounded_below_sequence.ind#xpointer(1/1/1) _ _ a _). += (cic:/matita/classical_pointfree/ordered_sets/bounded_below_sequence.ind#xpointer(1/1/1) _ _ a _). theorem eq_f_sup_sup_f: ∀O':dedekind_sigma_complete_ordered_set. diff --git a/helm/software/matita/dama/classical_pointfree/ordered_sets2.ma b/helm/software/matita/dama/classical_pointfree/ordered_sets2.ma index d85a02cf4..7e74cbba2 100644 --- a/helm/software/matita/dama/classical_pointfree/ordered_sets2.ma +++ b/helm/software/matita/dama/classical_pointfree/ordered_sets2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/classical_pointfree/ordered_sets2". + include "classical_pointfree/ordered_sets.ma". @@ -61,7 +61,7 @@ theorem le_to_le_sup_sup: qed. interpretation "mk_bounded_sequence" 'hide_everything_but a -= (cic:/matita/ordered_set/bounded_sequence.ind#xpointer(1/1/1) _ _ a _ _). += (cic:/matita/classical_pointfree/ordered_sets/bounded_sequence.ind#xpointer(1/1/1) _ _ a _ _). lemma reduce_bas_seq: ∀O:ordered_set.∀a:nat→O.∀p.∀i. diff --git a/helm/software/matita/dama/classical_pointwise/sets.ma b/helm/software/matita/dama/classical_pointwise/sets.ma index ec6a1c774..f03c3e7f2 100644 --- a/helm/software/matita/dama/classical_pointwise/sets.ma +++ b/helm/software/matita/dama/classical_pointwise/sets.ma @@ -12,9 +12,11 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/sets/". + include "nat/nat.ma". +include "logic/connectives.ma". + definition set ≝ λX:Type.X → Prop. @@ -24,21 +26,21 @@ notation "hvbox(x break ∈ A)" with precedence 60 for @{ 'member_of $x $A }. interpretation "Member of" 'member_of x A = - (cic:/matita/sets/member_of.con _ A x). + (cic:/matita/classical_pointwise/sets/member_of.con _ A x). notation "hvbox(x break ∉ A)" with precedence 60 for @{ 'not_member_of $x $A }. interpretation "Not member of" 'not_member_of x A = (cic:/matita/logic/connectives/Not.con - (cic:/matita/sets/member_of.con _ A x)). + (cic:/matita/classical_pointwise/sets/member_of.con _ A x)). definition emptyset : ∀X.set X ≝ λX:Type.λx:X.False. notation "∅︀" with precedence 100 for @{ 'emptyset }. interpretation "Emptyset" 'emptyset = - (cic:/matita/sets/emptyset.con _). + (cic:/matita/classical_pointwise/sets/emptyset.con _). definition subset: ∀X. set X → set X → Prop≝ λX.λA,B:set X.∀x. x ∈ A → x ∈ B. @@ -46,7 +48,7 @@ notation "hvbox(A break ⊆ B)" with precedence 60 for @{ 'subset $A $B }. interpretation "Subset" 'subset A B = - (cic:/matita/sets/subset.con _ A B). + (cic:/matita/classical_pointwise/sets/subset.con _ A B). definition intersection: ∀X. set X → set X → set X ≝ λX.λA,B:set X.λx. x ∈ A ∧ x ∈ B. @@ -55,7 +57,7 @@ notation "hvbox(A break ∩ B)" with precedence 70 for @{ 'intersection $A $B }. interpretation "Intersection" 'intersection A B = - (cic:/matita/sets/intersection.con _ A B). + (cic:/matita/classical_pointwise/sets/intersection.con _ A B). definition union: ∀X. set X → set X → set X ≝ λX.λA,B:set X.λx. x ∈ A ∨ x ∈ B. @@ -63,7 +65,7 @@ notation "hvbox(A break ∪ B)" with precedence 65 for @{ 'union $A $B }. interpretation "Union" 'union A B = - (cic:/matita/sets/union.con _ A B). + (cic:/matita/classical_pointwise/sets/union.con _ A B). definition seq ≝ λX:Type.nat → X. @@ -73,7 +75,7 @@ notation "hvbox(A \sub i)" with precedence 100 for @{ 'nth $A $i }. interpretation "nth" 'nth A i = - (cic:/matita/sets/nth.con _ A i). + (cic:/matita/classical_pointwise/sets/nth.con _ A i). definition countable_union: ∀X. seq (set X) → set X ≝ λX.λA:seq (set X).λx.∃j.x ∈ A \sub j. @@ -82,7 +84,7 @@ notation "∪ \sub (ident i opt (: ty)) B" with precedence 65 for @{ 'big_union ${default @{(λ${ident i}:$ty.$B)} @{(λ${ident i}.$B)}}}. interpretation "countable_union" 'big_union η.t = - (cic:/matita/sets/countable_union.con _ t). + (cic:/matita/classical_pointwise/sets/countable_union.con _ t). definition complement: ∀X. set X \to set X ≝ λX.λA:set X.λx. x ∉ A. @@ -90,7 +92,7 @@ notation "A \sup 'c'" with precedence 100 for @{ 'complement $A }. interpretation "Complement" 'complement A = - (cic:/matita/sets/complement.con _ A). + (cic:/matita/classical_pointwise/sets/complement.con _ A). definition inverse_image: ∀X,Y.∀f: X → Y.set Y → set X ≝ λX,Y,f,B,x. f x ∈ B. @@ -99,4 +101,4 @@ notation "hvbox(f \sup (-1))" with precedence 100 for @{ 'finverse $f }. interpretation "Inverse image" 'finverse f = - (cic:/matita/sets/inverse_image.con _ _ f). \ No newline at end of file + (cic:/matita/classical_pointwise/sets/inverse_image.con _ _ f). diff --git a/helm/software/matita/dama/classical_pointwise/sigma_algebra.ma b/helm/software/matita/dama/classical_pointwise/sigma_algebra.ma index 21db34e38..580fe9645 100644 --- a/helm/software/matita/dama/classical_pointwise/sigma_algebra.ma +++ b/helm/software/matita/dama/classical_pointwise/sigma_algebra.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/sigma_algebra/". + include "classical_pointwise/topology.ma". diff --git a/helm/software/matita/dama/classical_pointwise/topology.ma b/helm/software/matita/dama/classical_pointwise/topology.ma index c5ba9bbd6..72c9dbb4d 100644 --- a/helm/software/matita/dama/classical_pointwise/topology.ma +++ b/helm/software/matita/dama/classical_pointwise/topology.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/topology/". + include "classical_pointwise/sets.ma". diff --git a/helm/software/matita/dama/constructive_connectives.ma b/helm/software/matita/dama/constructive_connectives.ma index 8518d7ede..78e2ec571 100644 --- a/helm/software/matita/dama/constructive_connectives.ma +++ b/helm/software/matita/dama/constructive_connectives.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/constructive_connectives/". +include "logic/connectives.ma". inductive Or (A,B:Type) : Type ≝ Left : A → Or A B diff --git a/helm/software/matita/dama/constructive_higher_order_relations.ma b/helm/software/matita/dama/constructive_higher_order_relations.ma index 789c7c9c5..8d195396c 100644 --- a/helm/software/matita/dama/constructive_higher_order_relations.ma +++ b/helm/software/matita/dama/constructive_higher_order_relations.ma @@ -12,9 +12,10 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/constructive_higher_order_relations". + include "constructive_connectives.ma". +include "higher_order_defs/relations.ma". definition cotransitive ≝ λC:Type.λlt:C→C→Type.∀x,y,z:C. lt x y → lt x z ∨ lt z y. @@ -47,4 +48,4 @@ lemma Or_symmetric: symmetric ? Or. unfold; intros (x y H); cases H; [right|left] assumption; qed. - \ No newline at end of file + diff --git a/helm/software/matita/dama/constructive_pointfree/lebesgue.ma b/helm/software/matita/dama/constructive_pointfree/lebesgue.ma index 766412819..c7e5d7c5d 100644 --- a/helm/software/matita/dama/constructive_pointfree/lebesgue.ma +++ b/helm/software/matita/dama/constructive_pointfree/lebesgue.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/lebesgue/". + include "metric_lattice.ma". include "sequence.ma". diff --git a/helm/software/matita/dama/depends b/helm/software/matita/dama/depends new file mode 100644 index 000000000..a047fc9d1 --- /dev/null +++ b/helm/software/matita/dama/depends @@ -0,0 +1,40 @@ +metric_lattice.ma lattice.ma metric_space.ma +metric_space.ma ordered_divisible_group.ma +sandwich.ma metric_lattice.ma nat/orders.ma nat/plus.ma sequence.ma +premetric_lattice.ma lattice.ma metric_space.ma +ordered_group.ma group.ma +divisible_group.ma group.ma nat/orders.ma +ordered_divisible_group.ma divisible_group.ma nat/orders.ma nat/times.ma ordered_group.ma +sequence.ma excess.ma nat/orders.ma ordered_group.ma +constructive_connectives.ma logic/connectives.ma +group.ma excess.ma +prevalued_lattice.ma ordered_group.ma +excess.ma constructive_connectives.ma constructive_higher_order_relations.ma higher_order_defs/relations.ma nat/plus.ma +Q_is_orded_divisble_group.ma Q/q.ma ordered_divisible_group.ma +lattice.ma excess.ma +constructive_higher_order_relations.ma constructive_connectives.ma higher_order_defs/relations.ma +constructive_pointfree/lebesgue.ma constructive_connectives.ma metric_lattice.ma sequence.ma +classical_pointwise/topology.ma classical_pointwise/sets.ma +classical_pointwise/sigma_algebra.ma classical_pointwise/topology.ma +classical_pointwise/sets.ma logic/connectives.ma nat/nat.ma +classical_pointfree/ordered_sets.ma excess.ma +classical_pointfree/ordered_sets2.ma classical_pointfree/ordered_sets.ma +attic/fields.ma attic/rings.ma +attic/reals.ma attic/ordered_fields_ch0.ma +attic/integration_algebras.ma attic/vector_spaces.ma lattice.ma +attic/vector_spaces.ma attic/reals.ma +attic/rings.ma group.ma +attic/ordered_fields_ch0.ma group.ma attic/fields.ma ordered_group.ma +nat/nat.ma +logic/connectives.ma +higher_order_defs/relations.ma +Q/q.ma +nat/plus.ma +higher_order_defs/relations.ma +logic/connectives.ma +nat/orders.ma +nat/times.ma +nat/orders.ma +nat/orders.ma +nat/plus.ma +nat/orders.ma diff --git a/helm/software/matita/dama/divisible_group.ma b/helm/software/matita/dama/divisible_group.ma index 6830ef4e1..4f54545c8 100644 --- a/helm/software/matita/dama/divisible_group.ma +++ b/helm/software/matita/dama/divisible_group.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/divisible_group/". + include "nat/orders.ma". include "group.ma". diff --git a/helm/software/matita/dama/excess.ma b/helm/software/matita/dama/excess.ma index d8cf09766..6db7e22e6 100644 --- a/helm/software/matita/dama/excess.ma +++ b/helm/software/matita/dama/excess.ma @@ -12,12 +12,12 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/excess/". + include "higher_order_defs/relations.ma". include "nat/plus.ma". -include "constructive_connectives.ma". include "constructive_higher_order_relations.ma". +include "constructive_connectives.ma". record excess : Type ≝ { exc_carr:> Type; diff --git a/helm/software/matita/dama/group.ma b/helm/software/matita/dama/group.ma index 0e2668c2d..9da386ef7 100644 --- a/helm/software/matita/dama/group.ma +++ b/helm/software/matita/dama/group.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/group/". + include "excess.ma". diff --git a/helm/software/matita/dama/lattice.ma b/helm/software/matita/dama/lattice.ma index 768c86df1..787ee3e8e 100644 --- a/helm/software/matita/dama/lattice.ma +++ b/helm/software/matita/dama/lattice.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/lattice/". + include "excess.ma". diff --git a/helm/software/matita/dama/makefile b/helm/software/matita/dama/makefile deleted file mode 100644 index ce86d1360..000000000 --- a/helm/software/matita/dama/makefile +++ /dev/null @@ -1,33 +0,0 @@ -H=@ - -RT_BASEDIR=../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -all: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - diff --git a/helm/software/matita/dama/metric_lattice.ma b/helm/software/matita/dama/metric_lattice.ma index 0bfc3db67..36742163b 100644 --- a/helm/software/matita/dama/metric_lattice.ma +++ b/helm/software/matita/dama/metric_lattice.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/metric_lattice/". + include "metric_space.ma". include "lattice.ma". diff --git a/helm/software/matita/dama/metric_space.ma b/helm/software/matita/dama/metric_space.ma index e2112d65b..d36e90a68 100644 --- a/helm/software/matita/dama/metric_space.ma +++ b/helm/software/matita/dama/metric_space.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/metric_space/". + include "ordered_divisible_group.ma". diff --git a/helm/software/matita/dama/ordered_divisible_group.ma b/helm/software/matita/dama/ordered_divisible_group.ma index a6c13e189..a9671d934 100644 --- a/helm/software/matita/dama/ordered_divisible_group.ma +++ b/helm/software/matita/dama/ordered_divisible_group.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/ordered_divisible_group/". + include "nat/orders.ma". include "nat/times.ma". diff --git a/helm/software/matita/dama/ordered_group.ma b/helm/software/matita/dama/ordered_group.ma index 2129aa5c7..9a066a80e 100644 --- a/helm/software/matita/dama/ordered_group.ma +++ b/helm/software/matita/dama/ordered_group.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/ordered_group/". + include "group.ma". diff --git a/helm/software/matita/dama/premetric_lattice.ma b/helm/software/matita/dama/premetric_lattice.ma index d985ec24f..bfba3710a 100644 --- a/helm/software/matita/dama/premetric_lattice.ma +++ b/helm/software/matita/dama/premetric_lattice.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/premetric_lattice/". + include "metric_space.ma". diff --git a/helm/software/matita/dama/prevalued_lattice.ma b/helm/software/matita/dama/prevalued_lattice.ma index 5f1a062e0..53b2b0a1b 100644 --- a/helm/software/matita/dama/prevalued_lattice.ma +++ b/helm/software/matita/dama/prevalued_lattice.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/prevalued_lattice/". + include "ordered_group.ma". diff --git a/helm/software/matita/dama/root b/helm/software/matita/dama/root new file mode 100644 index 000000000..c57405b94 --- /dev/null +++ b/helm/software/matita/dama/root @@ -0,0 +1 @@ +baseuri=cic:/matita/ diff --git a/helm/software/matita/dama/sandwich.ma b/helm/software/matita/dama/sandwich.ma index 21499ee72..037d3d7dc 100644 --- a/helm/software/matita/dama/sandwich.ma +++ b/helm/software/matita/dama/sandwich.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/sandwich/". + include "nat/plus.ma". include "nat/orders.ma". diff --git a/helm/software/matita/dama/sequence.ma b/helm/software/matita/dama/sequence.ma index 9990f8c7d..7536901ba 100644 --- a/helm/software/matita/dama/sequence.ma +++ b/helm/software/matita/dama/sequence.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/sequence/". + include "excess.ma". diff --git a/helm/software/matita/dep2dot.rb b/helm/software/matita/dep2dot.rb deleted file mode 100755 index 813b2afeb..000000000 --- a/helm/software/matita/dep2dot.rb +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/ruby -w -# filter converting from .depend to .dot -# tested on .depend generated by ocamldep -# $Id$ - -require 'set' - -edges = Set.new -$stdin.each {|line| - target, deps = line.split(/\s*:\s*/) - while deps =~ /\\\s*$/ # deal with lines continued with trailing \ - deps.sub!(/\s*\\\s*$/, '') - line = $stdin.readline - deps += ' ' + line.lstrip - end - sources, targets = target.split, deps.split - for src in sources - for tgt in targets # ignore file extensions - src.sub!(/\.[^.]+/, '') - tgt.sub!(/\.[^.]+/, '') - edges << [src, tgt] unless src == tgt # ignore self deps - end - end -} -puts 'digraph G {' -for src, tgt in edges - print "\"#{src}\" -> \"#{tgt}\";\n" -end -puts '}' - diff --git a/helm/software/matita/gragrep.ml b/helm/software/matita/gragrep.ml deleted file mode 100644 index d44c08d27..000000000 --- a/helm/software/matita/gragrep.ml +++ /dev/null @@ -1,67 +0,0 @@ -(* Copyright (C) 2006, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -open Printf - -let is_notation = function GrafiteParser.LNone _ -> true | _ -> false - -let grep () = - let recursive = ref false in - let spec = [ - "-r", Arg.Set recursive, "enable directory recursion"; - ] in - MatitaInit.add_cmdline_spec spec; - MatitaInit.initialize_all (); - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - let status = - CicNotation2.load_notation ~include_paths - BuildTimeConf.core_notation_script in - let path = - match Helm_registry.get_list Helm_registry.string "matita.args" with - | [ path ] -> path - | _ -> MatitaInit.die_usage () in - let grep_fun = - if !recursive then - (fun dirname -> - ignore (GrafiteWalker.rgrep_statement ~status - ~callback:(fun (fname, s) -> printf "%s: %s\n%!" fname s) - ~dirname is_notation)) - else - (fun fname -> - ignore (GrafiteWalker.grep_statement ~status - ~callback:(fun s -> printf "%s\n%!" s) - ~fname is_notation)) in - grep_fun path - -let handle_localized_exns f arg = - try - f arg - with HExtlib.Localized (loc, exn) -> - let loc_begin, loc_end = HExtlib.loc_of_floc loc in - eprintf "Error at %d-%d: %s\n%!" loc_begin loc_end (Printexc.to_string exn) - -let main () = handle_localized_exns grep () - diff --git a/helm/software/matita/gragrep.mli b/helm/software/matita/gragrep.mli deleted file mode 100644 index f762adb22..000000000 --- a/helm/software/matita/gragrep.mli +++ /dev/null @@ -1,27 +0,0 @@ -(* Copyright (C) 2006, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -val main: unit -> unit - diff --git a/helm/software/matita/help/C/figures/developments.png b/helm/software/matita/help/C/figures/developments.png deleted file mode 100644 index f72458940cfb5082d5043e713989269806535701..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15793 zcmb`uWmFtdur4};;2PX53GO7g1rHtw5ZpDm`{1s@gM|PAg1coHTr#-(3=Hn>@+Rk; z``*28-TUjFHEX7O_wMQLs$F~6_f=I#tEeMvg|A z1zi}vltMf`AgH0?oni>S6nfd#WD0zZ5Z|8t=@yyw?*j_dY@pUzF$-~88t)HjbgPjZ zBZrLRosL|!(FeB01oJhUSqH&O1}SuUt-lEYVAI**J#bD)$xO}gYP9bw`Y?PA;ux?| zwY-5pgJ42^8IpJ+8mToCdia*grbUrPTam`S!_gN2z#Q8bMAORpUSpCM-{+bhH>V>! z(>|a$YhcZdf41dPBPBg6Y1`<5ufDFveS~XV(n1sYiUD~wz~PNuYx_i&MA^5y%Y8Ie zy0F|rrjYE$9!MeTTKQGijoZM-gN~9aqVr4-7s_Q}kZ$3ul8S+qlp=(Qj?C-zYsJT$ zaLAMByog{|S0jI?3rrA~>g;J7kO1F&97CdtjQpfip#3$bLCX56h&5T@2oIT$?%@+_ z)!04K)RuBL1X&oiwhe~8Bh-rVsfb=8I+R!N;Fxb>t@6%pGA|p{_lsxfGk!z#BjB8_ z!EuE`l%{$-6ghDKEfL-cKkYpAp6@V3Nv_%9d6|2g@_XYW&;tqZ&~*Ju5BIWvN5|FK zvjppnnK`Xj1w4H1(EpWz5)w;3J&O=E(%FEX*lhbCXFs;1}CU>7$Y_qo6e3$0|1{N1pu%{+5Tr) zS0?OTiYP`8svoK7KSoFTa_=z&12;KG#fE>WD%)Kkh3z5*?Yi~lK9c(N&~iOjKo7e3 zp2pxvqDEcL!e&e}huE6b9ymb)2ak8J`TPm7kuFV+$wR6m-pP)FrfzKhszrU&h8MfI zovK#jIxFfX(iVE(xH&O&qx$^(wBN3vj}%2r0FaD)RRsv5WCP2rv#^M^C)O^e7yG!E zE)g03Sw`2rRx`a@Du0##x@#~I+#iLMOZQ~@x~U{n?K6{7sX`2;y39rgD|l$5Pk1lFLxg$Dc#h=czK8;9F8>Dit&eqmfe9t> ziJ%7!jon&5&yE$Lmnm95`78kj&;TcW9zi)GNecqf&!+M8>p^|_{;}-_0nFJ=oqbW1 zl4?#3)c7Hm`B1sp9(0S{uU)HNqI<=hA0kSaZluuSD&7Wv$d9%xA)vz~Gt<<+I=YhG za_MBl>DmtB$mi$}h^Nh=XzcDlZsy@`dGCv(X|}|Rvw>R|VjFmWXT3ae*HiXM{y@x` z5;;U4Uc5GX<55O}DW9c#FHyA||3+6ya3+}uTffm6<6AKYtQ5byldSizdg*Jg&JII) z0Q045#q)){!NhbpZxQJ_Z@e)lqlY7!)--2JM2ETsD6?Z5+VugwpN#h#Asy}!R`eti z&mMcloh?U_HxBQZ>2&hPG}hH(vG(RoKk5CznYrcs zy=})^btQ?C2Te5P6aZ6fB9W57+pu~=g592496VS;@;QqI=0XKP%48%EB990Bn1;A8 z8=`ztK(=WV8n<&h!)pKVXRmr`OmjB z4P*4~C_jkMNYlq2uwulkQ1=bB(w^uLQ_-JewTW&lWfuFYF3urC!2JR?-v(}{OqEPFWLu7Y| zsj?p)@4c#aKfJSnN49^8uk+*XizyYo0f4-`PNvgVM2HW|q3aGAY-8ifLJG@)qzd0?{4zM3#dhT<$7sCnJLN<_V^he`_%yqMLwm*10ZG|) zcmTfaQG3yLNw{~}J%Ehev9L9(2?vtjqzp;U(pwic!A3!&{57>@QDi2q%%ENQKqCsm zeTo-0e~L7x{}e&@xXd^x{asU@@$-#?D1cex0mm2Fj8?oijV&Xe2$-VuY^8(ZO{Jl! z(b>5(od4O@6^(SzLgU8I@5eUQp042T6C=(3nQ7b)ZHjo_-eh=~1Xn?}$I@2M3?3F|2C)vN zO@FG5Kb@QHsy=_i1;hkStFgjEDy zNwHCpUEQ=4J}M0yrrg)KLQrKG`Jw{ax_^wyBrMLCFmZt+3JO%XT?_=6EnjR{Siasn z5~EsdLM_`Klhgo5*3Q#PU^sl?Lf?GB9g4~J?Dw+6Z!YBU=R1ciV=cjO+kHoq&ygfI z>nn@+F221IF+FVvY_okifIs8p)N~lo%7o^GvyVdSCFDA(S>v$DVBhu~(^OIN1@WdH zZ_7Bs?%nWO{1cyIM>Zgh%CY}kiIMykh;rQOS7H4e`y9sS^Rs~at8jA@ zH;WZ8hG7+EPVXy?WA4GPt$M><7w_$qx)4{I@7*hKPJ+ijFE4=qKJLuI-j|KXK zUs1~gXA+aP2QTW+VzxqA@TKhCZJ|zTpc@Ib+rIp#-?a2IR1UFWN!@vhr?lhrFGZR- zO58DgR709L&J^xqVHzKo3ll8<~BqOP~nU}8W(R@T=vvXbcZVbkogqYu?N zVv1!5=t@7MkTPrfmJ|rsng5FZRu<9!8Cl-**~o&-@QMlXFFP{UC&UJw7>GDIO#SrV zvHzu^;KBMtHK6;Lm9+O}e@$a>B|>K?&{6n!ETwokPp*m>6qqL$_z65B6_icwEozju z;-noBc=>M5L*=&{Vl`FZ=?3eD-Z_nwo}C*lcp7NY&z0~b!l6bXiFm6lHz~VXwLe55 z9@a|Y#L1>wtD}%YW$57;S>a#F-yosvW0SoRy6@MnH4W9Jn62XRKB8#_UA6cEi;Q_v z`Mwm8&nx=|S)&hFv<`>QrmWv@+oa#%ca1a)iR*d&8oXhe9h1!4jv#R5zWY^ zik2n3@BG9bmaAlV5de34V}tWnRfKI2<2Xl=nb){22fbxz*;zzKJ}ov?$#Yqe3Vz*d zBcR(=lR~*&U`}W}80N1)#Azd8!cb*lH_{w#IW;~!M=jNXf7CI;ZQfVFu++V)V*KMP zgl-U?b!<&bNoaVCT z)6f*xROJ=0y3n!f%lvR3zj+8-HA`D)Kvki7NDYjdA{&lSJ89_g!sCN9a&deG|BlL0 z`VReeSGnu9xx3VNIY6PgovQfOJg&B(NS>Wz_m#+>ec&(wJUD4H-}1I*KqJvML;_mPM2WjA>9tMa z^zWoXmf++~)FBPy&Cl@SmHNAXFfCVcincv`SHNq7zvRLjvT1X{&c^aR;MvN2i>9r? zBxk46JahVOoPz{)-)Ft|?QU0UvlFs^`<=jFXA?q!z^2D}kM!c%+MEV7`x!ruOv$|g zgBQvXC9BpFs&=EIi(Fip{7*Mb%Iue>O3%WOx@ig$KL@;hZKcs)PuJsne@F)wuLQ=m z`d4+^Gu~R2W~%0nIOeYO{KB&}{ioS>_J5iUzy4@BGCwJ*r!S{J+g{AhUP-F82#n)W zuS2sl?5Y`5S;?H&9d2{@W5}(X8yFUSxWpYGbX~l8sIxh=kbcXd!olhQZEC9gTq5k{ zJ@<@h_b@sl!CR~`#9DMS_UD^DzvJ1A?r_y8QN2r`f0FH#^4^S#a*>Uh$D+XAVy)J% zo=c$$5Gb=UcI4+@*}s*E^{JHssg|>N%}iUF@r96h3;zPQu45-3=J`0Kk5=$EhTlht z@|?08>)(pEtBXwZuVKhWp35GgfPp*k&R^6~?gcDppNN-Lkn4Y!{|d2z_%=7*@b%BPHy+L>h2DnijG?ywU12=X8$nghrH{Vt;AQ~lIgoqJa|jj-!^X?W%&kVK0^!*SvCYu0pGvxIFE-E8mTTtvMf6EDDln(} z&yPogZn_c=TsNfCD`!cl7Un%IO3bB2m*;n}-y`M|d7vWyl{&i?r-tLUxXmzyikSYd z^?bcjbTTjet75y7qAS98cbM5;`b`r3WbIyowE9gZoPHiQTwBFSbx-wp^ACS)^*4uR z7G0O>#%e5EivMG-S6ojL0ksyz`$>iCzcl7OjxXkdJlRLTpeKO(m-RR;g=fTmrQX-E zg9;GCL%dRLPi~ZV+h|FJc>E^inX*x_#`Whet#b%H%bd7{rw60HAva5+`L3{Zff9?G zeMbf1`Iz&pcRx$|Eli%V3C~i<7x|wA$c9DsvIP*krh_O(Z)VKVVa&VpG+kNF`wWjr zAyA&!J;R+#*|uS)i?UAtVYPy(qS)w-lumZOfJ6Czu2otO93zE|mJOC5ec#9RSuFE7 zm5NFeuH)rSBHY6-j)5Z++jX9}u1${H0PXhkSx}%w1`WXmm}T zf67Y`&$zs>?@jk8@6ii%iT+K((tHr6qP#v|sVvg410CSb@*{16FH^&toS(R6`wX== zBEWS=+=QwDqjuqOX6>WP7P@v~Qx+w)SZK|4&3EruT~>RjdJiJ&uVW2j8ZGa!b{|QW zJZ}h;#wK`k_jp9we1ub4aq4bwADaHAls9fxm985v|BvNlj>{3m-T&q0n|go7i7teT zD;o#=Agk1$akh}Dc}m>$Z<%IQGj6gBjD-xOyHqqfL3p)Fgs-P#o`FgwHH_kpabs}4 zZC{o7VJ#;6J#1aPC-c|s{FYZ{NN^0x3Zov+gOvC3N*>bk8(d=KY9?cx*0!at$*%3( z?JQrpPd{gQx!-pH^WUF(TKXr98Gy3uY$3Rx=W$bb`i~Bcdr;kNda2&LU`$%9@25ts z+XNbNxU4!keeZuEmKrzUVs*Gs_ZWU`)Q1}W-VF0qe)Ohlg;w*#0koZ*Um_o>?c>H_ z+sgL)hEyPNHhm)f(sB1PR-dcC9P62v#<+`La%3Vd+6x_P)vhMq z&YsA=!+v2BG`K|^sh^{u1ogJ7Uu~+id{#6$XFRgMdyIR|zRL$8HfpzmTtH3=jduQ!)ST$4^-P2j2cqz5nKmJ-&s42&2KxP6h7h^t~al zP5@@GsN1V%1|=~S=!YH{oYVw#vrYP>M#|1LgEgEjR69L|Fg-0kr!AS65$}rW2HjYm zEXzjH5#*BS`Jua7dvku-d%dR}MIysW7!kr&RKE5I6Xhx{tA|7V(e`z!JN@{qGYlTi zc|r@6`Lt$t|Jm-D{hobUEVx8RtXC`wVZwQ__43!Sa7W~VPn#t7d z-T%0i2lSb^YO3i7*`e(q|9G@={{+ikA>(n#O+MohgTCRJuX?O_;W^ED!Pv>g`*ZJ% zSw5SsuoSD5!g-T|S_0RpH9~E()=%Mk6^(5MM|{t9G|7l*PQS66dz+!1ybkpm=SB>~ zD}+8vlyQE$*4d2w>sI?{yLWIm!#3_UUc=BMgn)gMlas@oS(C<>ufvkoClH%4Y1s!Y z@c$r%T=(}kC`7lf0soknPoUB7&L(dnrhisaPb74%mH<@vPa+qkR4I%ga``_PQwjdV zhAe)Sq#8V6CH^CQNqga|=l{6d|7JoL*%5r6CFdi%82_#H-m?$AkKn}H|8E3uu|KoG z-;A@$nqgLt(=p=$7Z;cJXI~@kaVb#M)YM|xYJOQuXK9G1Qf?~UrgPLQ8b7G$?37@o z&$XlpIBoTY5HqL$Wug3=dRDN^Z2Y%*IZNwq9WR0HOTqioZ=*K?&@O})xYt0osW_I3 zx9X0mT$}nlSz1@?V=h#JG-v>mVfEKKbOZ2C7b?sD_dePRR%zgyP-HHrew>K!tr|X5 zXt@8s?v9&KKiBDQ%*xNXs*zz~G8PtAUmWBZQ@U10a0sG{_NZH3s7!VTE5q!SH#asI zgx-=v(knZm?VcYPk|nF>q${-xJss5iAJ!sm7JdpH92|7QXX4cS(*>rctVdy;!J%L7 zdhqb0dv|8)(H0{jep)9UIeU1Z=_5>yo*Y6IB({R5J6 zbK^5J$ts?0sSy{WrU-v0*AqdHZaa_P(IK7$*_;UsWp?;=OJ<(Q<3>W2s)$WBjz>d7 zGvD}CpvmDGnV{??$oDG9fU|lMO~Z18iIg1#JG;3f;450%#OqZ*G=Zu}>B`Z*AHe}No{wDf_10XA5lz7g%wY;|et)`^ zk&`ps{dudP6xEjoA?0z~LemlswO*-K?pu!Sy2T6NZb`&0H?^1Od2*OW{9V6p*PzJgIhVcbzp@=_?o>%YUA=y1-E<3CvEP!gy{11|%}Y z?lp&>@5(8f3lS)@jrJaW$?G9B5Yz_0s?={G^&pAJK`*jilD3$m5K@QVCi8=kvhykl)WtFDRF$-lHkMaa?bDwyN)|go{3JIA`mwv+k_~yp_NYtj`JA(s7CXz=0^0?iFaO~Kogz>T)@guXKE87+$ zsnP;>g0$o#puve2v$&AZz(92E5RNASrhDfwiI4QOs?K@{+uMsm%=r@^|M{gMdZM$n ztvzfn0eKl{Jg4WvIc;E9{5V5}h@9F3I+zBXYwAo4!VXEXeUf$>59LAjJYJ2jsIYIa zS;YqVl0y|^d`|EY8CKl|-Eo`u6fm7iIhR{rlf_rtoVu-^ z&ZMj?3~G1*@Ord`(4|#sZt3tf7!I0?DAa;%onYAnC28k!UsU4NUV2Zv?JE(_RAUbZ z8Q$Z5aM}(=fmVmeQ~?IOB=ypf?=C2VOr?#xe$c-zAQ6yMWYXUN?i&r3}HgwlHhI*k9IV@A4vH<>CPV)V%*{0eEszUA(GIrv&&Wyy~bE zIQKQLL>-1^y9F(WO02IP6#_2+)}uLcV|k$Q={ah`)$dVSY#C{O0gu;*Fa4cmLe#93 z2bf}C6r}FFa)UDj>Vwdy`Y(EaJUryBdFm!V?kV1=h$;_BK@zB)&ko)`bhzOeQH#H< z;#5^1B;HvqXYv+Ba^F)P&RRqX91RLG7pwu&UL8t=wC0cWz`D4k-w^2@=pYm^Ji_-y z(1RkP6jbXbS04kFQ(8Ly%k8Lp&QTH2-bBW0|7J8#IN=WI38g2EvoY>|{J`GiZrW~w z%V%aS0=#~o;4@+EWBmvdZP4nAWot`by6GrgLJ$QzSPLC}3>dGq=2AXdq}F`ek2yB} zZD3_~7OrHD||4lC$6Yc6*O{~aCbYAt`I z?t9bKH9_vWt>=yZ44`a2>Yt|%fE{eaiHjL`Lmowb2J5g21_%>yMid5TAmzuo_7}@H zt{oHwvFd0Q-DF>}94Fy^x!7m2Ia?R#j4Qb&ZXupQWAkl)|K3>==>Iq()!=yl0#Ot) zf++!@67&4Cc%h_USC*6Ur~-wsFrVEfKA2etb^VC^;1u+snycl&iF?PCduMHDCklgb zwfD?Y0@f~z#bZ5M;(a*df{%II5+Fh#oI6@!2*6i(QS0f590$CdO z#3v&Pu`+$+0YWyJ#vVnnIqsc!D2=OCCBM{XB>kAp#(6GvaI5f1)!JyZZyV}!r|3^g zDVLHmqhes-WDtE2r4fw^mP3rmSg0J<#_tQ*Y470ZEKK!64B=@}*4EYr2M0s6%Nvs# zH!a72&QjLHPaRCS0j)h-_KMlX%|P|81>jTRyK1dGWffX~aa!83@6or$0l`R*cWdFK zMv_yE@jSlM%of|fosS-TE{+y(a)muQn+}(11L2JRyw;poPtCMKLP97`A9W$AozY5|udwBWaw~k3bNC0D* zF@0VIV&y%X-YT-|{dqZ{mc!0_m{o7>0+*9XUIPMKh(R6M7--_wr|)}KbwBNOq&}+` zulDT;5stTfK&NQf3)7L%3zmsrWgo*@$}m?rCVfRV4G4~xIz7{Ob9t?#N#DAQgBm6; zvt}g4n6o0<32>&ubCnm6VcJ~JsBFg%I2K>^cVke^>4=VP?lbY12T0nty%f;c`{|JJ z3LV=HT|Cjc(KtHSS2D#7^f>?%kl=7f0TOPM|0meaJACMa(SxVGu!GgGsWSO9=J)rG z*kDwZiCU;&#l!yZ1$Q+*=sFG3Q{b0BHl`mYjKQbY^;aZZdNz&mbypDc?5#qblB<(y z+K}{IR9LyOYPOgYM}5rV+&|b&Irb1Q3vD=|j6*|4h2J;$BhexN<;ls3B*^zt9UKTC zausS2rp88vWLW(1^$%amV&l2~B2`+ZsGr@RzGGnEdTOpBebw-R<_Cr{*3dqc6b zBY3Yhx+3X zi+4_5Ols=OH@y;)8tc-%eSNU2N=Ve70OE-Wfmg)D(Jk_)-bDFfH#gX&)2Lw{-UZX; ze|c=MT?wCSgt8~Cd<1xZ!k!=Gb&bm#vPkl@S<@J50s-RR-y`#tfbfuvgVHPYetK0O z+04`78yV4*(!xU9Jof1tRQNWwwqQH8a0N9WHps}>6*&9#gn5sE1SEmv=)kBmXhj4( zP>Q=bqWI7~$`Gc@RCfniT@Q&IxL-rzS9WTt8?%&jiEt z{oB2Hs+QYgEZKC{hZo$erWRNZ=u#jt4cBhU{6<)uD@z@c5c6of)lI;lu!>>kfP=6w!-o*zm6NtG}0C$=0KKVbd#fb?7iXo*QA#smkaY&-8yvOHYeepOhK zxX#+t|K?&YNBr>c)Ig3R@%*&JWi>`z!v1*Hm8a|d80oC6_rTU&ZQT1$MSmwTGFt^^ zw}x5mjdgYroZWFla#h!%3%UPit}*Nq;gx(tpN2-bP(x3#V|dVCzBsw{7ZjZD8dXI~ zhz!{tUJ5wVbE?t}LDpnq&?|1ddAPI9=CQi8irc4pQKk-P4!Zi%v59P-*MV<>ZHDlL zyY`(Kq~FeeO_;CEk@6g8EC}9TdU0*{%7 zn_6g}K6(9^+5I#JA=J&vf}P*m;1i*zDO$2Wg>MZo(Y3(VD5qZ@`X+SV)qCEYMt02B z3s4&kk9`%tBZSX#b;r^-(ywEwH-92!hjRbUJpBD|`)9tG@0UL}r97vsRDN0vp7qGf z6ta_{4B8*pK{VsM9A;)_fc~V+%&6A$4oPQqx;-BsV%z;-IW#AFaPJ(Orm-3J8j~js z^i)YtdiKNls=qwHO6~v{JF@t&HRp7qq3INbLRIv4k?e9vqsYkk6MgGjCMNhz*?H+c z>1SuPXhd-tNS|7UY1?E~Cl6buV&VpM zmsy)%4{L9hP^=Df#9WBDJPysK8Z37+Bu4M?;QZ{eiHt`0+YXUz{BgZiK3^S1D}G*i zXu-vvACB!g{UcJJfls=DMz!0@dDcE-2v)JvvJH-QinqWsZiq6URQ4hyfoc?19wF}NvG6Xzt2qNdim#nmbGpKowbGJ z*sc;YR%%BMkS7*sly$9nTk+Bw^gU5h^Md~%j?PA@f+WFClm91*?Iay zeX!={eiL?jOZITq$&e3B>cI%PrpfFs2gQ_HL@HMV8SL;S!KE4;qWARF54j&0mF$``Sy@agH3o|#Dn-{qv!-fK zw?~}a+@uqaxUw2G<==FQ#p5Co?6;RrUc6PAbzr~s$9NJ8#HeKswzVpiY|xNOP#=pD_<>C&ybww8oE>>Jh_#WDOuUihznrI&r%*{)`y&pD*G)FC zU*fqCh$4Wz1uo%&Wgi6T);b^u9mD!|PTk11@^O1A_^YhOzLNJWoP2eDb;b^&P4?P- zHY^&+50)7L9NeC$x!;?Kbdt&WpECFYZv=ilE}}qa7vP`8!Z$^R9a^U?O`rPA=!*z= z>~6goSa@DFirV!IeL@fKrirJV>p?_m){c(iQd8XlL5jr@xw*rxetj0^tdCoagUe{? ztOy6GyS%?7>LA1$A06FwCE;bZbR}VWY?3%Q$oxmx6MNLSCCG85t-xmrAN?hjyDu`0 zSWIML;cLAHY*`JB7ouXz$$3v?EG%V%!-HYDQlGj-&(<_V@ST957tm%hyc%)sdM^I_ z2Zx_0Sy{W@#53ENpUOW+wYZ_JR!XnwLcM#SL$6CrO8nxg#c3kLAx&!sSyNGe+()lw`V34=q=*27Ix98iBDt1Mf``BqH#j=>@==!MZgP^|+@%siR534#CZ4C7gpLyQ z0S5}(YFcSELTdf^mLQJo3ez2I-#-BsC_IjuOV0Wp)o|knvwZv0us&kv;g0m=sw!4# zdvxugE7aTn7?(yoD)fVsWGv}op$E9bX5u$7k>`~xXMjAk&9Rk;C$&Q@>(Nmky#KUd zMMdUMfTm{Ll~yQHqe`UrmkkR@&V0L8wA9<8T*czoa=5e+KNdab@9)(HqjBV8+c1@VzEa60QbZ)l(JQEY?3vXn zhdsk^f4%fI|A44{`{{%4|N3=}%aeeh&%+y6tyca^wyDUWSzP$4RM*@lEfHDXGM>pFyv~abqY?T77Djd+8Aw9B^VG$bCU z%$EGckh)f>DC24|skI({{W)n}zJQCJSK8HvXo-4`h|uRN)qJ7&q=*kT^W5lm@f2BE zSvxZ&ctox!1_n8wpioLt)krK-Rq4u4p~$f9{ZKi29J&lh#f5;FhMAMuWrY`vM7Yu9 zrX7ds^k`21)%_QgP}T4qwn*-PjROKt5aUANDjH?K+CcD0mwnzIh)Y`bPMVSQY7wzc?-}I4lyQj7;Ju+P?ri0@+3?R)(~d17C>_Tl0ym^s%I1K#! zlM)(KbJyW)vw-SKON-via3do0qgFfqgm54^HPr%MAk5~G&wG`NHcrvt?fr<)7=KTW zycOTLcF?XQzpU^7pxlW?O_)1{M!>8|P$Wj>< z6_<)E^Ogy4<_MVHzwGxz#)M{m>fTI=fNRq=$desqiyklEs63obc>0S2S$`R{#~P?& zKPRbU10N~t`S-4XX!cK^{e>3i>|35Qg_1ad$n_!Au^ohW)N|Uugv`SwgoWDgyuH;p3DPF#8yOq~m{XzR1(K7F=J&L^ zk&c7>yk6ei!@I-TS^^(YEnLY7*5UXxfz%`4--YQFcD1@?z_gliH8iG@zkkPURYooQ zVqlSX#y0{y9$hWQT?Djj_ zca5cxz^6V+pL+T;rsh5E2(0<#+?|bJ4h@`H0^e5|MoB8#@$R)Nar-(m$qe+q9tR_` zYd$6rDAStZ7$IT*W!F|^q{~|O+uv-9`(?g(SbXh6%n-|Vhkt^+<@B!3S6JKQaGL~_%Kx``$e8|R$r&~`!wm@=TUP7CZ z5kE*aV{BHu(Kke*BTtmTX`r~LBV8gwSuZrp^ho=D<@$AKjm2(crpsFj-{2R)9Njf% z*JJrU9VifyE3NtMN7Lr10X+InXtl{hMw@597uL4<9yUAx8_JR6^d3BUrBqF0Y^HUF zkWKW(aj#g!Bp(17svCi4eAXaTAG0*4b++zwb*q9U@M*_g*rri$=TaCR;Vav{_xXL;L!8oNX(U8NY_TVx@~npQJ*|0Ua&f7a3N z14|uCPGjTg{$+kbz+;KNzl#1WVxikSzm1BC>F!qn(;bAX$I%LqI369{>{o;FNl6o* z9`Dyjb8T{j+-OuN1o|i7);}ifCV1GfPN5|gm)d>`vWGTO8-etmj9em(N*(fgtiVM5=4p7!!kq|k|CY3U1Ek(Xw*=z7Q} z16|I{skkcXCxUVM4FK7&q@o|NFi$?Vlpv#)2UARK@IjJy9EV)!|mp|9O-c@kfGX#P>J1X|wCw zxh(S(%9{=EB)>fp`Mboml=wXuEI-1`uk`gl+@B)x^UuCmdI15_*49?;9gi(E0iW<( zxFFe?_^9$J-^t=FKK z!FaYDB=ef)W_e#PXc>L$8V3qe7 zU)I0j;i37IEI_w$em2{B8UlQxuB1XE!&d7!9W>z%^wV*5C7`jk_#C~iwaC>3JHK)E z@(5R8?kSWXQczY7Q!SB}vm$w?M@__-5qyRhbq4m{S_R45%oe>BM9AeM%XzC4-u?8B zck|R6k-U{Tw^DJr+2Pq~peXt!CRb8}iwLQaiLb7fYPR#gA>jG*=MO%`A_X~l7C!oo zv%7oPmp38m%wg)x>}UK+mctD{JCuuM&#lxG1F1 zQe%VuUWEQl)726@9|OlusqbV@{IQ#p^R!~L8p}fzp0dRajKvXCp>8}vHbHMYe`tTD zOZ&TK*zCA^{c?xx@NfMluFljgDJIH45y7hgwTEL8HI6IC2qDJz$foUx4GeQTw<*WY zj#mSM+P!EQI5{y8IY5x#h1?ux?vEr0-K*#>_$jLg{}`(#0KI}Xi2PVhu6>-pg_<0r zpKLL_DY(9#4}oP6se5`N^f==}R+104P7gb2l5~K?0lp5S)g`qVp8WN&Cdcsc*-B@a zIwA)iN6UtTS&^6&frHs!#u-q-;Kny|y!rHn#0B}@2`Zm4gWAg|>(`hck6$1f7=ZmYhLEkY&rbxSq5=`I_KhA zT39I1=I}yff6giD+@w7-~XT|i*&|EWmEG>dwrnb4eR^mhgH5D!lKdq}yYQDH&-S1R7795WQNzYzWZ zP-s~8?Ij>7k17#STBJdNCjMU_VNmJtO^at^BHQ=MHs!WxX HNyz^Ld%_o7 diff --git a/helm/software/matita/help/C/sec_commands.xml b/helm/software/matita/help/C/sec_commands.xml index 5e55de999..4fe77d7b7 100644 --- a/helm/software/matita/help/C/sec_commands.xml +++ b/helm/software/matita/help/C/sec_commands.xml @@ -254,8 +254,7 @@ On the contrary, theorem and definitions declared in a file can be immediately used without including it. The file s is automatically compiled - if it is not compiled yet and if it is handled by a - development. + if it is not compiled yet. @@ -282,36 +281,6 @@ - - set - set "baseuri" "s" - - - - Synopsis: - - set &qstring; &qstring; - - - - Action: - - Sets to s the baseuri of all the - theorems and definitions stated in the current file. - The baseuri should be a/b/c/foo - if the file is named foo and it is in - the subtree a/b/c of the current - development. - This requirement is not enforced, but it could be in the future. - - Currently, baseuri is the only - property that can be set even if the parser accepts - arbitrary property names. - - - - - whelp whelp locate "s" diff --git a/helm/software/matita/help/C/sec_gettingstarted.xml b/helm/software/matita/help/C/sec_gettingstarted.xml index 0066449b0..b0c0a863e 100644 --- a/helm/software/matita/help/C/sec_gettingstarted.xml +++ b/helm/software/matita/help/C/sec_gettingstarted.xml @@ -88,133 +88,60 @@ Authoring - - How to use developments + + How to compile a script - A development is a set of scripts files that are strictly related (i.e. - they depend on each other). &appname; is able to automatically manage - dependencies among the scripts in a development, compiling them in the - correct order. + Scripts are compiled to base URIs. Base URIs are of the form + "cic:/matita/path" and are given once for all for a set + of scripts using the "root" file. - The include statement can be performed by &appname; only if the mentioned - script is compiled. If both scripts (the one that includes and the included) - are part of the same development, the included script (and recursively all - its dependencies) can be compiled automatically. Dependencies among scripts - belonging to different developments is not implemented yet. - - - The "Developments..." item the File menu (or pressing - Ctrl+D) opens the Developments window. - -
The Developments window - - - - - Screenshot of the Developments window. - -
- - Developments window buttons - New - - - To create a new Development the user needs to specify a name - - The name of the Development should be the name of the directory in - which it lives. This is not a requirement, but the makefile - automatically generated by matita in the root directory of the - development will eventually generate a new Development with a name - that follows this convention. Having more than one development for - the same set of files is not an issue. - - - and the root directory in which all scripts will be placed, - eventually organized in subdirectories. The Development should be - named as the directory in which it lives. A "makefile" - file is placed in the specified root directory. That makefile - supports the following targets: - - all - - - Build the whole development. - - - - clean - - - Cleans the whole development. - - - - cleanall - - - Resets the user environment (i.e. deleting all the results - of compilation of every development, including the contents - of the database). This target should be used only in case - something goes wrong and &appname; behaves incorrectly. - - - - scriptname.mo - - - Compiles "scriptname.ma" - - - - - - - - Delete - - - Decompiles the whole development and removes it. - - - - Build - - - Compiles all the scripts in the development. - - - - Clean - - - Decompiles the whole development. - - - - Publish - - - All the user developments live in the "user" space. That is, the - result of the compilation of scripts is placed in his home directory - and the tuples are placed in personal tables inside the database. - Publishing a development means putting it in the "library" space. This - means putting the result of compilation in the same place where the - standard library lives. This feature will be improved in the future - to support publishing the development in the "distributed - library" space (making your development public). - - - - Close - - - Closes the Developments window - - - - - + A "root" file has to be placed in the root of a script set, + for example, consider the following files and directories, and + assume you keep files in "list" separated from files + in "sort" (for example the former directory may contain + functions and proofs about lists, while latter sorting algorithms + for lists): + + To be able to compile properly the contents of "list" + a file called root has to be placed in it. The file should be like + the following snippet. + + This file tells &appname; that objects generated by + "list.ma" have to be placed in + "cic:/matita/mydatastructures/list" while + objects generated by + "swap.ma" have to be placed in + "cic:/matita/mydatastructures/utils/swap". + + + Once you created the root file, you must generate a depend file. + Enter the "list" directory (the root of yuor file set) + and type "matitadep". Remember to regenerate the depend file + every time you alter the dependencies of your files (for example + including other scripts). + You can now compile you files typing "matitac". + + + To compile the "sort" directory, create a root file + in "sort/" like the following one and then run + "matitadep". + + The include_paths field can declare a list of paths separated by space. + Please omit any "/" from the end of base URIs or paths. + The authoring interface diff --git a/helm/software/matita/legacy/Makefile b/helm/software/matita/legacy/Makefile new file mode 100644 index 000000000..cce033fc0 --- /dev/null +++ b/helm/software/matita/legacy/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../matitac +$(DIR).opt opt all.opt: + ../matitac.opt +clean: + ../matitaclean +clean.opt: + ../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/legacy/coq.ma b/helm/software/matita/legacy/coq.ma index 4ea9919f1..649b866d8 100644 --- a/helm/software/matita/legacy/coq.ma +++ b/helm/software/matita/legacy/coq.ma @@ -12,8 +12,6 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/legacy/coq/". - default "equality" cic:/Coq/Init/Logic/eq.ind cic:/Coq/Init/Logic/sym_eq.con diff --git a/helm/software/matita/legacy/depends b/helm/software/matita/legacy/depends new file mode 100644 index 000000000..c35efdda5 --- /dev/null +++ b/helm/software/matita/legacy/depends @@ -0,0 +1 @@ +coq.ma diff --git a/helm/software/matita/legacy/makefile b/helm/software/matita/legacy/makefile deleted file mode 100644 index a1dd3ca33..000000000 --- a/helm/software/matita/legacy/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../ -OPTIONS=-bench -onepass -system -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/legacy/root b/helm/software/matita/legacy/root new file mode 100644 index 000000000..302ea9e6e --- /dev/null +++ b/helm/software/matita/legacy/root @@ -0,0 +1 @@ +baseuri=cic:/matita/legacy diff --git a/helm/software/matita/library/Makefile b/helm/software/matita/library/Makefile new file mode 100644 index 000000000..cce033fc0 --- /dev/null +++ b/helm/software/matita/library/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../matitac +$(DIR).opt opt all.opt: + ../matitac.opt +clean: + ../matitaclean +clean.opt: + ../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/library/algebra/CoRN/Setoids.ma b/helm/software/matita/library/algebra/CoRN/Setoids.ma index a48d1a522..982d61caf 100644 --- a/helm/software/matita/library/algebra/CoRN/Setoids.ma +++ b/helm/software/matita/library/algebra/CoRN/Setoids.ma @@ -48,10 +48,10 @@ record CSetoid : Type \def cs_proof : is_CSetoid cs_crr cs_eq cs_ap}. interpretation "setoid equality" - 'eq x y = (cic:/matita/algebra/CoRN/Setoid/cs_eq.con _ x y). + 'eq x y = (cic:/matita/algebra/CoRN/Setoids/cs_eq.con _ x y). interpretation "setoid apart" - 'neq x y = (cic:/matita/algebra/CoRN/Setoid/cs_ap.con _ x y). + 'neq x y = (cic:/matita/algebra/CoRN/Setoids/cs_ap.con _ x y). (* visto che sia "ap" che "eq" vanno in Prop e data la "tight-apartness", "cs_neq" e "ap" non sono la stessa cosa? *) @@ -809,7 +809,7 @@ definition id_un_op : \forall S:CSetoid. CSetoid_un_op S definition un_op_fun: \forall S:CSetoid. CSetoid_un_op S \to CSetoid_fun S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/un_op_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/un_op_fun.con. definition cs_un_op_strext : \forall S:CSetoid. \forall f: CSetoid_fun S S. fun_strext S S (csf_fun S S f) \def \lambda S:CSetoid. \lambda f : CSetoid_fun S S. csf_strext S S f. @@ -862,7 +862,7 @@ definition cs_bin_op_strext : \forall S:CSetoid. \forall f: CSetoid_bin_fun S S definition bin_op_bin_fun: \forall S:CSetoid. CSetoid_bin_op S \to CSetoid_bin_fun S S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/bin_op_bin_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/bin_op_bin_fun.con. @@ -982,7 +982,7 @@ definition outer_op_bin_fun: \forall S:CSetoid. CSetoid_outer_op S S \to CSetoid_bin_fun S S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/outer_op_bin_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/outer_op_bin_fun.con. (* begin hide Identity Coercion outer_op_bin_fun : CSetoid_outer_op >-> CSetoid_bin_fun. end hide *) diff --git a/helm/software/matita/library/depends b/helm/software/matita/library/depends new file mode 100644 index 000000000..0e5088430 --- /dev/null +++ b/helm/software/matita/library/depends @@ -0,0 +1,88 @@ +Z/dirichlet_product.ma Z/sigma_p.ma Z/times.ma nat/primes.ma +Z/moebius.ma Z/sigma_p.ma nat/factorization.ma +Z/times.ma Z/plus.ma nat/lt_arith.ma +Z/orders.ma Z/z.ma logic/connectives.ma nat/orders.ma +Z/inversion.ma Z/dirichlet_product.ma Z/moebius.ma +Z/plus.ma Z/z.ma nat/minus.ma +Z/compare.ma Z/orders.ma nat/compare.ma +Z/sigma_p.ma Z/plus.ma Z/times.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma +Z/z.ma datatypes/bool.ma nat/nat.ma +assembly/test.ma assembly/vm.ma +assembly/byte.ma assembly/exadecimal.ma +assembly/vm.ma assembly/byte.ma +assembly/exadecimal.ma assembly/extra.ma +assembly/extra.ma list/list.ma nat/div_and_mod.ma nat/primes.ma +datatypes/constructors.ma logic/equality.ma +datatypes/compare.ma +datatypes/bool.ma higher_order_defs/functions.ma logic/equality.ma +algebra/groups.ma algebra/monoids.ma datatypes/bool.ma logic/connectives.ma nat/compare.ma nat/le_arith.ma +algebra/finite_groups.ma algebra/groups.ma nat/relevant_equations.ma +algebra/semigroups.ma higher_order_defs/functions.ma +algebra/monoids.ma algebra/semigroups.ma +algebra/CoRN/SetoidInc.ma algebra/CoRN/SetoidFun.ma +algebra/CoRN/SemiGroups.ma algebra/CoRN/SetoidInc.ma +algebra/CoRN/Setoids.ma Z/plus.ma datatypes/constructors.ma higher_order_defs/relations.ma logic/equality.ma nat/nat.ma +algebra/CoRN/SetoidFun.ma algebra/CoRN/Setoids.ma higher_order_defs/relations.ma +demo/propositional_sequent_calculus.ma datatypes/constructors.ma list/sort.ma nat/compare.ma nat/plus.ma +demo/power_derivative.ma nat/compare.ma nat/nat.ma nat/orders.ma nat/plus.ma +list/sort.ma datatypes/bool.ma datatypes/constructors.ma list/list.ma +list/list.ma higher_order_defs/functions.ma logic/equality.ma nat/nat.ma +logic/equality.ma higher_order_defs/relations.ma logic/connectives.ma +logic/connectives.ma +logic/coimplication.ma logic/connectives.ma +logic/connectives2.ma higher_order_defs/relations.ma +nat/div_and_mod.ma datatypes/constructors.ma nat/minus.ma +nat/count.ma nat/permutation.ma nat/relevant_equations.ma nat/sigma_and_pi.ma +nat/factorial2.ma nat/exp.ma nat/factorial.ma +nat/totient1.ma nat/compare.ma nat/gcd_properties1.ma nat/iteration2.ma nat/totient.ma +nat/congruence.ma nat/primes.ma nat/relevant_equations.ma +nat/minus.ma nat/compare.ma nat/le_arith.ma +nat/chebyshev.ma nat/factorial2.ma nat/factorization.ma nat/log.ma nat/pi_p.ma +nat/chinese_reminder.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma +nat/permutation.ma nat/compare.ma nat/sigma_and_pi.ma +nat/factorial.ma nat/le_arith.ma +nat/nth_prime.ma nat/lt_arith.ma nat/primes.ma +nat/binomial.ma nat/factorial2.ma nat/iteration2.ma +nat/fermat_little_theorem.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma +nat/exp.ma nat/div_and_mod.ma nat/lt_arith.ma +nat/minimization.ma nat/minus.ma +nat/gcd.ma nat/lt_arith.ma nat/primes.ma +nat/chebyshev_thm.ma nat/neper.ma +nat/neper.ma nat/binomial.ma nat/chebyshev.ma nat/div_and_mod_diseq.ma nat/iteration2.ma nat/log.ma +nat/sigma_and_pi.ma nat/exp.ma nat/factorial.ma nat/lt_arith.ma +nat/le_arith.ma nat/orders.ma nat/times.ma +nat/times.ma nat/plus.ma +nat/div_and_mod_diseq.ma nat/lt_arith.ma +nat/generic_iter_p.ma nat/div_and_mod_diseq.ma nat/ord.ma nat/primes.ma +nat/gcd_properties1.ma nat/gcd.ma +nat/totient.ma nat/chinese_reminder.ma nat/iteration2.ma +nat/lt_arith.ma nat/div_and_mod.ma +nat/factorization.ma nat/ord.ma +nat/log.ma datatypes/constructors.ma nat/div_and_mod_diseq.ma nat/iteration2.ma nat/minimization.ma nat/primes.ma nat/relevant_equations.ma +nat/iteration2.ma nat/count.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma +nat/nat.ma higher_order_defs/functions.ma +nat/relevant_equations.ma nat/gcd.ma nat/minus.ma nat/times.ma +nat/map_iter_p.ma nat/count.ma nat/permutation.ma +nat/orders.ma higher_order_defs/ordering.ma logic/connectives.ma nat/nat.ma +nat/pi_p.ma nat/generic_iter_p.ma nat/iteration2.ma nat/primes.ma +nat/plus.ma nat/nat.ma +nat/euler_theorem.ma nat/nat.ma nat/map_iter_p.ma nat/totient.ma +nat/compare.ma datatypes/bool.ma datatypes/compare.ma nat/orders.ma +nat/primes.ma logic/connectives.ma nat/div_and_mod.ma nat/factorial.ma nat/minimization.ma nat/sigma_and_pi.ma +nat/ord.ma datatypes/constructors.ma nat/exp.ma nat/gcd.ma nat/nth_prime.ma nat/relevant_equations.ma +Q/Qaxioms.ma Z/compare.ma Z/times.ma nat/iteration2.ma +Q/q.ma Z/compare.ma Z/plus.ma +technicalities/setoids.ma datatypes/constructors.ma logic/coimplication.ma logic/connectives2.ma +Fsub/part1a.ma Fsub/defn.ma +Fsub/util.ma list/list.ma logic/equality.ma nat/compare.ma +Fsub/defn.ma Fsub/util.ma +Fsub/part1a_inversion.ma Fsub/defn.ma +decidable_kit/streicher.ma logic/connectives.ma logic/equality.ma +decidable_kit/decidable.ma datatypes/bool.ma decidable_kit/streicher.ma logic/connectives.ma nat/compare.ma +decidable_kit/fgraph.ma decidable_kit/fintype.ma +decidable_kit/eqtype.ma datatypes/constructors.ma decidable_kit/decidable.ma +decidable_kit/list_aux.ma decidable_kit/eqtype.ma list/list.ma nat/plus.ma +decidable_kit/fintype.ma decidable_kit/eqtype.ma decidable_kit/list_aux.ma +higher_order_defs/relations.ma logic/connectives.ma +higher_order_defs/functions.ma logic/equality.ma +higher_order_defs/ordering.ma logic/equality.ma diff --git a/helm/software/matita/library/library_notation.ma b/helm/software/matita/library/library_notation.ma deleted file mode 100644 index f86396f1f..000000000 --- a/helm/software/matita/library/library_notation.ma +++ /dev/null @@ -1,54 +0,0 @@ -set "baseuri" "cic:/matita/library_notation/". - -include "Q/q.ma". -include "higher_order_defs/functions.ma". -include "higher_order_defs/ordering.ma". -include "higher_order_defs/relations.ma". -include "nat/nth_prime.ma". -include "nat/plus.ma". -include "nat/ord.ma". -include "nat/congruence.ma". -include "nat/compare.ma". -include "nat/totient.ma". -include "nat/le_arith.ma". -include "nat/count.ma". -include "nat/orders.ma". -include "nat/minus.ma". -include "nat/exp.ma". -include "nat/gcd.ma". -include "nat/div_and_mod.ma". -include "nat/primes.ma". -include "nat/relevant_equations.ma". -include "nat/chinese_reminder.ma". -include "nat/factorial.ma". -include "nat/lt_arith.ma". -include "nat/minimization.ma". -include "nat/permutation.ma". -include "nat/sigma_and_pi.ma". -include "nat/factorization.ma". -include "nat/times.ma". -include "nat/fermat_little_theorem.ma". -include "nat/nat.ma". -(* FG: coq non c'entra con library, o sbaglio? *) -(* include "legacy/coq.ma". *) -include "Z/compare.ma". -include "Z/plus.ma". -include "Z/times.ma". -include "Z/z.ma". -include "Z/orders.ma". -include "list/sort.ma". -include "list/list.ma". -include "algebra/semigroups.ma". -include "algebra/monoids.ma". -include "algebra/groups.ma". -include "algebra/finite_groups.ma". -include "logic/connectives.ma". -include "logic/equality.ma". -include "datatypes/constructors.ma". -include "datatypes/compare.ma". -include "datatypes/bool.ma". - -notation "hvbox(x break \middot y)" - left associative with precedence 55 -for @{ 'times $x $y }. - diff --git a/helm/software/matita/library/list/list.ma b/helm/software/matita/library/list/list.ma index f832d5020..ba4f61bc4 100644 --- a/helm/software/matita/library/list/list.ma +++ b/helm/software/matita/library/list/list.ma @@ -32,9 +32,9 @@ notation "hvbox(l1 break @ l2)" right associative with precedence 47 for @{'append $l1 $l2 }. -interpretation "nil" 'nil = (cic:/matita/list/list.ind#xpointer(1/1/1) _). +interpretation "nil" 'nil = (cic:/matita/list/list/list.ind#xpointer(1/1/1) _). interpretation "cons" 'cons hd tl = - (cic:/matita/list/list.ind#xpointer(1/1/2) _ hd tl). + (cic:/matita/list/list/list.ind#xpointer(1/1/2) _ hd tl). (* theorem test_notation: [O; S O; S (S O)] = O :: S O :: S (S O) :: []. *) @@ -62,7 +62,7 @@ definition tail := \lambda A:Type. \lambda l: list A. [ nil => [] | (cons hd tl) => tl]. -interpretation "append" 'append l1 l2 = (cic:/matita/list/append.con _ l1 l2). +interpretation "append" 'append l1 l2 = (cic:/matita/list/list/append.con _ l1 l2). theorem append_nil: \forall A:Type.\forall l:list A.l @ [] = l. intros; diff --git a/helm/software/matita/library/makefile b/helm/software/matita/library/makefile deleted file mode 100644 index ec9f8cb26..000000000 --- a/helm/software/matita/library/makefile +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/library/root b/helm/software/matita/library/root new file mode 100644 index 000000000..e6f78ade0 --- /dev/null +++ b/helm/software/matita/library/root @@ -0,0 +1 @@ +baseuri=cic:/matita diff --git a/helm/software/matita/library/technicalities/setoids.ma b/helm/software/matita/library/technicalities/setoids.ma index b945931c1..d9fd301fc 100644 --- a/helm/software/matita/library/technicalities/setoids.ma +++ b/helm/software/matita/library/technicalities/setoids.ma @@ -18,8 +18,8 @@ set "baseuri" "cic:/matita/technicalities/setoids". include "datatypes/constructors.ma". -include "logic/connectives2.ma". include "logic/coimplication.ma". +include "logic/connectives2.ma". (* DEFINITIONS OF Relation_Class AND n-ARY Morphism_Theory *) diff --git a/helm/software/matita/matita.glade b/helm/software/matita/matita.glade index 72ba3db8c..0eaaaa780 100644 --- a/helm/software/matita/matita.glade +++ b/helm/software/matita/matita.glade @@ -770,6 +770,7 @@ + True @@ -2587,448 +2589,6 @@ - - Create development - False - True - GTK_WIN_POS_CENTER_ALWAYS - GDK_WINDOW_TYPE_HINT_UTILITY - - - True - - - True - 3 - 2 - 3 - 5 - 5 - - - - - - True - True - ... - True - 0 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - True - * - - - 1 - 2 - 1 - 2 - - - - - - True - True - * - - - 1 - 2 - - - - - - True - 0 - Root directory - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Name - - - GTK_FILL - - - - - - False - - - - - True - - - False - 2 - 1 - - - - - True - 3 - 5 - - - True - - - - - - - - - - - True - True - gtk-add - True - 0 - - - False - False - 1 - - - - - True - True - gtk-cancel - True - 0 - - - False - False - 2 - - - - - False - 2 - - - - - - - Developments - GTK_WIN_POS_CENTER - - - True - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - - - True - - - False - 2 - 1 - - - - - True - 3 - 4 - - - True - - - - - - - - - - - True - True - gtk-new - True - 0 - - - False - False - 1 - - - - - True - True - gtk-delete - True - 0 - - - False - False - 2 - - - - - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-execute - - - False - False - - - - - True - _Build - True - - - False - False - 1 - - - - - - - - - False - False - 3 - - - - - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-clear - - - False - False - - - - - True - C_lean - True - - - False - False - 1 - - - - - - - - - False - False - 4 - - - - - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-convert - - - False - False - - - - - True - Publish - True - - - False - False - 1 - - - - - - - - - False - False - 5 - - - - - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-zoom-fit - - - False - False - - - - - True - Graph - True - - - False - False - 1 - - - - - - - - - False - False - 6 - - - - - True - True - gtk-close - True - 0 - - - False - False - 7 - - - - - False - 2 - - - - - 450 400 diff --git a/helm/software/matita/matita.ma.templ b/helm/software/matita/matita.ma.templ index ec1bc8006..5ec5164b8 100644 --- a/helm/software/matita/matita.ma.templ +++ b/helm/software/matita/matita.ma.templ @@ -12,5 +12,3 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". - diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml index 60b112d98..c559358c5 100644 --- a/helm/software/matita/matita.ml +++ b/helm/software/matita/matita.ml @@ -65,7 +65,6 @@ let script = (fun ~title ~message -> MatitaGtkMisc.ask_confirmation ~title ~message ~parent:gui#main#toplevel ()) - ~develcreator:gui#createDevelopment () in gui#sourceView#source_buffer#begin_not_undoable_action (); @@ -274,46 +273,25 @@ let _ = end (** Debugging }}} *) - (** {2 Command line parsing} *) - -let set_matita_mode () = - let matita_mode = - if Filename.basename Sys.argv.(0) = "cicbrowser" || - Filename.basename Sys.argv.(0) = "cicbrowser.opt" - then "cicbrowser" - else "matita" - in - Helm_registry.set "matita.mode" matita_mode - (** {2 Main} *) let _ = - set_matita_mode (); at_exit (fun () -> print_endline "\nThanks for using Matita!\n"); Sys.catch_break true; let args = Helm_registry.get_list Helm_registry.string "matita.args" in - if Helm_registry.get "matita.mode" = "cicbrowser" then (* cicbrowser *) - let browser = MatitaMathView.cicBrowser () in - let uri = match args with [] -> "cic:/" | _ -> String.concat " " args in - browser#loadInput uri - else begin (* matita *) - (try gui#loadScript (List.hd args) with Failure _ -> ()); - gui#main#mainWin#show (); - end; + (try gui#loadScript (List.hd args) with Failure _ -> ()); + gui#main#mainWin#show (); try - GtkThread.main () + GtkThread.main () with Sys.Break -> Sys.set_signal Sys.sigint (Sys.Signal_handle (fun _ -> prerr_endline "Still cleaning the library: don't be impatient!")); prerr_endline "Matita is cleaning up. Please wait."; - try - let baseuri = - GrafiteTypes.get_string_option - (MatitaScript.current ())#grafite_status "baseuri" - in + let baseuri = + GrafiteTypes.get_baseuri (MatitaScript.current ())#grafite_status + in LibraryClean.clean_baseuris [baseuri] - with GrafiteTypes.Option_error _ -> () (* vim:set foldmethod=marker: *) diff --git a/helm/software/matita/matitaEngine.ml b/helm/software/matita/matitaEngine.ml index 133893f0d..5f8a1b7a7 100644 --- a/helm/software/matita/matitaEngine.ml +++ b/helm/software/matita/matitaEngine.ml @@ -41,13 +41,9 @@ let disambiguate_tactic text prefix_len lexicon_status_ref grafite_status goal t GrafiteTypes.set_metasenv metasenv grafite_status,tac let disambiguate_command lexicon_status_ref grafite_status cmd = + let baseuri = GrafiteTypes.get_baseuri grafite_status in let lexicon_status,metasenv,cmd = - GrafiteDisambiguate.disambiguate_command - ~baseuri:( - try - Some (GrafiteTypes.get_string_option grafite_status "baseuri") - with - GrafiteTypes.Option_error _ -> None) + GrafiteDisambiguate.disambiguate_command ~baseuri !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd in lexicon_status_ref := lexicon_status; @@ -62,33 +58,36 @@ let disambiguate_macro lexicon_status_ref grafite_status macro context = in GrafiteTypes.set_metasenv metasenv grafite_status,macro -let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status +let eval_ast ?do_heavy_checks lexicon_status grafite_status (text,prefix_len,ast) = let lexicon_status_ref = ref lexicon_status in + let baseuri = GrafiteTypes.get_baseuri grafite_status in let new_grafite_status,new_objs = GrafiteEngine.eval_ast ~disambiguate_tactic:(disambiguate_tactic text prefix_len lexicon_status_ref) ~disambiguate_command:(disambiguate_command lexicon_status_ref) ~disambiguate_macro:(disambiguate_macro lexicon_status_ref) - ?do_heavy_checks ?clean_baseuri grafite_status (text,prefix_len,ast) in + ?do_heavy_checks grafite_status (text,prefix_len,ast) in let new_lexicon_status = LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs in let new_aliases = LexiconSync.alias_diff ~from:lexicon_status new_lexicon_status in let _,intermediate_states = - let baseuri = GrafiteTypes.get_string_option new_grafite_status "baseuri" in List.fold_left (fun (lexicon_status,acc) (k,((v,_) as value)) -> let b = try - UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri + (* this hack really sucks! *) + UriManager.buri_of_uri (UriManager.uri_of_string v) = + baseuri with UriManager.IllFormedUri _ -> false (* v is a description, not a URI *) in if b then lexicon_status,acc else + let new_lexicon_status = LexiconEngine.set_proof_aliases lexicon_status [k,value] in @@ -99,62 +98,66 @@ let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status ((new_grafite_status,new_lexicon_status),None)::intermediate_states exception TryingToAdd of string +exception EnrichedWithLexiconStatus of exn * LexiconEngine.status let out = ref ignore let set_callback f = out := f -let eval_from_stream ~first_statement_only ~include_paths ?(prompt=false) - ?do_heavy_checks ?clean_baseuri ?(enforce_no_new_aliases=true) +let eval_from_stream ~first_statement_only ~include_paths + ?do_heavy_checks ?(enforce_no_new_aliases=true) ?(watch_statuses=fun _ _ -> ()) lexicon_status grafite_status str cb = let rec loop lexicon_status grafite_status statuses = let loop = - if first_statement_only then - fun _ _ statuses -> statuses - else - loop + if first_statement_only then fun _ _ statuses -> statuses + else loop + in + let stop,l,g,s = + try + let cont = + try + Some (GrafiteParser.parse_statement ~include_paths str lexicon_status) + with + End_of_file -> None + in + match cont with + | None -> true, lexicon_status, grafite_status, statuses + | Some (lexicon_status,ast) -> + (match ast with + GrafiteParser.LNone _ -> + watch_statuses lexicon_status grafite_status ; + false, lexicon_status, grafite_status, + (((grafite_status,lexicon_status),None)::statuses) + | GrafiteParser.LSome ast -> + !out ast; + cb grafite_status ast; + let new_statuses = + eval_ast ?do_heavy_checks lexicon_status + grafite_status ("",0,ast) in + if enforce_no_new_aliases then + List.iter + (fun (_,alias) -> + match alias with + None -> () + | Some (k,((v,_) as value)) -> + let newtxt = + DisambiguatePp.pp_environment + (DisambiguateTypes.Environment.add k value + DisambiguateTypes.Environment.empty) + in + raise (TryingToAdd newtxt)) new_statuses; + let grafite_status,lexicon_status = + match new_statuses with + [] -> assert false + | (s,_)::_ -> s + in + watch_statuses lexicon_status grafite_status ; + false, lexicon_status, grafite_status, (new_statuses @ statuses)) + with exn -> + raise (EnrichedWithLexiconStatus (exn, lexicon_status)) in - if prompt then (print_string "matita> "; flush stdout); - let cont = - try - Some (GrafiteParser.parse_statement ~include_paths str lexicon_status) - with - End_of_file -> None - in - match cont with - | None -> statuses - | Some (lexicon_status,ast) -> - (match ast with - GrafiteParser.LNone _ -> - watch_statuses lexicon_status grafite_status ; - loop lexicon_status grafite_status - (((grafite_status,lexicon_status),None)::statuses) - | GrafiteParser.LSome ast -> - !out ast; - cb grafite_status ast; - let new_statuses = - eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status - grafite_status ("",0,ast) in - if enforce_no_new_aliases then - List.iter - (fun (_,alias) -> - match alias with - None -> () - | Some (k,((v,_) as value)) -> - let newtxt = - DisambiguatePp.pp_environment - (DisambiguateTypes.Environment.add k value - DisambiguateTypes.Environment.empty) - in - raise (TryingToAdd newtxt)) new_statuses; - let grafite_status,lexicon_status = - match new_statuses with - [] -> assert false - | (s,_)::_ -> s - in - watch_statuses lexicon_status grafite_status ; - loop lexicon_status grafite_status (new_statuses @ statuses)) + if stop then s else loop l g s in loop lexicon_status grafite_status [] ;; diff --git a/helm/software/matita/matitaEngine.mli b/helm/software/matita/matitaEngine.mli index 83b549ec4..bb4537d8d 100644 --- a/helm/software/matita/matitaEngine.mli +++ b/helm/software/matita/matitaEngine.mli @@ -25,7 +25,6 @@ val eval_ast : ?do_heavy_checks:bool -> - ?clean_baseuri:bool -> LexiconEngine.status -> GrafiteTypes.status -> string * int * @@ -40,14 +39,14 @@ val eval_ast : (* heavy checks slow down the compilation process but give you some interesting * infos like if the theorem is a duplicate *) +exception EnrichedWithLexiconStatus of exn * LexiconEngine.status + (* should be used only by the compiler since it looses the * disambiguation_context (text,prefix_len,_) *) val eval_from_stream : first_statement_only:bool -> include_paths:string list -> - ?prompt:bool -> ?do_heavy_checks:bool -> - ?clean_baseuri:bool -> ?enforce_no_new_aliases:bool -> (* default true *) ?watch_statuses:(LexiconEngine.status -> GrafiteTypes.status -> unit) -> LexiconEngine.status -> diff --git a/helm/software/matita/matitaExcPp.ml b/helm/software/matita/matitaExcPp.ml index 8888b8dfe..24981af6b 100644 --- a/helm/software/matita/matitaExcPp.ml +++ b/helm/software/matita/matitaExcPp.ml @@ -117,10 +117,6 @@ let rec to_string = let _,msg = to_string exn in let (x, y) = HExtlib.loc_of_floc floc in Some floc, sprintf "Error at %d-%d: %s" x y msg - | GrafiteTypes.Option_error ("baseuri", "not found" ) -> - None, - "Baseuri not set for this script. " - ^ "Use 'set \"baseuri\" \"\".' to set it." | GrafiteTypes.Command_error msg -> None, "Error: " ^ msg | CicNotationParser.Parse_error err -> None, sprintf "Parse error: %s" err @@ -151,6 +147,8 @@ let rec to_string = None, "Already defined: " ^ UriManager.string_of_uri s | CoercDb.EqCarrNotImplemented msg -> None, ("EqCarrNotImplemented: " ^ Lazy.force msg) + | MatitaEngine.EnrichedWithLexiconStatus (exn,_) -> + None, "EnrichedWithLexiconStatus "^snd(to_string exn) | GrafiteDisambiguator.DisambiguationError (offset,errorll) -> let loc = match errorll with diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml index 99b623b0f..3ba6499a9 100644 --- a/helm/software/matita/matitaGui.ml +++ b/helm/software/matita/matitaGui.ml @@ -58,6 +58,7 @@ class console ~(buffer: GText.buffer) () = method clear () = buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter method log_callback (tag: HLog.log_tag) s = + let s = Pcre.replace ~pat:"\\[0;3.m([^]+)\\[0m" ~templ:"$1" s in match tag with | `Debug -> self#debug (s ^ "\n") | `Error -> self#error (s ^ "\n") @@ -66,58 +67,30 @@ class console ~(buffer: GText.buffer) () = end let clean_current_baseuri grafite_status = - try - let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in - LibraryClean.clean_baseuris [baseuri] - with GrafiteTypes.Option_error _ -> () + LibraryClean.clean_baseuris [GrafiteTypes.get_baseuri grafite_status] -let ask_and_save_moo_if_needed parent fname lexicon_status grafite_status = - let baseuri = - try Some (GrafiteTypes.get_string_option grafite_status "baseuri") - with GrafiteTypes.Option_error _ -> None +let save_moo lexicon_status grafite_status = + let script = MatitaScript.current () in + let baseuri = GrafiteTypes.get_baseuri grafite_status in + let no_pstatus = + grafite_status.GrafiteTypes.proof_status = GrafiteTypes.No_proof in - if (MatitaScript.current ())#eos && - grafite_status.GrafiteTypes.proof_status = GrafiteTypes.No_proof && - baseuri <> None - then - begin - let baseuri = match baseuri with Some b -> b | None -> assert false in - let moo_fname = - LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri - ~writable:true in - let save () = - let lexicon_fname = + match script#bos, script#eos, no_pstatus with + | true, _, _ -> () + | _, true, true -> + let moo_fname = + LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri + ~writable:true in + let lexicon_fname = LibraryMisc.lexicon_file_of_baseuri ~must_exist:false ~baseuri ~writable:true - in - GrafiteMarshal.save_moo moo_fname - grafite_status.GrafiteTypes.moo_content_rev; - LexiconMarshal.save_lexicon lexicon_fname - lexicon_status.LexiconEngine.lexicon_content_rev - in - begin - let rc = - MatitaGtkMisc.ask_confirmation - ~title:"A .moo can be generated" - ~message:(Printf.sprintf - "%s can be generated for %s.\nShould I generate it?" - (Filename.basename moo_fname) (Filename.basename fname)) - ~parent () - in - let b = - match rc with - | `YES -> true - | `NO -> false - | `CANCEL -> raise MatitaTypes.Cancel - in - if b then - save () - else - clean_current_baseuri grafite_status - end - end - else - clean_current_baseuri grafite_status + in + GrafiteMarshal.save_moo moo_fname + grafite_status.GrafiteTypes.moo_content_rev; + LexiconMarshal.save_lexicon lexicon_fname + lexicon_status.LexiconEngine.lexicon_content_rev + | _ -> clean_current_baseuri grafite_status +;; let ask_unsaved parent = MatitaGtkMisc.ask_confirmation @@ -229,7 +202,8 @@ class interpErrorModel = end -let rec interactive_error_interp ~all_passes (source_buffer:GSourceView.source_buffer) notify_exn offset errorll script_fname +let rec interactive_error_interp ~all_passes + (source_buffer:GSourceView.source_buffer) notify_exn offset errorll filename = (* hook to save a script for each disambiguation error *) if false then @@ -237,7 +211,6 @@ let rec interactive_error_interp ~all_passes (source_buffer:GSourceView.source_b source_buffer#get_text ~start:source_buffer#start_iter ~stop:source_buffer#end_iter () in let md5 = Digest.to_hex (Digest.string text) in - let filename = match script_fname with Some s -> s | None -> "unnamed.ma" in let filename = Filename.chop_extension filename ^ ".error." ^ md5 ^ ".ma" in let ch = open_out filename in @@ -369,7 +342,7 @@ let rec interactive_error_interp ~all_passes (source_buffer:GSourceView.source_b connect_button dialog#disambiguationErrorsMoreErrors (fun _ -> return () ; interactive_error_interp ~all_passes:true source_buffer - notify_exn offset errorll script_fname); + notify_exn offset errorll filename); connect_button dialog#disambiguationErrorsCancelButton fail; dialog#disambiguationErrors#show (); GtkThread.main () @@ -390,8 +363,6 @@ class gui () = let main = new mainWin () in let fileSel = new fileSelectionWin () in let findRepl = new findReplWin () in - let develList = new develListWin () in - let newDevel = new newDevelWin () in let keyBindingBoxes = (* event boxes which should receive global key events *) [ main#mainWinEventBox ] in @@ -414,14 +385,13 @@ class gui () = val mutable chosen_file = None val mutable _ok_not_exists = false val mutable _only_directory = false - val mutable script_fname = None val mutable font_size = default_font_size - val mutable next_devel_must_contain = None val mutable next_ligatures = [] val clipboard = GData.clipboard Gdk.Atom.clipboard val primary = GData.clipboard Gdk.Atom.primary initializer + let s () = MatitaScript.current () in (* glade's check widgets *) List.iter (fun w -> w#check_widgets ()) (let c w = (w :> unit>) in @@ -660,13 +630,11 @@ class gui () = (* interface lockers *) let lock_world _ = main#buttonsToolbar#misc#set_sensitive false; - develList#buttonsHbox#misc#set_sensitive false; main#scriptMenu#misc#set_sensitive false; source_view#set_editable false in let unlock_world _ = main#buttonsToolbar#misc#set_sensitive true; - develList#buttonsHbox#misc#set_sensitive true; main#scriptMenu#misc#set_sensitive true; source_view#set_editable true; (*The next line seems sufficient to avoid some unknown race condition *) @@ -713,8 +681,9 @@ class gui () = with | GrafiteDisambiguator.DisambiguationError (offset,errorll) -> (try - interactive_error_interp ~all_passes:!all_disambiguation_passes source_buffer - notify_exn offset errorll script_fname + interactive_error_interp + ~all_passes:!all_disambiguation_passes source_buffer + notify_exn offset errorll (s())#filename with exc -> notify_exn exc); unlock_world () @@ -750,128 +719,6 @@ class gui () = f (); source_view#misc#grab_focus () with exc -> source_view#misc#grab_focus (); raise exc in - (* developments win *) - let model = - new MatitaGtkMisc.multiStringListModel - ~cols:2 develList#developmentsTreeview - in - let refresh_devels_win () = - model#list_store#clear (); - List.iter - (fun (name, root) -> model#easy_mappend [name;root]) - (MatitamakeLib.list_known_developments ()) - in - let get_devel_selected () = - match model#easy_mselection () with - | [[name;_]] -> MatitamakeLib.development_for_name name - | _ -> None - in - let refresh () = - while Glib.Main.pending () do - ignore(Glib.Main.iteration false); - done - in - connect_button develList#newButton - (fun () -> - next_devel_must_contain <- None; - newDevel#toplevel#misc#show()); - connect_button develList#deleteButton - (locker (fun () -> - (match get_devel_selected () with - | None -> () - | Some d -> MatitamakeLib.destroy_development_in_bg refresh d); - refresh_devels_win ())); - connect_button develList#buildButton - (locker (fun () -> - match get_devel_selected () with - | None -> () - | Some d -> - let build = locker - (fun () -> MatitamakeLib.build_development_in_bg refresh d) - in - ignore(build ()))); - connect_button develList#cleanButton - (locker (fun () -> - match get_devel_selected () with - | None -> () - | Some d -> - let clean = locker - (fun () -> MatitamakeLib.clean_development_in_bg refresh d) - in - ignore(clean ()))); - (* publish button hidden, use command line - connect_button develList#publishButton - (locker (fun () -> - match get_devel_selected () with - | None -> () - | Some d -> - let publish = locker (fun () -> - MatitamakeLib.publish_development_in_bg refresh d) in - ignore(publish ()))); - *) - develList#publishButton#misc#hide (); - connect_button develList#graphButton (fun () -> - match get_devel_selected () with - | None -> () - | Some d -> - (match MatitamakeLib.dot_for_development d with - | None -> () - | Some _ -> - let browser = MatitaMathView.cicBrowser () in - browser#load (`Development - (MatitamakeLib.name_for_development d)))); - connect_button develList#closeButton - (fun () -> develList#toplevel#misc#hide()); - ignore(develList#toplevel#event#connect#delete - (fun _ -> develList#toplevel#misc#hide();true)); - connect_menu_item main#developmentsMenuItem - (fun () -> refresh_devels_win ();develList#toplevel#misc#show ()); - - (* add development win *) - let check_if_root_contains root = - match next_devel_must_contain with - | None -> true - | Some path -> - let is_prefix_of d1 d2 = - let d1 = MatitamakeLib.normalize_path d1 in - let d2 = MatitamakeLib.normalize_path d2 in - let len1 = String.length d1 in - let len2 = String.length d2 in - if len2 < len1 then - false - else - let pref = String.sub d2 0 len1 in - pref = d1 - in - is_prefix_of root path - in - connect_button newDevel#addButton - (fun () -> - let name = newDevel#nameEntry#text in - let root = newDevel#rootEntry#text in - if check_if_root_contains root then - begin - ignore (MatitamakeLib.initialize_development name root); - refresh_devels_win (); - newDevel#nameEntry#set_text ""; - newDevel#rootEntry#set_text ""; - newDevel#toplevel#misc#hide() - end - else - HLog.error ("The selected root does not contain " ^ - match next_devel_must_contain with - | Some x -> x - | _ -> assert false)); - connect_button newDevel#chooseRootButton - (fun () -> - let path = self#chooseDir () in - match path with - | Some path -> newDevel#rootEntry#set_text path - | None -> ()); - connect_button newDevel#cancelButton - (fun () -> newDevel#toplevel#misc#hide ()); - ignore(newDevel#toplevel#event#connect#delete - (fun _ -> newDevel#toplevel#misc#hide();true)); (* file selection win *) ignore (fileSel#fileSelectionWin#event#connect#delete (fun _ -> true)); @@ -952,28 +799,27 @@ class gui () = source_buffer#set_language matita_lang; source_buffer#set_highlight true in - let s () = MatitaScript.current () in let disableSave () = - script_fname <- None; + (s())#assignFileName None; main#saveMenuItem#misc#set_sensitive false in let saveAsScript () = let script = s () in match self#chooseFile ~ok_not_exists:true () with | Some f -> - script#assignFileName f; + HExtlib.touch f; + script#assignFileName (Some f); script#saveToFile (); console#message ("'"^f^"' saved.\n"); self#_enableSaveTo f | None -> () in let saveScript () = - match script_fname with - | None -> saveAsScript () - | Some f -> - (s ())#assignFileName f; - (s ())#saveToFile (); - console#message ("'"^f^"' saved.\n"); + let script = s () in + if script#has_name then + (script#saveToFile (); + console#message ("'"^script#filename^"' saved.\n")) + else saveAsScript () in let abandon_script () = let lexicon_status = (s ())#lexicon_status in @@ -983,11 +829,7 @@ class gui () = | `YES -> saveScript () | `NO -> () | `CANCEL -> raise MatitaTypes.Cancel); - (match script_fname with - | None -> () - | Some fname -> - ask_and_save_moo_if_needed main#toplevel fname - lexicon_status grafite_status); + save_moo lexicon_status grafite_status in let loadScript () = let script = s () in @@ -996,7 +838,7 @@ class gui () = | Some f -> abandon_script (); script#reset (); - script#assignFileName f; + script#assignFileName (Some f); source_view#source_buffer#begin_not_undoable_action (); script#loadFromFile f; source_view#source_buffer#end_not_undoable_action (); @@ -1012,7 +854,7 @@ class gui () = (s ())#template (); source_view#source_buffer#end_not_undoable_action (); disableSave (); - script_fname <- None + (s ())#assignFileName None in let cursor () = source_buffer#place_cursor @@ -1029,38 +871,18 @@ class gui () = let jump = locker (keep_focus jump) in (* quit *) self#setQuitCallback (fun () -> - let lexicon_status = (MatitaScript.current ())#lexicon_status in - let grafite_status = (MatitaScript.current ())#grafite_status in + let script = MatitaScript.current () in if source_view#buffer#modified then - begin - let rc = ask_unsaved main#toplevel in - try - match rc with - | `YES -> saveScript (); - if not source_view#buffer#modified then - begin - (match script_fname with - | None -> () - | Some fname -> - ask_and_save_moo_if_needed main#toplevel - fname lexicon_status grafite_status); - GMain.Main.quit () - end - | `NO -> GMain.Main.quit () - | `CANCEL -> raise MatitaTypes.Cancel - with MatitaTypes.Cancel -> () - end + match ask_unsaved main#toplevel with + | `YES -> + saveScript (); + save_moo script#lexicon_status script#grafite_status; + GMain.Main.quit () + | `NO -> GMain.Main.quit () + | `CANCEL -> () else - begin - (match script_fname with - | None -> clean_current_baseuri grafite_status; GMain.Main.quit () - | Some fname -> - try - ask_and_save_moo_if_needed main#toplevel fname lexicon_status - grafite_status; - GMain.Main.quit () - with MatitaTypes.Cancel -> ()) - end); + (save_moo script#lexicon_status script#grafite_status; + GMain.Main.quit ())); connect_button main#scriptAdvanceButton advance; connect_button main#scriptRetractButton retract; connect_button main#scriptTopButton top; @@ -1248,12 +1070,12 @@ class gui () = ask_text ~gui:self ~title:"External editor" ~msg ~multiline:false ~default:(Helm_registry.get "matita.external_editor") () in *) - let fname = (MatitaScript.current ())#filename in + let script = MatitaScript.current () in + let fname = script#filename in let slice mark = source_buffer#start_iter#get_slice ~stop:(source_buffer#get_iter_at_mark mark) in - let script = MatitaScript.current () in let locked = `MARK script#locked_mark in let string_pos mark = string_of_int (String.length (slice mark)) in let cursor_pos = string_pos `INSERT in @@ -1294,46 +1116,30 @@ class gui () = method loadScript file = let script = MatitaScript.current () in script#reset (); - if Pcre.pmatch ~pat:"\\.p$" file then - begin - let tptppath = - Helm_registry.get_opt_default Helm_registry.string ~default:"./" - "matita.tptppath" - in - let data = Matitaprover.p_to_ma ~filename:file ~tptppath () in - let filename = Pcre.replace ~pat:"\\.p$" ~templ:".ma" file in - script#assignFileName filename; - source_view#source_buffer#begin_not_undoable_action (); - script#loadFromString data; - source_view#source_buffer#end_not_undoable_action (); - console#message ("'"^filename^"' loaded."); - self#_enableSaveTo filename - end - else - begin - script#assignFileName file; - let content = - if Sys.file_exists file then file - else BuildTimeConf.script_template - in - source_view#source_buffer#begin_not_undoable_action (); - script#loadFromFile content; - source_view#source_buffer#end_not_undoable_action (); - console#message ("'"^file^"' loaded."); - self#_enableSaveTo file - end + script#assignFileName (Some file); + let file = script#filename in + let content = + if Sys.file_exists file then file + else BuildTimeConf.script_template + in + source_view#source_buffer#begin_not_undoable_action (); + script#loadFromFile content; + source_view#source_buffer#end_not_undoable_action (); + console#message ("'"^file^"' loaded."); + self#_enableSaveTo file - method setStar name b = + method setStar b = + let s = MatitaScript.current () in let w = main#toplevel in let set x = w#set_title x in - let name = "Matita - " ^ name in - if b then - set (name ^ " *") - else - set (name) + let name = + "Matita - " ^ Filename.basename s#filename ^ + (if b then "*" else "") ^ + " in " ^ s#buri_of_current_file + in + set name method private _enableSaveTo file = - script_fname <- Some file; self#main#saveMenuItem#misc#set_sensitive true method console = console @@ -1342,8 +1148,6 @@ class gui () = method fileSel = fileSel method findRepl = findRepl method main = main - method develList = develList - method newDevel = newDevel method newBrowserWin () = object (self) @@ -1397,10 +1201,6 @@ class gui () = (* we should check that this is a directory *) chosen_file - method createDevelopment ~containing = - next_devel_must_contain <- containing; - newDevel#toplevel#misc#show() - method askText ?(title = "") ?(msg = "") () = let dialog = new textDialog () in dialog#textDialog#set_title title; diff --git a/helm/software/matita/matitaGuiTypes.mli b/helm/software/matita/matitaGuiTypes.mli index 67d431040..c9ef86123 100644 --- a/helm/software/matita/matitaGuiTypes.mli +++ b/helm/software/matita/matitaGuiTypes.mli @@ -49,8 +49,6 @@ object method fileSel : MatitaGeneratedGui.fileSelectionWin method main : MatitaGeneratedGui.mainWin method findRepl : MatitaGeneratedGui.findReplWin - method develList: MatitaGeneratedGui.develListWin - method newDevel: MatitaGeneratedGui.newDevelWin (* method toolbar : MatitaGeneratedGui.toolBarWin *) method console: console @@ -87,13 +85,12 @@ object * @param ok_not_exists if set to true returns also non existent files * (useful for save). Defaults to false *) method chooseFile: ?ok_not_exists:bool -> unit -> string option - method createDevelopment: containing:string option -> unit (** prompt the user for a (multiline) text entry *) method askText: ?title:string -> ?msg:string -> unit -> string option method loadScript: string -> unit - method setStar: string -> bool -> unit + method setStar: bool -> unit (** {3 Fonts} *) method increaseFontSize: unit -> unit diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml index 8f3071334..cf96c5ba1 100644 --- a/helm/software/matita/matitaInit.ml +++ b/helm/software/matita/matitaInit.ml @@ -26,7 +26,7 @@ (* $Id$ *) type thingsToInitilaize = - ConfigurationFile | Db | Environment | Getter | Makelib | CmdLine | Registry + ConfigurationFile | Db | Environment | Getter | CmdLine | Registry exception FailedToInitialize of thingsToInitilaize @@ -45,16 +45,13 @@ let conffile = ref BuildTimeConf.matita_conf let registry_defaults = [ "matita.debug", "false"; "matita.external_editor", "gvim -f -c 'go %p' %f"; - "matita.preserve", "false"; "matita.profile", "true"; "matita.system", "false"; - "matita.verbosity", "1"; - "matita.bench", "false"; + "matita.verbose", "false"; "matita.paste_unicode_as_tex", "false"; "matita.noinnertypes", "false"; "matita.do_heavy_checks", "true"; - (** verbosity level: 1 is the default, 0 is intuitively "quiet", > 1 is - * intuitively verbose *) + "matita.moo", "true"; ] let set_registry_values = @@ -105,16 +102,6 @@ let initialize_db init_status = else init_status -let initialize_makelib init_status = - wants [ConfigurationFile] init_status; - if not (already_configured [Makelib] init_status) then - begin - MatitamakeLib.initialize (); - Makelib::init_status - end - else - init_status - let initialize_environment init_status = wants [CmdLine] init_status; if not (already_configured [Getter;Environment] init_status) then @@ -139,76 +126,29 @@ let _ = List.iter (fun (name, s) -> Hashtbl.replace usages name s) [ "matitac", - Printf.sprintf "MatitaC v%s + Printf.sprintf "Matita batch compiler v%s Usage: matitac [ OPTION ... ] FILE Options:" BuildTimeConf.version; - "gragrep", - Printf.sprintf "Grafite Grep v%s -Usage: gragrep [ -r ] PATH -Options:" - BuildTimeConf.version; - "matitaprover", - Printf.sprintf "Matita's prover v%s + "matitaprover", + Printf.sprintf "Matita (TPTP) prover v%s Usage: matitaprover [ -tptppath ] FILE.p Options:" BuildTimeConf.version; "matita", - Printf.sprintf "Matita v%s -Usage: matita [ OPTION ... ] [ FILE ... ] -Options:" - BuildTimeConf.version; - "cicbrowser", - Printf.sprintf - "CIC Browser v%s -Usage: cicbrowser [ URL | WHELP QUERY ] + Printf.sprintf "Matita interactive theorem prover v%s +Usage: matita [ OPTION ... ] [ FILE ] Options:" BuildTimeConf.version; "matitadep", - Printf.sprintf "MatitaDep v%s -Usage: matitadep [ OPTION ... ] FILE ... + Printf.sprintf "Matita depency file generator v%s +Usage: matitadep [ OPTION ... ] Options:" BuildTimeConf.version; "matitaclean", Printf.sprintf "MatitaClean v%s Usage: matitaclean all - matitaclean [ (FILE | URI) ... ] -Options:" - BuildTimeConf.version; - "matitamake", - Printf.sprintf "MatitaMake v%s -Usage: matitamake [ OPTION ... ] (init | clean | list | destroy | build) - init - Parameters: name (the name of the development, required) - root (the directory in which the delopment is rooted, - optional, default is current working directory) - Description: tells matitamake that a new development radicated - in the current working directory should be handled. - clean - Parameters: name (the name of the development to destroy, optional) - If omitted the development that holds the current working - directory is used (if any). - Description: clean the develpoment. - list - Parameters: - Description: lists the known developments and their roots. - destroy - Parameters: name (the name of the development to destroy, required) - Description: deletes a development (only from matitamake metadat, no - .ma files will be deleted). - build - Parameters: name (the name of the development to build, required) - Description: completely builds the develpoment. - publish - Parameters: name (the name of the development to publish, required) - Description: cleans the development in the user space, rebuilds it - in the system space ('ro' repositories, that for this operation - becames writable). -Notes: - If target is omitted an 'all' will be used as the default. - With -build you can build a development wherever it is. - If you specify a target it implicitly refers to the development that - holds the current working directory (if any). + matitaclean ( FILE | URI ) Options:" BuildTimeConf.version; ] @@ -222,6 +162,65 @@ let usage () = try Filename.chop_extension basename with Invalid_argument _ -> basename in try Hashtbl.find usages usage_key with Not_found -> default_usage +;; + +let dump f = + let module G = GrafiteAst in + let module L = LexiconAst in + let module H = HExtlib in + Helm_registry.set_bool "matita.moo" false; + let floc = H.dummy_floc in + let nl_ast = G.Comment (floc, G.Note (floc, "")) in + let och = open_out f in + let atexit () = close_out och in + let out_comment och s = + let s = if s <> "" && s.[0] = '*' then "#" ^ s else s in + Printf.fprintf och "%s%s%s\n\n" "(*" s "*)" + in + let out_line_comment och s = + let l = 70 - String.length s in + let s = Printf.sprintf " %s %s" s (String.make l '*') in + out_comment och s + in + let out_preamble och (path, lines) = + let ich = open_in path in + let rec print i = + if i > 0 then + let s = input_line ich in + begin Printf.fprintf och "%s\n" s; print (pred i) end + in + print lines; + out_line_comment och "This file was automatically generated: do not edit" + in + let pp_ast_statement st = + GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term + ~map_unicode_to_tex:(Helm_registry.get_bool + "matita.paste_unicode_as_tex") + ~lazy_term_pp:CicNotationPp.pp_term + ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) st + in + let nl () = output_string och (pp_ast_statement nl_ast) in + let rt_base_dir = Filename.dirname Sys.argv.(0) in + let path = Filename.concat rt_base_dir "matita.ma.templ" in + let lines = 14 in + out_preamble och (path, lines); + let grafite_parser_cb fname = + let ast = G.Executable + (floc, G.Command (floc, G.Include (floc, fname))) in + output_string och (pp_ast_statement ast); nl (); nl () + in + let matita_engine_cb = function + | G.Executable (_, G.Macro (_, G.Inline _)) + | G.Executable (_, G.Command (_, G.Include _)) -> () + | ast -> + output_string och (pp_ast_statement ast); nl (); nl () + in + let matitac_lib_cb = output_string och in + GrafiteParser.set_callback grafite_parser_cb; + MatitaEngine.set_callback matita_engine_cb; + MatitacLib.set_callback matitac_lib_cb; + at_exit atexit +;; let extra_cmdline_specs = ref [] let add_cmdline_spec l = extra_cmdline_specs := l @ !extra_cmdline_specs @@ -231,27 +230,27 @@ let parse_cmdline init_status = wants [Registry] init_status; let includes = ref [] in let default_includes = [ - "."; BuildTimeConf.stdlib_dir_devel; BuildTimeConf.stdlib_dir_installed ; ] in let absolutize s = - if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd() ^"/"^s + if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd () ^"/"^s in let args = ref [] in let add_l l = fun s -> l := s :: !l in - let reduce_verbosity () = - Helm_registry.set_int "matita.verbosity" - (Helm_registry.get_int "matita.verbosity" - 1) in let print_version () = Printf.printf "%s\n" BuildTimeConf.version;exit 0 in - let increase_verbosity () = - Helm_registry.set_int "matita.verbosity" - (Helm_registry.get_int "matita.verbosity" + 1) in let no_innertypes () = Helm_registry.set_bool "matita.noinnertypes" true in + let set_baseuri s = + match Str.split (Str.regexp "::") s with + | [path; uri] -> Helm_registry.set "matita.baseuri" + (HExtlib.normalize_path (absolutize path)^" "^uri) + | _ -> raise (Failure "bad baseuri, use -b 'path::uri'") + in let arg_spec = let std_arg_spec = [ + "-b", Arg.String set_baseuri, " forces the baseuri of path"; "-I", Arg.String (add_l includes), (" Adds path to the list of searched paths for the " ^ "include command"); @@ -270,18 +269,15 @@ let parse_cmdline init_status = "-profile-only", Arg.String (fun rex -> Helm_registry.set "matita.profile_only" rex), "Activates only profiler with label matching the provided regex"; - "-bench", - Arg.Unit (fun () -> Helm_registry.set_bool "matita.bench" true), - "Turns on parsable output on stdout, that is timings for matitac..."; - "-preserve", - Arg.Unit (fun () -> Helm_registry.set_bool "matita.preserve" true), - "Turns off automatic baseuri cleaning"; - "-q", Arg.Unit reduce_verbosity, "Reduce verbosity"; "-system", Arg.Unit (fun () -> Helm_registry.set_bool "matita.system" true), ("Act on the system library instead of the user one" ^ "\n WARNING: not for the casual user"); - "-v", Arg.Unit increase_verbosity, "Increase verbosity"; + "-dump", Arg.String dump, + " Dump with expanded macros to "; + "-v", + Arg.Unit (fun () -> Helm_registry.set_bool "matita.verbose" true), + "Verbose mode"; "--version", Arg.Unit print_version, "Prints version"; ] in let debug_arg_spec = @@ -303,7 +299,9 @@ let parse_cmdline init_status = in Arg.parse arg_spec (add_l args) (usage ()); let includes = - List.map absolutize ((List.rev !includes) @ default_includes) in + List.map (fun x -> HExtlib.normalize_path (absolutize x)) + ((List.rev !includes) @ default_includes) + in set_list ~key:"matita.includes" includes; let args = List.rev (List.filter (fun x -> x <> "") !args) in set_list ~key:"matita.args" args; @@ -326,18 +324,12 @@ let conf_components = [ load_configuration; fill_registry; parse_cmdline] let other_components = - [ initialize_makelib; initialize_db; initialize_environment ] + [ initialize_db; initialize_environment ] let initialize_all () = status := List.fold_left (fun s f -> f s) !status (conf_components @ other_components) -(* initialize_notation - (initialize_environment - (initialize_db - (initialize_makelib - (load_configuration - (parse_cmdline !status))))) *) let parse_cmdline_and_configuration_file () = status := List.fold_left (fun s f -> f s) !status conf_components diff --git a/helm/software/matita/matitaMathView.ml b/helm/software/matita/matitaMathView.ml index 23f57820d..ff79f54ed 100644 --- a/helm/software/matita/matitaMathView.ml +++ b/helm/software/matita/matitaMathView.ml @@ -904,10 +904,6 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) ignore (win#toplevel#event#connect#delete (fun _ -> let my_id = Oo.id self in cicBrowsers := List.filter (fun b -> Oo.id b <> my_id) !cicBrowsers; - if !cicBrowsers = [] && - Helm_registry.get "matita.mode" = "cicbrowser" - then - GMain.quit (); false)); ignore(win#whelpResultTreeview#connect#row_activated ~callback:(fun _ _ -> @@ -1045,7 +1041,6 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) | `About `Coercions -> self#coerchgraph true () | `Check term -> self#_loadCheck term | `Cic (term, metasenv) -> self#_loadTermCic term metasenv - | `Development d -> self#_showDevelDeps d | `Dir dir -> self#_loadDir dir | `HBugs `Tutors -> self#_loadHBugsTutors | `Metadata (`Deps ((`Fwd | `Back) as dir, uri)) -> @@ -1136,16 +1131,6 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) win#browserUri#entry#set_text (MatitaTypes.string_of_entry entry); current_entry <- entry - method private _showDevelDeps d = - match MatitamakeLib.development_for_name d with - | None -> () - | Some devel -> - (match MatitamakeLib.dot_for_development devel with - | None -> () - | Some fname -> - gviz#load_graph_from_file ~gviz_cmd:"tred | dot" fname; - self#_showGviz) - method private _loadObj obj = (* showMath must be done _before_ loading the document, since if the * widget is not mapped (hidden by the notebook) the document is not diff --git a/helm/software/matita/matitaMisc.ml b/helm/software/matita/matitaMisc.ml index bb745f703..211295261 100644 --- a/helm/software/matita/matitaMisc.ml +++ b/helm/software/matita/matitaMisc.ml @@ -156,6 +156,8 @@ let list_tl_at ?(equality=(==)) e l = let shutup () = HLog.set_log_callback (fun _ _ -> ()); +(* let out = open_out "/dev/null" in Unix.dup2 (Unix.descr_of_out_channel out) (Unix.descr_of_out_channel stderr) +*) diff --git a/helm/software/matita/matitaScript.ml b/helm/software/matita/matitaScript.ml index 8ec2a4948..828002a8b 100644 --- a/helm/software/matita/matitaScript.ml +++ b/helm/software/matita/matitaScript.ml @@ -69,11 +69,9 @@ type guistuff = { mathviewer:MatitaTypes.mathViewer; urichooser: UriManager.uri list -> UriManager.uri list; ask_confirmation: title:string -> message:string -> [`YES | `NO | `CANCEL]; - develcreator: containing:string option -> unit; - mutable filenamedata: string option * MatitamakeLib.development option } -let eval_with_engine guistuff lexicon_status grafite_status user_goal +let eval_with_engine include_paths guistuff lexicon_status grafite_status user_goal skipped_txt nonskipped_txt st = let module TAPp = GrafiteAstPp in @@ -102,83 +100,48 @@ let eval_with_engine guistuff lexicon_status grafite_status user_goal ([],skipped_txt) enriched_history_fragment in res,"",parsed_text_length +;; -let wrap_with_developments guistuff f arg = - let compile_needed_and_go_on lexiconfile d exc = - let target = Pcre.replace ~pat:"lexicon$" ~templ:"moo" lexiconfile in - let target = Pcre.replace ~pat:"metadata$" ~templ:"moo" target in - let refresh_cb () = - while Glib.Main.pending () do ignore(Glib.Main.iteration false); done - in - if not(MatitamakeLib.build_development_in_bg ~target refresh_cb d) then - raise exc - else - f arg - in - let do_nothing () = raise (ActionCancelled "Inclusion not performed") in - let check_if_file_is_exists f = - assert(Pcre.pmatch ~pat:"ma$" f); - let pwd = Sys.getcwd () in - let f_pwd = pwd ^ "/" ^ f in - if not (HExtlib.is_regular f_pwd) then - raise (ActionCancelled ("File "^f_pwd^" does not exists!")) - else - raise - (ActionCancelled - ("Internal error: "^f_pwd^" exists but I'm unable to include it!")) - in - let handle_with_devel d lexiconfile mafile exc = - let name = MatitamakeLib.name_for_development d in - let title = "Unable to include " ^ lexiconfile in - let message = - mafile ^ " is handled by development " ^ name ^ ".\n\n" ^ - "Should I compile it and Its dependencies?" - in - (match guistuff.ask_confirmation ~title ~message with - | `YES -> compile_needed_and_go_on lexiconfile d exc - | `NO -> raise exc - | `CANCEL -> do_nothing ()) - in - let handle_without_devel mafilename exc = - let title = "Unable to include " ^ mafilename in - let message = - mafilename ^ " is not handled by a development.\n" ^ - "All dependencies are automatically solved for a development.\n\n" ^ - "Do you want to set up a development?" - in - (match guistuff.ask_confirmation ~title ~message with - | `YES -> - guistuff.develcreator ~containing:(Some (Filename.dirname mafilename)); - do_nothing () - | `NO -> raise exc - | `CANCEL -> do_nothing()) - in - try - f arg +(* this function calls the parser in a way that it does not perform inclusions, + * so that we can ensure the inclusion is performed after the included file + * is compiled (if needed). matitac does not need that, since it compiles files + * in the good order, here files may be compiled on demand. *) +let wrap_with_make include_paths (f : GrafiteParser.statement) x = + try + f ~never_include:true ~include_paths x with - | DependenciesParser.UnableToInclude mafilename -> - assert (Pcre.pmatch ~pat:"ma$" mafilename); - check_if_file_is_exists mafilename - | LexiconEngine.IncludedFileNotCompiled (xfilename,mafilename) - | GrafiteEngine.IncludedFileNotCompiled (xfilename,mafilename) as exn -> - assert (Pcre.pmatch ~pat:"ma$" mafilename); - assert (Pcre.pmatch ~pat:"lexicon$" xfilename || - Pcre.pmatch ~pat:"mo$" xfilename ); - (* we know that someone was able to include the .ma, get the baseuri - * but was unable to get the compilation output 'xfilename' *) - match MatitamakeLib.development_for_dir (Filename.dirname mafilename) with - | None -> handle_without_devel mafilename exn - | Some d -> handle_with_devel d xfilename mafilename exn -;; - -let eval_with_engine - guistuff lexicon_status grafite_status user_goal - skipped_txt nonskipped_txt st -= - wrap_with_developments guistuff - (eval_with_engine - guistuff lexicon_status grafite_status user_goal - skipped_txt nonskipped_txt) st + | GrafiteParser.NoInclusionPerformed mafilename -> + let root, buri, _, tgt = + try Librarian.baseuri_of_script ~include_paths mafilename + with Librarian.NoRootFor _ -> + HLog.error ("The included file '"^mafilename^"' has no root file,"); + HLog.error "please create it."; + raise (Failure ("No root file for "^mafilename)) + in + let initial_lexicon_status = + CicNotation2.load_notation ~include_paths:[] BuildTimeConf.core_notation_script + in + let b,x = + try + GrafiteSync.push (); + LexiconSync.time_travel ~present:x ~past:initial_lexicon_status; + let rc = MatitacLib.Make.make root [tgt] in + GrafiteSync.pop (); + CicNotation.reset (); + ignore(CicNotation2.load_notation ~include_paths:[] + BuildTimeConf.core_notation_script); + let x = List.fold_left (fun s c -> LexiconEngine.eval_command s c) + initial_lexicon_status (List.rev + x.LexiconEngine.lexicon_content_rev) + in + rc,x + with + | exn -> + HLog.error ("Unexpected " ^ snd(MatitaExcPp.to_string exn)); + assert false + in + if b then f ~include_paths x + else raise (Failure ("Compiling: " ^ tgt)) ;; let pp_eager_statement_ast = @@ -637,29 +600,10 @@ script ex loc let module MD = GrafiteDisambiguator in let module ML = MatitaMisc in try - begin - match ex with - | TA.Command (_,TA.Set (_,"baseuri",u)) -> - if Http_getter_storage.is_read_only u then - raise (ActionCancelled ("baseuri " ^ u ^ " is readonly")); - if not (Http_getter_storage.is_empty ~local:true u) then - (match - guistuff.ask_confirmation - ~title:"Baseuri redefinition" - ~message:( - "Baseuri " ^ u ^ " already exists.\n" ^ - "Do you want to redefine the corresponding "^ - "part of the library?") - with - | `YES -> LibraryClean.clean_baseuris [u] - | `NO -> () - | `CANCEL -> raise MatitaTypes.Cancel) - | _ -> () - end; ignore (buffer#move_mark (`NAME "beginning_of_statement") ~where:((buffer#get_iter_at_mark (`NAME "locked"))#forward_chars (Glib.Utf8.length skipped_txt))) ; - eval_with_engine + eval_with_engine include_paths guistuff lexicon_status grafite_status user_goal skipped_txt nonskipped_txt (TA.Executable (loc, ex)) with @@ -681,9 +625,8 @@ and eval_statement include_paths (buffer : GText.buffer) guistuff lexicon_status | `Raw text -> if Pcre.pmatch ~rex:only_dust_RE text then raise Margin; let ast = - wrap_with_developments guistuff - (GrafiteParser.parse_statement - (Ulexing.from_utf8_string text) ~include_paths) lexicon_status + wrap_with_make include_paths + (GrafiteParser.parse_statement (Ulexing.from_utf8_string text)) lexicon_status in ast, text | `Ast (st, text) -> (lexicon_status, st), text @@ -740,52 +683,81 @@ class script ~(source_view: GSourceView.source_view) ~set_star ~ask_confirmation ~urichooser - ~develcreator () = let buffer = source_view#buffer in let source_buffer = source_view#source_buffer in -let initial_statuses () = - (* these include_paths are used only to load the initial notation *) - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in +let initial_statuses baseuri = let lexicon_status = - CicNotation2.load_notation ~include_paths - BuildTimeConf.core_notation_script in - let grafite_status = GrafiteSync.init () in + CicNotation2.load_notation ~include_paths:[] + BuildTimeConf.core_notation_script + in + let grafite_status = GrafiteSync.init baseuri in grafite_status,lexicon_status in +let read_include_paths file = + try + let root, _buri, _fname, _tgt = + Librarian.baseuri_of_script ~include_paths:[] file + in + let rc = + Str.split (Str.regexp " ") + (List.assoc "include_paths" (Librarian.load_root_file (root^"/root"))) + in + List.iter (HLog.debug) rc; rc + with Librarian.NoRootFor _ | Not_found -> [] +in +let default_buri = "cic:/matita/tests" in +let default_fname = ".unnamed.ma" in object (self) - val mutable include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" + val mutable include_paths_ = [] val scriptId = fresh_script_id () - + val guistuff = { mathviewer = mathviewer; urichooser = urichooser; ask_confirmation = ask_confirmation; - develcreator = develcreator; - filenamedata = (None, None)} - - method private getFilename = - match guistuff.filenamedata with Some f,_ -> f | _ -> assert false + } - method filename = self#getFilename - - method private ppFilename = - match guistuff.filenamedata with - | Some f,_ -> f - | None,_ -> sprintf ".unnamed%d.ma" scriptId + val mutable filename_ = (None : string option) + + method has_name = filename_ <> None + method include_paths = + include_paths_ @ + Helm_registry.get_list Helm_registry.string "matita.includes" + + method private curdir = + try + let root, _buri, _fname, _tgt = + Librarian.baseuri_of_script ~include_paths:self#include_paths + self#filename + in + root + with Librarian.NoRootFor _ -> Sys.getcwd () + + method buri_of_current_file = + match filename_ with + | None -> default_buri + | Some f -> + try + let _root, buri, _fname, _tgt = + Librarian.baseuri_of_script ~include_paths:self#include_paths f + in + buri + with Librarian.NoRootFor _ -> default_buri + + method filename = match filename_ with None -> default_fname | Some f -> f + initializer ignore (GMain.Timeout.add ~ms:300000 ~callback:(fun _ -> self#_saveToBackupFile ();true)); ignore (buffer#connect#modified_changed - (fun _ -> set_star (Filename.basename self#ppFilename) buffer#modified)) + (fun _ -> set_star buffer#modified)) val mutable statements = [] (** executed statements *) - val mutable history = [ initial_statuses () ] + val mutable history = [ initial_statuses default_buri ] (** list of states before having executed statements. Head element of this * list is the current state, last element is the state at the beginning of * the script. @@ -814,10 +786,11 @@ object (self) method private _advance ?statement () = let s = match statement with Some s -> s | None -> self#getFuture in + if self#bos then LibraryClean.clean_baseuris [self#buri_of_current_file]; HLog.debug ("evaluating: " ^ first_line s ^ " ..."); let entries, newtext, parsed_len = try - eval_statement include_paths buffer guistuff self#lexicon_status + eval_statement self#include_paths buffer guistuff self#lexicon_status self#grafite_status userGoal self (`Raw s) with End_of_file -> raise Margin in @@ -942,32 +915,36 @@ object (self) buffer#set_text (HExtlib.input_file f); self#reset_buffer; buffer#set_modified false - + method assignFileName file = - let abspath = MatitaMisc.absolute_path file in - let dirname = Filename.dirname abspath in - let devel = MatitamakeLib.development_for_dir dirname in - guistuff.filenamedata <- Some abspath, devel; - let include_ = - match MatitamakeLib.development_for_dir dirname with - None -> [] - | Some devel -> [MatitamakeLib.root_for_development devel] in - let include_ = - include_ @ (Helm_registry.get_list Helm_registry.string "matita.includes") + let file = + match file with + | Some f -> Some (Librarian.absolutize f) + | None -> None in - include_paths <- include_ + self#goto_top; + filename_ <- file; + include_paths_ <- + (match file with Some file -> read_include_paths file | None -> []); + self#reset_buffer; + Sys.chdir self#curdir; + HLog.debug ("Moving to " ^ Sys.getcwd ()) method saveToFile () = - let oc = open_out self#getFilename in - output_string oc (buffer#get_text ~start:buffer#start_iter + if self#has_name then + let oc = open_out self#filename in + output_string oc (buffer#get_text ~start:buffer#start_iter ~stop:buffer#end_iter ()); - close_out oc; - buffer#set_modified false + close_out oc; + set_star false; + buffer#set_modified false + else + HLog.error "Can't save, no filename selected" method private _saveToBackupFile () = if buffer#modified then begin - let f = self#ppFilename ^ "~" in + let f = self#filename in let oc = open_out f in output_string oc (buffer#get_text ~start:buffer#start_iter ~stop:buffer#end_iter ()); @@ -990,7 +967,7 @@ object (self) method private reset_buffer = statements <- []; - history <- [ initial_statuses () ]; + history <- [ initial_statuses self#buri_of_current_file ]; userGoal <- None; self#notify; buffer#remove_tag locked_tag ~start:buffer#start_iter ~stop:buffer#end_iter; @@ -1006,19 +983,8 @@ object (self) method template () = let template = HExtlib.input_file BuildTimeConf.script_template in buffer#insert ~iter:(buffer#get_iter `START) template; - let development = MatitamakeLib.development_for_dir (Unix.getcwd ()) in - guistuff.filenamedata <- (None,development); - let include_ = - match development with - None -> [] - | Some devel -> [MatitamakeLib.root_for_development devel ] - in - let include_ = - include_ @ (Helm_registry.get_list Helm_registry.string "matita.includes") - in - include_paths <- include_ ; - buffer#set_modified false; - set_star (Filename.basename self#ppFilename) false + buffer#set_modified false; + set_star false method goto (pos: [`Top | `Bottom | `Cursor]) () = try @@ -1128,12 +1094,17 @@ object (self) method setGoal n = userGoal <- n method goal = userGoal + method bos = + match history with + | _::[] -> true + | _ -> false + method eos = let rec is_there_only_comments lexicon_status s = if Pcre.pmatch ~rex:only_dust_RE s then raise Margin; let lexicon_status,st = GrafiteParser.parse_statement (Ulexing.from_utf8_string s) - ~include_paths lexicon_status + ~include_paths:self#include_paths lexicon_status in match st with | GrafiteParser.LSome (GrafiteAst.Comment (loc,_)) -> @@ -1162,19 +1133,15 @@ prerr_endline ("## " ^ string_of_int parsed_text_length); HLog.debug ("history size: " ^ string_of_int (List.length history)); HLog.debug (sprintf "%d statements:" (List.length statements)); List.iter HLog.debug statements; - HLog.debug ("Current file name: " ^ - (match guistuff.filenamedata with - |None,_ -> "[ no name ]" - | Some f,_ -> f)); - + HLog.debug ("Current file name: " ^ self#filename); end let _script = ref None -let script ~source_view ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star () +let script ~source_view ~mathviewer ~urichooser ~ask_confirmation ~set_star () = let s = new script - ~source_view ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () + ~source_view ~mathviewer ~ask_confirmation ~urichooser ~set_star () in _script := Some s; s diff --git a/helm/software/matita/matitaScript.mli b/helm/software/matita/matitaScript.mli index b0a022683..3d9e8fba7 100644 --- a/helm/software/matita/matitaScript.mli +++ b/helm/software/matita/matitaScript.mli @@ -33,7 +33,7 @@ object method locked_tag : GText.tag method error_tag : GText.tag - (** @return current status *) + (** @return current status *) method lexicon_status: LexiconEngine.status method grafite_status: GrafiteTypes.status @@ -51,8 +51,13 @@ object method template: unit -> unit (** {2 Load/save} *) - - method assignFileName : string -> unit (* to the current active file *) + + method has_name: bool + (* alwais return a name, use has_name to check if it is the default one *) + method filename: string + method buri_of_current_file: string + method include_paths: string list + method assignFileName : string option -> unit (* to the current active file *) method loadFromFile : string -> unit method loadFromString : string -> unit method saveToFile : unit -> unit @@ -63,7 +68,6 @@ object (** @return true if there is an ongoing proof, false otherise *) method onGoingProof: unit -> bool -(* method proofStatus: ProofEngineTypes.status |+* @raise Statement_error +| *) method proofMetasenv: Cic.metasenv (** @raise Statement_error *) method proofContext: Cic.context (** @raise Statement_error *) method proofConclusion: Cic.term (** @raise Statement_error *) @@ -74,6 +78,7 @@ object (** end of script, true if the whole script has been executed *) method eos: bool + method bos: bool (** misc *) method clean_dirty_lock: unit @@ -89,10 +94,9 @@ val script: source_view:GSourceView.source_view -> mathviewer: MatitaTypes.mathViewer-> urichooser: (UriManager.uri list -> UriManager.uri list) -> - develcreator: (containing:string option -> unit) -> ask_confirmation: (title:string -> message:string -> [`YES | `NO | `CANCEL]) -> - set_star: (string -> bool -> unit) -> + set_star: (bool -> unit) -> unit -> script diff --git a/helm/software/matita/matitaTypes.ml b/helm/software/matita/matitaTypes.ml index 23d0d832f..0c8952e89 100644 --- a/helm/software/matita/matitaTypes.ml +++ b/helm/software/matita/matitaTypes.ml @@ -43,7 +43,6 @@ type mathViewer_entry = [ `About of abouts (* current proof *) | `Check of string (* term *) | `Cic of Cic.term * Cic.metasenv - | `Development of string | `Dir of string (* "directory" in cic uris namespace *) | `HBugs of [ `Tutors ] (* list of available HBugs tutors *) | `Metadata of [ `Deps of [`Fwd | `Back] * UriManager.uri ] @@ -59,7 +58,6 @@ let string_of_entry = function | `About `CoercionsFull -> "about:coercions" | `Check _ -> "check:" | `Cic (_, _) -> "term:" - | `Development d -> "devel:/" ^ d | `Dir uri -> uri | `HBugs `Tutors -> "hbugs:/tutors/" | `Metadata meta -> diff --git a/helm/software/matita/matitaTypes.mli b/helm/software/matita/matitaTypes.mli index c71c99dcc..67655c921 100644 --- a/helm/software/matita/matitaTypes.mli +++ b/helm/software/matita/matitaTypes.mli @@ -31,7 +31,6 @@ type mathViewer_entry = [ `About of abouts | `Check of string | `Cic of Cic.term * Cic.metasenv - | `Development of string | `Dir of string | `HBugs of [ `Tutors ] | `Metadata of [ `Deps of [`Fwd | `Back] * UriManager.uri ] diff --git a/helm/software/matita/matitaWiki.ml b/helm/software/matita/matitaWiki.ml index 3c5607bd7..87e9a4417 100644 --- a/helm/software/matita/matitaWiki.ml +++ b/helm/software/matita/matitaWiki.ml @@ -66,13 +66,9 @@ let clean_exit n = match !grafite_status with [] -> exit n | grafite_status::_ -> - try - let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in + let baseuri = GrafiteTypes.get_baseuri grafite_status in LibraryClean.clean_baseuris ~verbose:false [baseuri]; exit n - with GrafiteTypes.Option_error("baseuri", "not found") -> - (* no baseuri ==> nothing to clean yet *) - exit n let terminate n = let terminator = String.make 1 (Char.chr 249) in @@ -174,7 +170,7 @@ let rec interactive_loop () = | _ -> () in run_script str - (MatitaEngine.eval_from_stream ~first_statement_only:true ~prompt:false + (MatitaEngine.eval_from_stream ~first_statement_only:true ~include_paths:(Lazy.force include_paths) ~watch_statuses) ; interactive_loop (Some (List.length !lexicon_status)) with @@ -209,10 +205,9 @@ let main () = ); (* must be called after init since args are set by cmdline parsing *) let system_mode = Helm_registry.get_bool "matita.system" in - Helm_registry.set_int "matita.verbosity" 0; let include_paths = Helm_registry.get_list Helm_registry.string "matita.includes" in - grafite_status := [GrafiteSync.init ()]; + grafite_status := [GrafiteSync.init "cic:/matita/tests/"]; lexicon_status := [CicNotation2.load_notation ~include_paths BuildTimeConf.core_notation_script] ; @@ -249,10 +244,11 @@ let main () = else begin let baseuri = - GrafiteTypes.get_string_option - (match !grafite_status with + GrafiteTypes.get_baseuri + (match !grafite_status with [] -> assert false - | s::_ -> s) "baseuri" in + | s::_ -> s) + in let moo_fname = LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri ~writable:true diff --git a/helm/software/matita/matitac.ml b/helm/software/matita/matitac.ml index 179a0ba8e..5d0ed9a35 100644 --- a/helm/software/matita/matitac.ml +++ b/helm/software/matita/matitac.ml @@ -25,86 +25,48 @@ (* $Id$ *) -module G = GrafiteAst -module L = LexiconAst -module H = HExtlib +(* compiler ala pascal/java using make *) +let main_compiler () = + MatitaInit.initialize_all (); + (* targets and deps *) + let targets = Helm_registry.get_list Helm_registry.string "matita.args" in + let target, root = + match targets with + | [] -> + (match Librarian.find_roots_in_dir (Sys.getcwd ()) with + | [x] -> [], Filename.dirname x + | [] -> + prerr_endline "No targets and no root found"; exit 1 + | roots -> + let roots = List.map (HExtlib.chop_prefix (Sys.getcwd()^"/")) roots in + prerr_endline ("Too many roots found:\n\t" ^ String.concat "\n\t" roots); + prerr_endline ("\nEnter one of these directories and retry"); + exit 1); + | [hd] -> + let root, buri, file, target = + Librarian.baseuri_of_script ~include_paths:[] hd + in + [target], root + | _ -> prerr_endline "Only one target (or none) can be specified.";exit 1 + in + (* must be called after init since args are set by cmdline parsing *) + let system_mode = Helm_registry.get_bool "matita.system" in + if system_mode then HLog.message "Compiling in system space"; + (* here we go *) + if not (Helm_registry.get_bool "matita.verbose") then MatitaMisc.shutup (); + if MatitacLib.Make.make root target then + HLog.message "Compilation successful" + else + HLog.message "Compilation failed" +;; -(* from transcript *) - -let out_comment och s = - let s = if s <> "" && s.[0] = '*' then "#" ^ s else s in - Printf.fprintf och "%s%s%s\n\n" "(*" s "*)" - -let out_line_comment och s = - let l = 70 - String.length s in - let s = Printf.sprintf " %s %s" s (String.make l '*') in - out_comment och s - -let out_preamble och (path, lines) = - let ich = open_in path in - let rec print i = - if i > 0 then - let s = input_line ich in - begin Printf.fprintf och "%s\n" s; print (pred i) end - in - print lines; - out_line_comment och "This file was automatically generated: do not edit" - -(* from matitacLib *) - -let pp_ast_statement st = - GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) st - -(**) - -let dump f = - Helm_registry.set_bool "matita.moo" false; - let floc = H.dummy_floc in - let nl_ast = G.Comment (floc, G.Note (floc, "")) in - let och = open_out f in - let atexit () = close_out och in - let nl () = output_string och (pp_ast_statement nl_ast) in - let rt_base_dir = Filename.dirname Sys.argv.(0) in - let path = Filename.concat rt_base_dir "matita.ma.templ" in - let lines = 14 in - out_preamble och (path, lines); - let grafite_parser_cb fname = - let ast = G.Executable (floc, G.Command (floc, G.Include (floc, fname))) in - output_string och (pp_ast_statement ast); nl (); nl () - in - let matita_engine_cb = function - | G.Executable (_, G.Macro (_, G.Inline _)) - | G.Executable (_, G.Command (_, G.Include _)) -> () - | ast -> - output_string och (pp_ast_statement ast); nl (); nl () - in - let matitac_lib_cb = output_string och in - GrafiteParser.set_callback grafite_parser_cb; - MatitaEngine.set_callback matita_engine_cb; - MatitacLib.set_callback matitac_lib_cb; - at_exit atexit - let main () = - Helm_registry.set_bool "matita.moo" true; - match Filename.basename Sys.argv.(0) with - |"gragrep" |"gragrep.opt" |"gragrep.opt.static" ->Gragrep.main() - |"matitadep" |"matitadep.opt" |"matitadep.opt.static" ->Matitadep.main() - |"matitaclean"|"matitaclean.opt"|"matitaclean.opt.static"->Matitaclean.main() - |"matitamake" |"matitamake.opt" |"matitamake.opt.static" ->Matitamake.main() - |"matitaprover"|"matitaprover.opt" - |"matitaprover.opt.static" ->Matitaprover.main() - |"matitawiki"|"matitawiki.opt" ->MatitaWiki.main() - | _ -> -(* - let _ = Paramodulation.Saturation.init () in *) -(* ALB to link paramodulation *) - let dump_msg = " Dump source with expanded macros to " in - MatitaInit.add_cmdline_spec ["-dump", Arg.String dump, dump_msg]; - let _ = MatitacLib.main `COMPILER in - () + let bin = Filename.basename Sys.argv.(0) in + if Pcre.pmatch ~pat:"^matitadep" bin then Matitadep.main () + else if Pcre.pmatch ~pat:"^matitaclean" bin then Matitaclean.main () + else if Pcre.pmatch ~pat:"^matitawiki" bin then MatitaWiki.main () + else main_compiler () +;; let _ = main () diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml index 316d0f9f6..ec5618684 100644 --- a/helm/software/matita/matitacLib.ml +++ b/helm/software/matita/matitacLib.ml @@ -29,101 +29,31 @@ open Printf open GrafiteTypes -exception AttemptToInsertAnAlias +exception AttemptToInsertAnAlias of LexiconEngine.status let out = ref ignore - let set_callback f = out := f -let pp_ast_statement st = - GrafiteAstPp.pp_statement - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - ~term_pp:CicNotationPp.pp_term - ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) st - -(** {2 Initialization} *) - -let grafite_status = (ref None : GrafiteTypes.status option ref) -let lexicon_status = (ref None : LexiconEngine.status option ref) +let slash_n_RE = Pcre.regexp "\\n" ;; -let run_script is eval_function = - let lexicon_status',grafite_status' = - match !lexicon_status,!grafite_status with - | Some ss, Some s -> ss,s - | _,_ -> assert false - in - let slash_n_RE = Pcre.regexp "\\n" in - let cb = - if Helm_registry.get_int "matita.verbosity" < 1 then - (fun _ _ -> ()) - else - (fun grafite_status stm -> - (* dump_status grafite_status; *) - let stm = pp_ast_statement stm in - let stm = Pcre.replace ~rex:slash_n_RE stm in - let stm = - if String.length stm > 50 then - String.sub stm 0 50 ^ " ..." - else - stm - in - HLog.debug ("Executing: ``" ^ stm ^ "''")) +let pp_ast_statement grafite_status stm = + let stm = GrafiteAstPp.pp_statement + ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") + ~term_pp:CicNotationPp.pp_term + ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:(CicNotationPp.pp_obj + CicNotationPp.pp_term) stm in - let matita_debug = Helm_registry.get_bool "matita.debug" in - try - match eval_function lexicon_status' grafite_status' is cb with - [] -> raise End_of_file - | ((grafite_status'',lexicon_status''),None)::_ -> - lexicon_status := Some lexicon_status''; - grafite_status := Some grafite_status'' - | (s,Some _)::_ -> raise AttemptToInsertAnAlias - with - | GrafiteEngine.Drop - | End_of_file - | CicNotationParser.Parse_error _ - | GrafiteEngine.Macro _ as exn -> raise exn - | exn -> - if not matita_debug then - HLog.error (snd (MatitaExcPp.to_string exn)) ; - raise exn - -let fname () = - let rec aux = function - | ""::tl -> aux tl - | [x] -> x - | [] -> MatitaInit.die_usage () - | l -> - prerr_endline - ("Wrong commands: " ^ - String.concat " " (List.map (fun x -> "'" ^ x ^ "'") l)); - MatitaInit.die_usage () + let stm = Pcre.replace ~rex:slash_n_RE stm in + let stm = + if String.length stm > 50 then String.sub stm 0 50 ^ " ..." + else stm in - aux (Helm_registry.get_list Helm_registry.string "matita.args") + HLog.debug ("Executing: ``" ^ stm ^ "''") +;; -let pp_ocaml_mode () = - HLog.message ""; - HLog.message " ** Entering Ocaml mode ** "; - HLog.message ""; - HLog.message "Type 'go ();;' to enter an interactive matitac"; - HLog.message "" - -let clean_exit n = - let opt_exit = - function - None -> () - | Some n -> exit n - in - match !grafite_status with - None -> opt_exit n - | Some grafite_status -> - try - let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in - LibraryClean.clean_baseuris ~verbose:false [baseuri]; - opt_exit n - with GrafiteTypes.Option_error("baseuri", "not found") -> - (* no baseuri ==> nothing to clean yet *) - opt_exit n +let clean_exit baseuri rc = + LibraryClean.clean_baseuris ~verbose:false [baseuri]; rc +;; let get_macro_context = function | Some {GrafiteTypes.proof_status = GrafiteTypes.No_proof} -> [] @@ -132,277 +62,228 @@ let get_macro_context = function let goal = Continuationals.Stack.find_goal stack in GrafiteTypes.get_proof_context status goal | None -> assert false +;; -let rec interactive_loop () = - let str = Ulexing.from_utf8_channel stdin in - try - run_script str - (MatitaEngine.eval_from_stream ~first_statement_only:false ~prompt:true - ~include_paths:(Helm_registry.get_list Helm_registry.string - "matita.includes")) - with - | GrafiteEngine.Drop -> pp_ocaml_mode () - | GrafiteEngine.Macro (floc, f) -> - begin match f (get_macro_context !grafite_status) with - | _, GrafiteAst.Inline (_, style, suri, prefix) -> - let str = - ApplyTransformation.txt_of_inline_macro style suri prefix - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - in - !out str; - interactive_loop () - | _ -> - let x, y = HExtlib.loc_of_floc floc in - HLog.error (sprintf "A macro has been found in a script at %d-%d" x y); - interactive_loop () - end - | Sys.Break -> HLog.error "user break!"; interactive_loop () - | GrafiteTypes.Command_error _ -> interactive_loop () - | End_of_file -> - print_newline (); - clean_exit (Some 0) - | HExtlib.Localized (floc,CicNotationParser.Parse_error err) -> - let x, y = HExtlib.loc_of_floc floc in - HLog.error (sprintf "Parse error at %d-%d: %s" x y err); - interactive_loop () - | exn -> HLog.error (Printexc.to_string exn); interactive_loop () - -let go () = - Helm_registry.load_from BuildTimeConf.matita_conf; - Http_getter.init (); - MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner"); - LibraryDb.create_owner_environment (); - CicEnvironment.set_trust (* environment trust *) - (let trust = - Helm_registry.get_opt_default Helm_registry.get_bool - ~default:true "matita.environment_trust" in - fun _ -> trust); - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - grafite_status := Some (GrafiteSync.init ()); - lexicon_status := - Some (CicNotation2.load_notation ~include_paths - BuildTimeConf.core_notation_script); - Sys.catch_break true; - interactive_loop () - -let pp_times fname bench_mode rc big_bang = - if bench_mode then - begin - let { Unix.tms_utime = u ; Unix.tms_stime = s} = Unix.times () in - let r = Unix.gettimeofday () -. big_bang in - let extra = try Sys.getenv "BENCH_EXTRA_TEXT" with Not_found -> "" in - let cc = - if Str.string_match (Str.regexp ".*opt$") Sys.argv.(0) 0 then - "matitac.opt" - else - "matitac" - in - let rc = if rc then "OK" else "FAIL" in - let times = - let fmt t = - let seconds = int_of_float t in - let cents = int_of_float ((t -. floor t) *. 100.0) in - let minutes = seconds / 60 in - let seconds = seconds mod 60 in - Printf.sprintf "%dm%02d.%02ds" minutes seconds cents - in - Printf.sprintf "%s %s %s" (fmt r) (fmt u) (fmt s) - in - let fname = - match MatitamakeLib.development_for_dir (Filename.dirname fname) with - | None -> fname - | Some d -> - let rootlen = String.length(MatitamakeLib.root_for_development d)in - let fnamelen = String.length fname in - assert (fnamelen > rootlen); - String.sub fname rootlen (fnamelen - rootlen) +let pp_times fname rc big_bang = + if not (Helm_registry.get_bool "matita.verbose") then + let { Unix.tms_utime = u ; Unix.tms_stime = s} = Unix.times () in + let r = Unix.gettimeofday () -. big_bang in + let extra = try Sys.getenv "BENCH_EXTRA_TEXT" with Not_found -> "" in + let rc,rcascii = + if rc then "OK","Ok" else "FAIL","Fail" in + let times = + let fmt t = + let seconds = int_of_float t in + let cents = int_of_float ((t -. floor t) *. 100.0) in + let minutes = seconds / 60 in + let seconds = seconds mod 60 in + Printf.sprintf "%dm%02d.%02ds" minutes seconds cents in - let fname = - if fname.[0] = '/' then - String.sub fname 1 (String.length fname - 1) - else - fname - in - let s = Printf.sprintf "%s %-35s %-4s %s %s" cc fname rc times extra in - print_endline s; - flush stdout - end + Printf.sprintf "%s %s %s" (fmt r) (fmt u) (fmt s) + in + let s = Printf.sprintf "%-4s %s %s" rc times extra in + print_endline s; + flush stdout; + HLog.message ("Compilation of "^Filename.basename fname^": "^rc) ;; -let rec compiler_loop fname big_bang mode buf = - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - let clean_baseuri = not (Helm_registry.get_bool "matita.preserve") in - let matita_debug = Helm_registry.get_bool "matita.debug" in - let bench_mode = Helm_registry.get_bool "matita.bench" in - try - run_script buf - (MatitaEngine.eval_from_stream ~first_statement_only:false ~include_paths - ~clean_baseuri) - with - | End_of_file -> () - | Sys.Break as exn -> - if matita_debug then raise exn; - HLog.error "user break!"; - pp_times fname bench_mode false big_bang; - if mode = `COMPILER then - clean_exit (Some ~-1) - else - pp_ocaml_mode () - | GrafiteEngine.Drop -> - if mode = `COMPILER then - begin - pp_times fname bench_mode false big_bang; - clean_exit (Some 1) - end - else - pp_ocaml_mode () - | GrafiteEngine.Macro (floc, f) -> - begin match f (get_macro_context !grafite_status) with - | _, GrafiteAst.Inline (_, style, suri, prefix) -> - let str = - ApplyTransformation.txt_of_inline_macro style suri prefix - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") in - !out str; - compiler_loop fname big_bang mode buf - | _ -> - let x, y = HExtlib.loc_of_floc floc in - HLog.error (sprintf "A macro has been found in a script at %d-%d" x y); - if mode = `COMPILER then - begin - pp_times fname bench_mode false big_bang; - clean_exit (Some 1) - end - else - pp_ocaml_mode () - end - | HExtlib.Localized (floc,CicNotationParser.Parse_error err) -> - let (x, y) = HExtlib.loc_of_floc floc in - HLog.error (sprintf "Parse error at %d-%d: %s" x y err); - if mode = `COMPILER then - begin - pp_times fname bench_mode false big_bang; - clean_exit (Some 1) - end - else - pp_ocaml_mode () - | exn -> - if matita_debug then raise exn; - if mode = `COMPILER then - begin - pp_times fname bench_mode false big_bang; - clean_exit (Some 3) - end - else - pp_ocaml_mode () +let cut prefix s = + let lenp = String.length prefix in + let lens = String.length s in + assert (lens > lenp); + assert (String.sub s 0 lenp = prefix); + String.sub s lenp (lens-lenp) +;; -let main ~mode = - let big_bang = Unix.gettimeofday () in - MatitaInit.initialize_all (); - (* must be called after init since args are set by cmdline parsing *) - let fname = fname () in - if false then - (let baseuri = - (* This does not work yet :-( - let baseuri = - GrafiteTypes.get_string_option - (match !grafite_status with None -> assert false | Some s -> s) - "baseuri" in*) - lazy - (fst (DependenciesParser.baseuri_of_script ~include_paths:[] fname)) in - let mangled_baseuri = - lazy - ( let baseuri = Lazy.force baseuri in - let baseuri = String.sub baseuri 5 (String.length baseuri - 5) in - let baseuri = Pcre.replace ~pat:"/" ~templ:"_" baseuri in - String.uncapitalize baseuri - ) in - let f = - lazy - (open_out - (Filename.dirname fname ^ "/" ^ Lazy.force mangled_baseuri ^ ".ml")) in - LibrarySync.set_object_declaration_hook - (fun _ obj -> - output_string (Lazy.force f) - (CicExportation.ppobj (Lazy.force baseuri) obj); - flush (Lazy.force f))); - let system_mode = Helm_registry.get_bool "matita.system" in - let bench_mode = Helm_registry.get_bool "matita.bench" in - if bench_mode then - Helm_registry.set_int "matita.verbosity" 0; - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - grafite_status := Some (GrafiteSync.init ()); - lexicon_status := - Some (CicNotation2.load_notation ~include_paths - BuildTimeConf.core_notation_script); - Sys.catch_break true; - let origcb = HLog.get_log_callback () in - let origcb t s = origcb t ((if system_mode then "[S] " else "") ^ s) in - let newcb tag s = - match tag with - | `Debug | `Message -> () - | `Warning | `Error -> origcb tag s +let get_include_paths options = + let include_paths = + try List.assoc "include_paths" options with Not_found -> "" in - if Helm_registry.get_int "matita.verbosity" < 1 then - HLog.set_log_callback newcb; - if bench_mode then MatitaMisc.shutup (); - let time = Unix.time () in - if Helm_registry.get_int "matita.verbosity" < 1 && not bench_mode then - origcb `Message ("compiling " ^ Filename.basename fname ^ "...") - else - HLog.message (sprintf "execution of %s started:" fname); - let ich = match fname with - | "stdin" -> stdin - | fname -> open_in fname + let include_paths = Str.split (Str.regexp " ") include_paths in + let include_paths = + include_paths @ + Helm_registry.get_list Helm_registry.string "matita.includes" + in + include_paths +;; + +let compile options fname = + let matita_debug = Helm_registry.get_bool "matita.debug" in + let include_paths = get_include_paths options in + let root,baseuri,fname,_tgt = + Librarian.baseuri_of_script ~include_paths fname in + let grafite_status = GrafiteSync.init baseuri in + let lexicon_status = + CicNotation2.load_notation ~include_paths:[] + BuildTimeConf.core_notation_script + in + let initial_lexicon_status = lexicon_status in + let big_bang = Unix.gettimeofday () in + let time = Unix.time () in + try + (* sanity checks *) + let moo_fname = + LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri ~writable:true in - let buf = Ulexing.from_utf8_channel ich in - compiler_loop fname big_bang mode buf; - let elapsed = Unix.time () -. time in - let tm = Unix.gmtime elapsed in - let sec = string_of_int tm.Unix.tm_sec ^ "''" in - let min = - if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min ^ "' ") else "" + let lexicon_fname= + LibraryMisc.lexicon_file_of_baseuri + ~must_exist:false ~baseuri ~writable:true + in + if Http_getter_storage.is_read_only baseuri then + HLog.error + (Printf.sprintf "uri %s belongs to a read-only repository" baseuri); + (* cleanup of previously compiled objects *) + if (not (Http_getter_storage.is_empty ~local:true baseuri) || + LibraryClean.db_uris_of_baseuri baseuri <> []) + then begin + HLog.message ("baseuri " ^ baseuri ^ " is not empty"); + HLog.message ("cleaning baseuri " ^ baseuri); + LibraryClean.clean_baseuris [baseuri]; + assert (Http_getter_storage.is_empty ~local:true baseuri); + end; + (* create dir for XML files *) + if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk" + ~default:false) + then + HExtlib.mkdir + (Filename.dirname + (Http_getter.filename ~local:true ~writable:true (baseuri ^ + "foo.con"))); + HLog.message ("compiling " ^ Filename.basename fname ^ " in " ^ baseuri); + if not (Helm_registry.get_bool "matita.verbose") then + (let cc = + let rex = Str.regexp ".*opt$" in + if Str.string_match rex Sys.argv.(0) 0 then "matitac.opt" + else "matitac" + in + let s = Printf.sprintf "%s %-35s " cc (cut (root^"/") fname) in + print_string s; flush stdout); + let buf = Ulexing.from_utf8_channel (open_in fname) in + let print_cb = + if not (Helm_registry.get_bool "matita.verbose") then (fun _ _ -> ()) + else pp_ast_statement in - let hou = - if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else "" + let grafite_status, lexicon_status = + let rec aux_for_dump x = + try + match + MatitaEngine.eval_from_stream ~first_statement_only:false ~include_paths + lexicon_status grafite_status buf x + with + | [] -> grafite_status, lexicon_status + | ((grafite,lexicon),None)::_ -> grafite, lexicon + | ((_,l),Some _)::_ -> raise (AttemptToInsertAnAlias l) + + with MatitaEngine.EnrichedWithLexiconStatus + (GrafiteEngine.Macro (floc, f), lex_status) as exn -> + match f (get_macro_context (Some grafite_status)) with + | _, GrafiteAst.Inline (_, style, suri, prefix) -> + let str = + ApplyTransformation.txt_of_inline_macro style suri prefix + ~map_unicode_to_tex:(Helm_registry.get_bool + "matita.paste_unicode_as_tex") in + !out str; + aux_for_dump x + |_-> raise exn + in + aux_for_dump print_cb in + let elapsed = Unix.time () -. time in let proof_status,moo_content_rev,lexicon_content_rev = - match !lexicon_status,!grafite_status with - | Some ss, Some s -> - s.proof_status, s.moo_content_rev, - ss.LexiconEngine.lexicon_content_rev - | _,_ -> assert false + grafite_status.proof_status, grafite_status.moo_content_rev, + lexicon_status.LexiconEngine.lexicon_content_rev in if proof_status <> GrafiteTypes.No_proof then - begin - HLog.error - "there are still incomplete proofs at the end of the script"; - pp_times fname bench_mode true big_bang; - clean_exit (Some 2) - end + (HLog.error + "there are still incomplete proofs at the end of the script"; + pp_times fname false big_bang; + LexiconSync.time_travel + ~present:lexicon_status ~past:initial_lexicon_status; + clean_exit baseuri false) else - begin - let baseuri, _fullpathforfname = - DependenciesParser.baseuri_of_script ~include_paths fname in - let moo_fname = - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true - in - let lexicon_fname= - LibraryMisc.lexicon_file_of_baseuri + (if not (Helm_registry.get_bool "matita.moo" && + Filename.check_suffix fname ".mma") then begin + (* FG: we do not generate .moo when dumping .mma files *) + GrafiteMarshal.save_moo moo_fname moo_content_rev; + LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev; + end; + let tm = Unix.gmtime elapsed in + let sec = string_of_int tm.Unix.tm_sec ^ "''" in + let min = + if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min^"' ") else "" + in + let hou = + if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour^"h ") else "" + in + HLog.message + (sprintf "execution of %s completed in %s." fname (hou^min^sec)); + pp_times fname true big_bang; + LexiconSync.time_travel + ~present:lexicon_status ~past:initial_lexicon_status; + true) + with + (* all exceptions should be wrapped to allow lexicon-undo (LS.time_travel) *) + | AttemptToInsertAnAlias lexicon_status -> + pp_times fname false big_bang; + LexiconSync.time_travel + ~present:lexicon_status ~past:initial_lexicon_status; + clean_exit baseuri false + | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) -> + (match exn with + | Sys.Break -> HLog.error "user break!" + | HExtlib.Localized (floc,CicNotationParser.Parse_error err) -> + let (x, y) = HExtlib.loc_of_floc floc in + HLog.error (sprintf "Parse error at %d-%d: %s" x y err) + | exn -> HLog.error (snd (MatitaExcPp.to_string exn))); + LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status; + pp_times fname false big_bang; + clean_exit baseuri false + | Sys.Break as exn -> + if matita_debug then raise exn; + HLog.error "user break!"; + pp_times fname false big_bang; + clean_exit baseuri false + | exn -> + if matita_debug then raise exn; + HLog.error + ("Unwrapped exception, please fix: "^ snd (MatitaExcPp.to_string exn)); + pp_times fname false big_bang; + clean_exit baseuri false +;; + +module F = + struct + type source_object = string + type target_object = string + let string_of_source_object s = s;; + let string_of_target_object s = s;; + + let root_and_target_of opts mafile = + try + let include_paths = get_include_paths opts in + let root,baseuri,_,_ = + Librarian.baseuri_of_script ~include_paths mafile + in + Some root, LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri ~writable:true - in -(* FG: we do not generate .moo when dumping .mma files *) - if Helm_registry.get_bool "matita.moo" then begin - GrafiteMarshal.save_moo moo_fname moo_content_rev; - LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev; - end; - HLog.message - (sprintf "execution of %s completed in %s." fname (hou^min^sec)); - pp_times fname bench_mode true big_bang; - exit 0 - end + with Librarian.NoRootFor x -> None, "" + ;; + + let mtime_of_source_object s = + try Some (Unix.stat s).Unix.st_mtime + with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None + ;; + + let mtime_of_target_object s = + try Some (Unix.stat s).Unix.st_mtime + with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None + ;; + + let build = compile;; + + let load_deps_file = Librarian.load_deps_file;; + + end + +module Make = Librarian.Make(F) + diff --git a/helm/software/matita/matitacLib.mli b/helm/software/matita/matitacLib.mli index 5e8a2635b..03ea56beb 100644 --- a/helm/software/matita/matitacLib.mli +++ b/helm/software/matita/matitacLib.mli @@ -23,18 +23,10 @@ * http://helm.cs.unibo.it/ *) -val interactive_loop : unit -> unit - -(** go initializes the status and calls interactive_loop *) -val go : unit -> unit -val main : mode:[ `COMPILER | `TOPLEVEL ] -> unit - -(** clean_exit n - if n = Some n it performs an exit [n] after a complete clean-up of what was - partially compiled - otherwise it performs the clean-up without exiting -*) -val clean_exit : int option -> unit - (* this callback is called on the expansion of every inline macro *) val set_callback: (string -> unit) -> unit + +module Make : sig + val make: string -> string list -> bool +end + diff --git a/helm/software/matita/matitaclean.ml b/helm/software/matita/matitaclean.ml index cf8bf42f4..d9f603652 100644 --- a/helm/software/matita/matitaclean.ml +++ b/helm/software/matita/matitaclean.ml @@ -55,55 +55,69 @@ let ask_confirmation _ = end ;; +let clean_all () = + if Helm_registry.get_bool "matita.system" then + ask_confirmation (); + LibraryDb.clean_owner_environment (); + let prefixes = + HExtlib.filter_map + (fun s -> + if String.sub s 0 5 = "file:" then + Some (Str.replace_first (Str.regexp "^file://") "" s) + else + None) + (Http_getter_storage.list_writable_prefixes ()) + in + List.iter + (fun xmldir -> + let clean_pat = + String.concat " -o " + (List.map (fun suf -> "-name \\*" ^ suf) clean_suffixes) in + let clean_cmd = + sprintf "find %s \\( %s \\) -exec rm \\{\\} \\; 2> /dev/null" + xmldir clean_pat in + ignore (Sys.command clean_cmd); + ignore + (Sys.command ("find " ^ xmldir ^ + " -type d -exec rmdir -p {} \\; 2> /dev/null"))) + prefixes +;; + let main () = let _ = MatitaInit.initialize_all () in - if Helm_registry.get_bool "matita.bench" then MatitaMisc.shutup (); - match Helm_registry.get_list Helm_registry.string "matita.args" with - | [ "all" ] -> - if Helm_registry.get_bool "matita.system" then - ask_confirmation (); - LibraryDb.clean_owner_environment (); - let prefixes = - HExtlib.filter_map - (fun s -> - if String.sub s 0 5 = "file:" then - Some (Str.replace_first (Str.regexp "^file://") "" s) - else - None) - (Http_getter_storage.list_writable_prefixes ()) - in - List.iter - (fun xmldir -> - let clean_pat = - String.concat " -o " - (List.map (fun suf -> "-name \\*" ^ suf) clean_suffixes) in - let clean_cmd = - sprintf "find %s \\( %s \\) -exec rm \\{\\} \\; 2> /dev/null" - xmldir clean_pat in - ignore (Sys.command clean_cmd); - ignore - (Sys.command ("find " ^ xmldir ^ - " -type d -exec rmdir -p {} \\; 2> /dev/null"))) - prefixes; - exit 0 - | [] -> MatitaInit.die_usage () - | files -> - let uris_to_remove = - List.fold_left - (fun uris_to_remove suri -> - let uri = - try - UM.buri_of_uri (UM.uri_of_string suri) - with UM.IllFormedUri _ -> - let u,_ = - DependenciesParser.baseuri_of_script ~include_paths:[] suri in - if String.length u < 5 || String.sub u 0 5 <> "cic:/" then begin - HLog.error (sprintf "File %s defines a bad baseuri: %s" - suri u); - exit 1 - end else - u - in - uri::uris_to_remove) [] files - in - LibraryClean.clean_baseuris uris_to_remove + if not (Helm_registry.get_bool "matita.verbose") then MatitaMisc.shutup (); + let files = + match Helm_registry.get_list Helm_registry.string "matita.args" with + | [ "all" ] -> clean_all (); exit 0 + | [] -> + (match Librarian.find_roots_in_dir (Sys.getcwd ()) with + | [x] -> + Sys.chdir (Filename.dirname x); + HExtlib.find ~test:(fun x -> Filename.check_suffix x ".ma") "." + | [] -> + prerr_endline "No targets and no root found"; exit 1 + | roots -> + let roots = List.map (HExtlib.chop_prefix (Sys.getcwd()^"/")) roots in + prerr_endline ("Too many roots found:\n\t" ^ String.concat "\n\t" roots); + prerr_endline ("\nEnter one of these directories and retry"); + exit 1); + | files -> files + in + let uris_to_remove = + List.fold_left + (fun uris_to_remove suri -> + let uri = + try + UM.buri_of_uri (UM.uri_of_string suri) + with UM.IllFormedUri _ -> + let _,u,_,_ = Librarian.baseuri_of_script ~include_paths:[] suri in + if String.length u < 5 || String.sub u 0 5 <> "cic:/" then begin + HLog.error (sprintf "File %s defines a bad baseuri: %s" + suri u); + exit 1 + end else + u + in + uri::uris_to_remove) [] files + in + LibraryClean.clean_baseuris uris_to_remove diff --git a/helm/software/matita/matitadep.ml b/helm/software/matita/matitadep.ml index 473445fff..fe7cab920 100644 --- a/helm/software/matita/matitadep.ml +++ b/helm/software/matita/matitadep.ml @@ -30,154 +30,100 @@ open Printf module GA = GrafiteAst module U = UriManager -let obj_file_of_baseuri writable baseuri = - try - LibraryMisc.obj_file_of_baseuri - ~must_exist:true ~baseuri ~writable - with - | Http_getter_types.Unresolvable_URI _ - | Http_getter_types.Key_not_found _ -> - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true -;; - let main () = (* all are maps from "file" to "something" *) - let include_deps = Hashtbl.create (Array.length Sys.argv) in - let include_deps_dot = Hashtbl.create (Array.length Sys.argv) in - let baseuri_of = Hashtbl.create (Array.length Sys.argv) in - let baseuri_of_inv = Hashtbl.create (Array.length Sys.argv) in - let uri_deps = Hashtbl.create (Array.length Sys.argv) in - let ma_topo = Hashtbl.create (Array.length Sys.argv) in - let ma_topo_keys = ref [] in + let include_deps = Hashtbl.create 13 in + let baseuri_of = Hashtbl.create 13 in + let baseuri_of_inv = Hashtbl.create 13 in + let dot_file = ref "" in + (* helpers *) + let include_paths = ref [] in + let baseuri_of_script s = + try Hashtbl.find baseuri_of s + with Not_found -> + let _,b,_,_ = + Librarian.baseuri_of_script ~include_paths:!include_paths s + in + Hashtbl.add baseuri_of s b; + Hashtbl.add baseuri_of_inv b s; + b + in + let script_of_baseuri ma b = + try Some (Hashtbl.find baseuri_of_inv b) + with Not_found -> + HLog.error ("Skipping dependency of '"^ma^"' over '"^b^"'"); + HLog.error ("Plase include the file defining such baseuri, or fix"); + HLog.error ("possibly incorrect verbatim URIs in the .ma file."); + None + in let buri alias = U.buri_of_uri (U.uri_of_string alias) in let resolve alias current_buri = let buri = buri alias in - if buri <> current_buri then Some buri else None in - let dot_file = ref "" in - let order_only = ref false in + if buri <> current_buri then Some buri else None + in + (* initialization *) MatitaInit.add_cmdline_spec ["-dot", Arg.Set_string dot_file, - " Save dependency graph in dot format to the given file"; - "-order", Arg.Set order_only, - "Only print (one of the possibles) build order(s) for the given *.ma"]; + " Save dependency graph in dot format to the given file";]; MatitaInit.parse_cmdline_and_configuration_file (); MatitaInit.initialize_environment (); - MatitamakeLib.initialize (); - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - let args = Helm_registry.get_list Helm_registry.string "matita.args" in - if args = [] then - begin - prerr_endline "At least one .ma file must be specified"; - exit 1 - end; - let ma_files = args in - let bof = Hashtbl.create 10 in - let baseuri_of_script s = - try Hashtbl.find bof s - with Not_found -> - let b,_ = DependenciesParser.baseuri_of_script ~include_paths s in - Hashtbl.add bof s b; b + let args = + let roots = Librarian.find_roots_in_dir (Sys.getcwd ()) in + match roots with + | [] -> + prerr_endline ("No roots found in " ^ Sys.getcwd ()); + exit 1 + | [x] -> + Sys.chdir (Filename.dirname x); + let opts = Librarian.load_root_file "root" in + include_paths := + (try Str.split (Str.regexp " ") (List.assoc "include_paths" opts) + with Not_found -> []) @ + (Helm_registry.get_list Helm_registry.string "matita.includes"); + HExtlib.find ~test:(fun x -> Filename.check_suffix x ".ma") "." + | _ -> + let roots = List.map (HExtlib.chop_prefix (Sys.getcwd()^"/")) roots in + prerr_endline ("Too many roots found:\n\t" ^ String.concat "\n\t" roots); + prerr_endline ("\nEnter one of these directories and retry"); + exit 1 in + let ma_files = args in + (* here we go *) + (* fills: + Hashtbl.add include_deps ma_file ma_file + Hashtbl.add include_deps_dot ma_file baseuri + *) + List.iter (fun ma_file -> ignore (baseuri_of_script ma_file)) ma_files; List.iter (fun ma_file -> - let ic = open_in ma_file in - let istream = Ulexing.from_utf8_channel ic in - let dependencies = DependenciesParser.parse_dependencies istream in - close_in ic; - if !order_only then begin - let relative_ma_file = - (* change a path leading to a .ma file into a path relative to its - * development root dir *) - let absolute_ma_file = - if Filename.is_relative ma_file then - Filename.concat (Sys.getcwd ()) ma_file - else - ma_file in - let ma_dir = Filename.dirname absolute_ma_file in - match MatitamakeLib.development_for_dir ma_dir with - | None -> - eprintf "no development setup for dir '%s'\n%!" ma_dir; - assert false - | Some devel -> - Pcre.replace - ~pat:(Pcre.quote(MatitamakeLib.root_for_development devel) ^ "/?") - ~templ:"" absolute_ma_file - in - ma_topo_keys := relative_ma_file :: !ma_topo_keys; - List.iter - (function - | DependenciesParser.IncludeDep path -> - Hashtbl.add ma_topo relative_ma_file path - | _ -> ()) - dependencies - end else + let ma_baseuri = baseuri_of_script ma_file in + let dependencies = DependenciesParser.deps_of_file ma_file in List.iter (function | DependenciesParser.UriDep uri -> let uri = UriManager.string_of_uri uri in if not (Http_getter_storage.is_legacy uri) then - Hashtbl.add uri_deps ma_file uri - | DependenciesParser.BaseuriDep uri -> - let uri = Http_getter_misc.strip_trailing_slash uri in - Hashtbl.add baseuri_of ma_file uri; - Hashtbl.add baseuri_of_inv uri ma_file + let dep = resolve uri ma_baseuri in + (match dep with + | None -> () + | Some u -> + match script_of_baseuri ma_file u with + | Some d -> Hashtbl.add include_deps ma_file d + | None -> ()) | DependenciesParser.IncludeDep path -> - try - let baseuri = baseuri_of_script path in - if not (Http_getter_storage.is_legacy baseuri) then - (let moo_file = obj_file_of_baseuri false baseuri in - Hashtbl.add include_deps ma_file moo_file; - Hashtbl.add include_deps_dot ma_file baseuri) - with Sys_error _ -> - HLog.warn - ("Unable to find " ^ path ^ " that is included in " ^ ma_file)) + ignore (baseuri_of_script path); + Hashtbl.add include_deps ma_file path) dependencies) ma_files; - Hashtbl.iter - (fun file alias -> - try - let dep = resolve alias (Hashtbl.find baseuri_of file) in - match dep with - | None -> () - | Some u -> - Hashtbl.add include_deps file (obj_file_of_baseuri false u) - with Not_found -> - prerr_endline ("File "^ file^" has no baseuri. Use set baseuri"); - exit 1) - uri_deps; - let gcp x y = - (* explode and implode from the OCaml Expert FAQ. *) - let explode s = - let rec exp i l = - if i < 0 then l else exp (i - 1) (s.[i] :: l) in - exp (String.length s - 1) [] - in - let implode l = - let res = String.create (List.length l) in - let rec imp i = function - | [] -> res - | c :: l -> res.[i] <- c; imp (i + 1) l in - imp 0 l - in - let rec aux = function - | x::tl1,y::tl2 when x = y -> x::(aux (tl1,tl2)) - | _ -> [] - in - implode (aux (explode x,explode y)) - in - let max_path = List.hd ma_files in - let max_path = List.fold_left gcp max_path ma_files in - let short x = Pcre.replace ~pat:("^"^max_path) x in - if !dot_file <> "" then (* generate dependency graph if required *) + (* dot generation *) + if !dot_file <> "" then begin let oc = open_out !dot_file in let fmt = Format.formatter_of_out_channel oc in - GraphvizPp.Dot.header (* ~graph_attrs:["rankdir","LR"] *) fmt; + GraphvizPp.Dot.header fmt; List.iter (fun ma_file -> - let deps = Hashtbl.find_all include_deps_dot ma_file in + let deps = Hashtbl.find_all include_deps ma_file in let deps = HExtlib.filter_map (fun u -> @@ -187,41 +133,44 @@ let main () = in let deps = List.fast_sort Pervasives.compare deps in let deps = HExtlib.list_uniq deps in - GraphvizPp.Dot.node (short ma_file) fmt; - List.iter (fun dep -> GraphvizPp.Dot.edge (short ma_file) (short dep) fmt) deps) + GraphvizPp.Dot.node ma_file fmt; + List.iter (fun dep -> GraphvizPp.Dot.edge ma_file dep fmt) deps) ma_files; GraphvizPp.Dot.trailer fmt; close_out oc end; - if !order_only then begin - let module OrdererString = - struct - type t = string - let compare = Pervasives.compare - end - in - let module Topo = HTopoSort.Make (OrdererString) in - let sorted_ma = - Topo.topological_sort !ma_topo_keys (Hashtbl.find_all ma_topo) in - List.iter print_endline sorted_ma - (*Hashtbl.iter (fun k v -> printf "%s: %s\n" k v) ma_topo*) - end else - List.iter (* generate regular .depend output *) - (fun ma_file -> - try - let deps = Hashtbl.find_all include_deps ma_file in - let deps = List.fast_sort Pervasives.compare deps in - let deps = HExtlib.list_uniq deps in - let deps = ma_file :: deps in - let baseuri = Hashtbl.find baseuri_of ma_file in - let moo = obj_file_of_baseuri true baseuri in - printf "%s: %s\n%s: %s\n%s: %s\n%s: %s\n" - moo (String.concat " " deps) - (Filename.basename(Pcre.replace ~pat:"ma$" ~templ:"mo" ma_file)) moo - (Pcre.replace ~pat:"ma$" ~templ:"mo" ma_file) moo - (Pcre.replace ~pat:"ma$" ~templ:"mo" (short ma_file)) moo - with Not_found -> - prerr_endline ("File "^ma_file^" has no baseuri. Use set baseuri"); - exit 1) - ma_files + (* generate regular depend output *) + let fix_name f = + let f = + if Pcre.pmatch ~pat:"^\\./" f then + String.sub f 2 (String.length f - 2) + else + f + in + HExtlib.normalize_path f + in + let deps = + List.fold_left + (fun acc ma_file -> + let deps = Hashtbl.find_all include_deps ma_file in + let deps = List.fast_sort Pervasives.compare deps in + let deps = HExtlib.list_uniq deps in + let deps = List.map fix_name deps in + (fix_name ma_file, deps) :: acc) + [] ma_files + in + let extern = + List.fold_left + (fun acc (_,d) -> + List.fold_left + (fun a x -> + if List.exists (fun (t,_) -> x=t) deps then a + else x::a) + acc d) + [] deps + in + Librarian.write_deps_file (Sys.getcwd()) + (deps@HExtlib.list_uniq (List.sort Pervasives.compare (List.map (fun x -> + x,[]) extern))) +;; diff --git a/helm/software/matita/matitamake.ml b/helm/software/matita/matitamake.ml deleted file mode 100644 index ad4368738..000000000 --- a/helm/software/matita/matitamake.ml +++ /dev/null @@ -1,135 +0,0 @@ -(* Copyright (C) 2005, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -(* $Id$ *) - -module MK = MatitamakeLib ;; - -let main () = - MatitaInit.parse_cmdline_and_configuration_file (); - MK.initialize (); - let usage = ref (fun () -> ()) in - let dev_of_name name = - match MK.development_for_name name with - | None -> - prerr_endline ("Unable to find a development called " ^ name); - exit 1 - | Some d -> d - in - let dev_for_dir dir = - match MK.development_for_dir dir with - | None -> - prerr_endline ("Unable to find a development holding directory: "^ dir); - exit 1 - | Some d -> d - in - let init_dev args = - let name, path = - match args with - | [ name; path ] when path.[0] = '/' -> name, path - | [ name; path ] -> name, Unix.getcwd () ^ "/" ^ path - | [ name ] -> name, Unix.getcwd () - | _ -> !usage (); (* should not be reached *) assert false - in - match MK.initialize_development name path with - | None -> exit 2 - | Some _ -> exit 0 - in - let list_dev args = - if List.length args <> 0 then !usage (); - match MK.list_known_developments () with - | [] -> print_string "No developments found.\n"; exit 0 - | l -> - List.iter - (fun (name, root) -> - print_string (Printf.sprintf "%-10s\trooted in %s\n" name root)) - l; - exit 0 - in - let destroy_dev args = - if List.length args <> 1 then !usage (); - let name = (List.hd args) in - let dev = dev_of_name name in - MK.destroy_development dev; - exit 0 - in - let clean_dev args = - let dev = - match args with - | [] -> dev_for_dir (Unix.getcwd ()) - | [name] -> dev_of_name name - | _ -> !usage (); exit 1 - in - match MK.clean_development dev with - | true -> exit 0 - | false -> exit 1 - in - let build_dev args = - if List.length args <> 1 then !usage (); - let name = (List.hd args) in - let dev = dev_of_name name in - match MK.build_development dev with - | true -> exit 0 - | false -> exit 1 - in - let publish_dev args = - if List.length args <> 1 then !usage (); - let name = (List.hd args) in - let dev = dev_of_name name in - match MK.publish_development dev with - | true -> exit 0 - | false -> exit 1 - in - let target args = - if List.length args < 1 then !usage (); - let dev = dev_for_dir (Unix.getcwd ()) in - List.iter - (fun t -> - ignore(MK.build_development ~target:t dev)) - args - in - let params = [ - "init", init_dev; - "clean", clean_dev; - "list", list_dev; - "destroy", destroy_dev; - "build", build_dev; - "publish", publish_dev; - ] - in - usage := MatitaInit.die_usage; - let parse args = - match args with - | [] -> target [ "all" ] - | s :: tl -> - let f, args = - try - (List.assoc s params), tl - with Not_found -> - if s.[0] = '-' then (!usage ();assert false) else target, args - in - f args - in - parse (Helm_registry.get_list Helm_registry.string "matita.args") diff --git a/helm/software/matita/matitamake.mli b/helm/software/matita/matitamake.mli deleted file mode 100644 index 47ea2fe34..000000000 --- a/helm/software/matita/matitamake.mli +++ /dev/null @@ -1,27 +0,0 @@ -(* Copyright (C) 2006, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -val main : unit -> unit - diff --git a/helm/software/matita/matitamakeLib.ml b/helm/software/matita/matitamakeLib.ml deleted file mode 100644 index 499d0eaf3..000000000 --- a/helm/software/matita/matitamakeLib.ml +++ /dev/null @@ -1,394 +0,0 @@ -(* Copyright (C) 2005, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -(* $Id$ *) - -open Printf - -let logger = fun mark -> - match mark with - | `Error -> HLog.error - | `Warning -> HLog.warn - | `Debug -> HLog.debug - | `Message -> HLog.message - -type development = - { root: string ; name: string } - -let developments = ref [] - -let pool () = Helm_registry.get "matita.basedir" ^ "/matitamake/" ;; -let rootfile = "/root" ;; - -(* /foo/./bar/..//baz -> /foo/baz *) -let normalize_path s = - let s = Str.global_replace (Str.regexp "//") "/" s in - let l = Str.split (Str.regexp "/") s in - let rec aux = function - | [] -> [] - | he::".."::tl -> aux tl - | he::"."::tl -> aux (he::tl) - | he::tl -> he :: aux tl - in - (if Str.string_match (Str.regexp "^/") s 0 then "/" else "") ^ - String.concat "/" (aux l) - ^ (if Str.string_match (Str.regexp "/$") s 0 then "/" else "") -;; - -let ls_dir dir = - try - let d = Unix.opendir dir in - let content = ref [] in - try - while true do - let name = Unix.readdir d in - if name <> "." && name <> ".." then - content := name :: !content - done; - Some [] - with End_of_file -> Unix.closedir d; Some !content - with Unix.Unix_error _ -> None - -let initialize () = - (* create a base env if none *) - HExtlib.mkdir (pool ()); - (* load developments *) - match ls_dir (pool ()) with - | None -> logger `Error ("Unable to list directory " ^ pool ()) - | Some l -> - let paths = - List.fold_left - (fun acc name -> - let root = - try - Some (HExtlib.input_file (pool () ^ name ^ rootfile)) - with Unix.Unix_error _ -> - logger `Warning ("Malformed development " ^ name); - None - in - match root with - | None -> acc - | Some root -> - developments := {root = root ; name = name} :: !developments; - root::acc) - [] l - in - let inc = Helm_registry.get_list Helm_registry.string "matita.includes" in - Helm_registry.set_list Helm_registry.of_string - ~key:"matita.includes" ~value:(inc @ paths) - -(* finds the makefile path for development devel *) -let makefile_for_development devel = - let develdir = pool () ^ devel.name in - develdir ^ "/makefile" - -let dot_for_development devel = - let dot_fname = pool () ^ devel.name ^ "/depend.dot" in - if Sys.file_exists dot_fname then Some dot_fname else None - -(* given a dir finds a development that is radicated in it or below *) -let development_for_dir dir = - let dir = normalize_path dir in - let is_prefix_of d1 d2 = - let len1 = String.length d1 in - let len2 = String.length d2 in - if len2 < len1 then - false - else - let pref = String.sub d2 0 len1 in - pref = d1 && (len1 = len2 || d2.[len1] = '/') - in - try - Some (List.find (fun d -> is_prefix_of d.root dir) !developments) - with Not_found | Failure _ -> None - -let development_for_name name = - try - Some (List.find (fun d -> d.name = name) !developments) - with Not_found -> None - -(* dumps the deveopment to disk *) -let dump_development devel = - let devel_dir = pool () ^ devel.name in - HExtlib.mkdir devel_dir; - HExtlib.output_file ~filename:(devel_dir ^ rootfile) ~text:devel.root - -let list_known_developments () = - List.map (fun r -> r.name,r.root) !developments - -let am_i_opt = lazy ( - if Pcre.pmatch ~pat:"\\.opt$" Sys.argv.(0) then ".opt" else "") - -let rebuild_makefile development = - let makefilepath = makefile_for_development development in - let template = - HExtlib.input_file BuildTimeConf.matitamake_makefile_template - in - let ext = Lazy.force am_i_opt in - let binpath = - if HExtlib.is_executable - (BuildTimeConf.runtime_base_dir ^ "/matitac" ^ ext) - then BuildTimeConf.runtime_base_dir ^ "/" else "" - in - let cc = binpath ^ "matitac" ^ ext in - let rm = binpath ^ "matitaclean" ^ ext in - let mm = binpath ^ "matitadep" ^ ext in - let df = pool () ^ development.name ^ "/depend" in - let template = Pcre.replace ~pat:"@ROOT@" ~templ:development.root template in - let template = Pcre.replace ~pat:"@CC@" ~templ:cc template in - let template = Pcre.replace ~pat:"@DEP@" ~templ:mm template in - let template = Pcre.replace ~pat:"@DEPFILE@" ~templ:df template in - let template = Pcre.replace ~pat:"@CLEAN@" ~templ:rm template in - HExtlib.output_file ~filename:makefilepath ~text:template - -let rebuild_makefile_devel development = - let path = development.root ^ "/makefile" in - if not (Sys.file_exists path) then - begin - let template = - HExtlib.input_file BuildTimeConf.matitamake_makefile_template_devel - in - let template = - Pcre.replace ~pat:"@MATITA_RT_BASE_DIR@" - ~templ:BuildTimeConf.runtime_base_dir template - in - HExtlib.output_file ~filename:path ~text:template - end - -(* creates a new development if possible *) -let initialize_development name dir = - let dir = normalize_path dir in - let name = Pcre.replace ~pat:" " ~templ:"_" name in - let dev = {name = name ; root = dir} in - dump_development dev; - rebuild_makefile dev; - rebuild_makefile_devel dev; - developments := dev :: !developments; - Some dev - -let make chdir args = - let old = Unix.getcwd () in - try - Unix.chdir chdir; - let cmd = String.concat " " ("make" :: List.map Filename.quote args) in - let rc = Unix.system cmd in - Unix.chdir old; - match rc with - | Unix.WEXITED 0 -> true - | Unix.WEXITED i -> logger `Error ("make returned " ^ string_of_int i);false - | _ -> logger `Error "make STOPPED or SIGNALED!";false - with Unix.Unix_error (_,cmd,err) -> - logger `Warning ("Unix Error: " ^ cmd ^ ": " ^ err); - false - -let call_make ?matita_flags development target make = - let matita_flags = - let already_defined = - match matita_flags with - | None -> (try Sys.getenv "MATITA_FLAGS" with Not_found -> "") - | Some s -> s - in - let bench = - if Helm_registry.get_bool "matita.bench" then " -bench" else "" - in - let system = - if Helm_registry.get_bool "matita.system" then " -system" else "" - in - let noinnertypes = - if Helm_registry.get_bool "matita.noinnertypes" then " -noinnertypes" else "" - in - already_defined ^ bench ^ system ^ noinnertypes - in - let csc = try ["SRC=" ^ Sys.getenv "SRC"] with Not_found -> [] in - rebuild_makefile development; - let makefile = makefile_for_development development in - let flags = [] in - let flags = - try - flags @ [ sprintf "MATITA_FLAGS=%s" matita_flags ] - with Not_found -> flags in - let flags = flags @ csc in - let args = - ["--no-print-directory"; "-s"; "-k"; "-f"; makefile; target] @ flags - in - (* prerr_endline (String.concat " " args); *) - make development.root args - -let build_development ?matita_flags ?(target="all") development = - call_make ?matita_flags development target make - -(* not really good vt100 *) -let vt100 s = - let rex = Pcre.regexp "\\[[0-9;]+m" in - let rex_i = Pcre.regexp "^Info" in - let rex_w = Pcre.regexp "^Warning" in - let rex_e = Pcre.regexp "^Error" in - let rex_d = Pcre.regexp "^Debug" in - let rex_noendline = Pcre.regexp "\\n" in - let s = Pcre.replace ~rex:rex_noendline s in - let tokens = Pcre.split ~rex s in - let logger = ref HLog.message in - let rec aux = - function - | [] -> () - | s::tl -> - (if Pcre.pmatch ~rex:rex_i s then - logger := HLog.message - else if Pcre.pmatch ~rex:rex_w s then - logger := HLog.warn - else if Pcre.pmatch ~rex:rex_e s then - logger := HLog.error - else if Pcre.pmatch ~rex:rex_d s then - logger := HLog.debug - else - !logger s); - aux tl - in - aux tokens - - -let mk_maker refresh_cb = - (fun chdir args -> - let out_r,out_w = Unix.pipe () in - let err_r,err_w = Unix.pipe () in - let pid = ref ~-1 in - let oldhandler = Sys.signal Sys.sigchld (Sys.Signal_ignore) in - try -(* prerr_endline (String.concat " " args); *) - let argv = Array.of_list ("make"::args) in - pid := Unix.create_process "make" argv Unix.stdin out_w err_w; - Unix.close out_w; - Unix.close err_w; - let buf = String.create 1024 in - let rec aux = function - | f::tl -> - let len = Unix.read f buf 0 1024 in - if len = 0 then - raise - (Unix.Unix_error - (Unix.EPIPE,"read","len = 0 (matita internal)")); - vt100 (String.sub buf 0 len); - aux tl - | _ -> () - in - while true do - let r,_,_ = Unix.select [out_r; err_r] [] [] (-. 1.) in - aux r; - refresh_cb () - done; - ignore(Sys.signal Sys.sigchld oldhandler); - true - with - | Unix.Unix_error (_,"read",_) - | Unix.Unix_error (_,"select",_) -> - ignore(Sys.signal Sys.sigchld oldhandler); - true) - -let build_development_in_bg ?matita_flags ?(target="all") refresh_cb development = - call_make ?matita_flags development target (mk_maker refresh_cb) - -let clean_development ?matita_flags development = - call_make ?matita_flags development "clean" make - -let clean_development_in_bg ?matita_flags refresh_cb development = - call_make development ?matita_flags "clean" (mk_maker refresh_cb) - -let destroy_development_aux development clean_development = - let delete_development development = - let unlink = HExtlib.safe_remove in - let rmdir dir = - try - Unix.rmdir dir - with Unix.Unix_error _ -> - logger `Warning ("Unable to remove dir " ^ dir); - match ls_dir dir with - | None -> logger `Error ("Unable to list directory " ^ dir) - | Some [] -> () - | Some l -> logger `Error ("The directory is not empty") - in - unlink (makefile_for_development development); - unlink (pool () ^ development.name ^ rootfile); - unlink (pool () ^ development.name ^ "/depend"); - unlink (pool () ^ development.name ^ "/depend.errors"); - unlink (pool () ^ development.name ^ "/depend.dot"); - rmdir (pool () ^ development.name); - developments := - List.filter (fun d -> d.name <> development.name) !developments - in - if not(clean_development development) then - begin - logger `Warning "Unable to clean the development problerly."; - logger `Warning "This may cause garbage." - end; - delete_development development - -let destroy_development ?matita_flags development = - destroy_development_aux development (clean_development ?matita_flags) - -let destroy_development_in_bg ?matita_flags refresh development = - destroy_development_aux development - (clean_development_in_bg refresh ?matita_flags ) - -let root_for_development development = development.root -let name_for_development development = development.name - -let publish_development_bstract build clean devel = - let matita_flags, matita_flags_system = - let orig_matita_flags = - try Sys.getenv "MATITA_FLAGS" with Not_found -> "" - in - orig_matita_flags, orig_matita_flags ^ " -system" - in - HLog.message "cleaning the development before publishing"; - if clean ~matita_flags devel then - begin - HLog.message "rebuilding the development in 'system' space"; - (* here we should use pristine metadata if we use sqlite *) - if build ~matita_flags:matita_flags_system devel then - begin - HLog.message "publishing succeded"; - true - end - else - begin - HLog.error "building process failed, reverting"; - if not (clean ~matita_flags devel) then - HLog.error "cleaning failed, end of the world (2)"; - false - end - end - else - (HLog.error "unable to clean the development, publishing failed"; false) - -let publish_development devel = - publish_development_bstract - (fun ~matita_flags devel -> build_development ~matita_flags devel) - (fun ~matita_flags devel -> clean_development ~matita_flags devel) devel -let publish_development_in_bg cb devel = - publish_development_bstract - (fun ~matita_flags devel -> build_development_in_bg cb ~matita_flags devel) - (fun ~matita_flags devel -> clean_development_in_bg cb ~matita_flags devel) - devel - diff --git a/helm/software/matita/matitamakeLib.mli b/helm/software/matita/matitamakeLib.mli deleted file mode 100644 index 8f6fda2e4..000000000 --- a/helm/software/matita/matitamakeLib.mli +++ /dev/null @@ -1,62 +0,0 @@ -(* Copyright (C) 2005, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -type development - -(* initialize_development [name] [dir] - * ask matitamake to recorder [dir] as the root for thedevelopment [name] *) -val initialize_development: string -> string -> development option -(* make target [default all] *) -val build_development: ?matita_flags:string -> ?target:string -> development -> bool -(* make target [default all], the refresh cb is called after every output *) -val build_development_in_bg: - ?matita_flags:string -> ?target:string -> (unit -> unit) -> development -> bool -(* make clean *) -val clean_development: ?matita_flags:string -> development -> bool -val clean_development_in_bg: ?matita_flags:string -> (unit -> unit) -> development -> bool - -val publish_development_in_bg: (unit -> unit) -> development -> bool -val publish_development: development -> bool - -(* return the development that handles dir *) -val development_for_dir: string -> development option -(* return the development *) -val development_for_name: string -> development option -(* return the known list of name, development_root *) -val list_known_developments: unit -> (string * string ) list -(* cleans the development, forgetting about it *) -val destroy_development: ?matita_flags:string -> development -> unit -val destroy_development_in_bg: ?matita_flags:string -> (unit -> unit) -> development -> unit -(* initiale internal data structures *) -val initialize : unit -> unit -(* gives back the root *) -val root_for_development : development -> string -(* gives back the name *) -val name_for_development : development -> string - -(** @return dot file for a given development, if it exists *) -val dot_for_development : development -> string option - -val normalize_path: string -> string diff --git a/helm/software/matita/matitaprover.ml b/helm/software/matita/matitaprover.ml deleted file mode 100644 index 7a6503ab3..000000000 --- a/helm/software/matita/matitaprover.ml +++ /dev/null @@ -1,136 +0,0 @@ -(* Copyright (C) 2006, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -let raw_preamble buri = " -inductive eq (A:Type) (x:A) : A \\to Prop \\def refl_eq : eq A x x. - -theorem sym_eq : \\forall A:Type.\\forall x,y:A. eq A x y \\to eq A y x. -intros.elim H. apply refl_eq. -qed. - -theorem eq_elim_r: - \\forall A:Type.\\forall x:A. \\forall P: A \\to Prop. - P x \\to \\forall y:A. eq A y x \\to P y. -intros. elim (sym_eq ? ? ? H1).assumption. -qed. - -theorem trans_eq : - \\forall A:Type.\\forall x,y,z:A. eq A x y \\to eq A y z \\to eq A x z. -intros.elim H1.assumption. -qed. - -default \"equality\" - " ^ buri ^ "/eq.ind - " ^ buri ^ "/sym_eq.con - " ^ buri ^ "/trans_eq.con - " ^ buri ^ "/eq_ind.con - " ^ buri ^ "/eq_elim_r.con - " ^ buri ^ "/eq_f.con - " ^ buri ^ "/eq_f1.con. - -theorem eq_f: \\forall A,B:Type.\\forall f:A\\to B. - \\forall x,y:A. eq A x y \\to eq B (f x) (f y). -intros.elim H.reflexivity. -qed. - -theorem eq_f1: \\forall A,B:Type.\\forall f:A\\to B. - \\forall x,y:A. eq A x y \\to eq B (f y) (f x). -intros.elim H.reflexivity. -qed. - -inductive ex (A:Type) (P:A \\to Prop) : Prop \\def - ex_intro: \\forall x:A. P x \\to ex A P. -interpretation \"exists\" 'exists \\eta.x = - (" ^ buri ^ "/ex.ind#xpointer(1/1) _ x). - -notation < \"hvbox(\\exists ident i opt (: ty) break . p)\" - right associative with precedence 20 -for @{ 'exists ${default - @{\\lambda ${ident i} : $ty. $p)} - @{\\lambda ${ident i} . $p}}}. - -" -;; - -let p_to_ma ?timeout ~tptppath ~filename () = - let data = - Tptp2grafite.tptp2grafite ?timeout ~filename ~tptppath:tptppath - ~raw_preamble () - in - data -;; - -let main () = - let tptppath = ref "./" in - let timeout = ref 600 in - MatitaInit.add_cmdline_spec - ["-tptppath",Arg.String (fun s -> tptppath:= s), - "Where to find the Axioms/ and Problems/ directory"; - "-timeout", Arg.Int (fun x -> timeout := x), - "Timeout in seconds"]; - MatitaInit.parse_cmdline_and_configuration_file (); - Helm_registry.set_bool "matita.nodisk" true; - HLog.set_log_callback (fun _ _ -> ()); - let args = Helm_registry.get_list Helm_registry.string "matita.args" in - let inputfile = - match args with - | [file] -> file - | _ -> prerr_endline "You must specify exactly one .p file."; exit 1 - in - let data = - p_to_ma ~timeout:!timeout ~filename:inputfile ~tptppath:!tptppath () - in -(* prerr_endline data; *) - let is = Ulexing.from_utf8_string data in - let gs = GrafiteSync.init () in - let ls = - CicNotation2.load_notation ~include_paths:[] - BuildTimeConf.core_notation_script - in - Sys.catch_break true; - try - let _ = - MatitaEngine.eval_from_stream - ~first_statement_only:false - ~include_paths:[] - ~clean_baseuri:true - ~do_heavy_checks:false - ~prompt:false - ls gs is - (fun _ _ -> ()) -(* - (fun _ s -> - let pp_ast_statement = - GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term - ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:CicNotationPp.pp_obj - in - prerr_endline (pp_ast_statement s)) -*) - in - exit 0 - with exn -> - prerr_endline (snd (MatitaExcPp.to_string exn)); - exit 1 -;; diff --git a/helm/software/matita/matitaprover.mli b/helm/software/matita/matitaprover.mli deleted file mode 100644 index e0b9cbf0b..000000000 --- a/helm/software/matita/matitaprover.mli +++ /dev/null @@ -1,29 +0,0 @@ -(* Copyright (C) 2006, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -val main: unit -> unit - -val p_to_ma: ?timeout:int -> tptppath:string -> filename:string -> unit -> string - diff --git a/helm/software/matita/matitatop.ml b/helm/software/matita/matitatop.ml deleted file mode 100644 index 0aba1e9b5..000000000 --- a/helm/software/matita/matitatop.ml +++ /dev/null @@ -1,31 +0,0 @@ -(* Copyright (C) 2004-2005, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -(* $Id$ *) - -let _ = - let _ = Topdirs.dir_quit in - Toploop.loop Format.std_formatter; - assert false diff --git a/helm/software/matita/rottener.ml b/helm/software/matita/rottener.ml deleted file mode 100644 index dfb64037e..000000000 --- a/helm/software/matita/rottener.ml +++ /dev/null @@ -1,169 +0,0 @@ -(* Copyright (C) 2007, HELM Team. - * - * This file is part of HELM, an Hypertextual, Electronic - * Library of Mathematics, developed at the Computer Science - * Department, University of Bologna, Italy. - * - * HELM is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * HELM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HELM; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - * - * For details, see the HELM World-Wide-Web page, - * http://helm.cs.unibo.it/ - *) - -open Printf - -module Ast = GrafiteAst -module Pt = CicNotationPt - - (* set to false to change identifier instead of adding extra identifiers *) -let add_ident = ref true - -let error_token = "O" -let error_token_len = String.length error_token - -let has_toplevel_term = function - | GrafiteParser.LSome (Ast.Executable (_, Ast.Command (_, Ast.Obj (loc, ( - Pt.Theorem ((`Definition | `Lemma | `Theorem), _, _, _) - (*| Pt.Inductive _*) - (*| Pt.Record _*) - ))))) -> - true - | _ -> false - -let flush_token_stream (stream, loc_func) = - let tok_count = ref ~-1 in - let rec aux acc = - let next_tok = - try Some (Stream.next stream) with Stream.Failure -> None in - match next_tok with - | None | Some ("EOI", _) -> List.rev acc - | Some tok -> - incr tok_count; - aux ((tok, loc_func !tok_count) :: acc) in - aux [] - -let rotten_script ~fname statement = - (* XXX terribly inefficient: the same script is read several times ... *) - let lexer = CicNotationLexer.level2_ast_lexer in - let token_stream, loc_func = - lexer.Token.tok_func (Obj.magic (Ulexing.from_utf8_string statement)) in - let tokens = flush_token_stream (token_stream, loc_func) in - let target_token, target_pos = - let rec sanitize_tokens acc = function - | [] -> List.rev acc - | (("IDENT", - ("theorem" | "definition" | "lemma" | "record" | "inductive")), _) - :: (("IDENT", _), _) :: tl -> - (* avoid rottening of object names *) - sanitize_tokens acc tl - | (("SYMBOL", ("∀" | "λ" | "Π")), _) :: (("IDENT", _), _) :: tl -> - (* avoid rottening of binders *) - let rec remove_args = function - | (("SYMBOL", ","), _) :: (("IDENT", _), _) :: tl -> - remove_args tl - | tl -> tl in - sanitize_tokens acc (remove_args tl) - | (("SYMBOL", "⇒"), _) as hd :: tl -> - (* avoid rottening of constructor names in pattern matching *) - let rec remove_until_branch_start = function - | (("SYMBOL", ("|" | "[")), _) :: tl -> tl - | hd :: tl -> remove_until_branch_start tl - | [] -> [] in - sanitize_tokens (hd :: remove_until_branch_start acc) tl - | hd :: tl -> (* every other identfier can be rottened! *) - sanitize_tokens (hd :: acc) tl in - let idents = - List.filter (function (("IDENT", _), _) -> true | _ -> false) - (sanitize_tokens [] tokens) in - List.nth idents (Random.int (List.length idents)) - in - let start_pos, end_pos = (* positions in bytecount *) - Glib.Utf8.offset_to_pos statement 0 (Stdpp.first_pos target_pos), - Glib.Utf8.offset_to_pos statement 0 (Stdpp.last_pos target_pos) in - let statement' = - if !add_ident then - String.sub statement 0 start_pos - ^ "O " - ^ String.sub statement start_pos (String.length statement - start_pos) - else - String.sub statement 0 start_pos - ^ "O" - ^ String.sub statement end_pos (String.length statement - end_pos) - in - let script = HExtlib.input_file fname in - let matches = - let rex = - Pcre.regexp ~flags:[`DOTALL] - (sprintf "^(.*)(%s)(.*)$" (Pcre.quote statement)) in - try - Pcre.extract ~rex script - with Not_found -> assert false - in - let trailer = (* trailing comment with machine parseable error location *) - let preamble_len = Glib.Utf8.length matches.(1) in - sprintf "\n(*\nerror-at: %d-%d\n*)\n" - (preamble_len + Stdpp.first_pos target_pos) - (preamble_len + Stdpp.first_pos target_pos + error_token_len) in - let script' = - sprintf "%s%s%s%s" matches.(1) statement' matches.(3) trailer in - let md5 = Digest.to_hex (Digest.string script') in - HExtlib.output_file - ~filename:(sprintf "%s.%s.rottened" fname md5) - ~text:script' - -let grep () = - let recursive = ref false in - let spec = [ - "-r", Arg.Set recursive, "enable directory recursion"; - ] in - MatitaInit.add_cmdline_spec spec; - MatitaInit.initialize_all (); - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in - let status = - CicNotation2.load_notation ~include_paths - BuildTimeConf.core_notation_script in - let path = - match Helm_registry.get_list Helm_registry.string "matita.args" with - | [ path ] -> path - | _ -> MatitaInit.die_usage () in - let grep_fun = - if !recursive then - (fun dirname -> - let sane_statements = - GrafiteWalker.rgrep_statement ~status ~dirname has_toplevel_term in - List.iter (fun (fname, statement) -> rotten_script ~fname statement) - sane_statements) - else - (fun fname -> - let sane_statements = - GrafiteWalker.grep_statement ~status ~fname has_toplevel_term in - List.iter (fun statement -> rotten_script ~fname statement) - sane_statements) - in - grep_fun path - -let handle_localized_exns f arg = - try - f arg - with HExtlib.Localized (loc, exn) -> - let loc_begin, loc_end = HExtlib.loc_of_floc loc in - eprintf "Error at %d-%d: %s\n%!" loc_begin loc_end (Printexc.to_string exn) - -let _ = - Random.self_init (); - handle_localized_exns grep () - diff --git a/helm/software/matita/rottenize_lib b/helm/software/matita/rottenize_lib deleted file mode 100755 index da4667566..000000000 --- a/helm/software/matita/rottenize_lib +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -x -make clean-rottened -./rottener.opt -r library/ diff --git a/helm/software/matita/template_makefile.in b/helm/software/matita/template_makefile.in deleted file mode 100644 index ac3e14498..000000000 --- a/helm/software/matita/template_makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -SRC=$(shell find @ROOT@ -name "*.ma" -a -type f) -SHORTSRC=$(echo $(SRC) | sed 's?^@ROOT@/??g') -TODO=$(SRC:%.ma=%.mo) - -MATITA_FLAGS= -MATITA_FLAGS+=-noprofile -NODB=false -ifeq ($(NODB),true) - MATITA_FLAGS += -nodb -endif - -MATITAC=@CC@ -MATITACLEAN=@CLEAN@ -MATITADEP=@DEP@ - -all: $(TODO) - -clean: - $(MATITACLEAN) $(MATITA_FLAGS) $(SRC) - rm -f $(TODO) @DEPFILE@ - -%.moo: - if [ -z "$<" ]; then \ - echo "missing dependencies for $@"; \ - else \ - $(MATITAC) $(MATITA_FLAGS) -q -I @ROOT@ $<; \ - fi - -@DEPFILE@ : $(SRC) - $(MATITADEP) $(MATITA_FLAGS) -I '@ROOT@' -dot @DEPFILE@.dot $^ \ - 1> @DEPFILE@ 2>@DEPFILE@.errors \ - || (echo;cat @DEPFILE@.errors;echo;rm @DEPFILE@;false) - -# this is the depend for full targets like: -# dir/dir/name.moo: dir/dir/name.ma dir/dep.moo -include @DEPFILE@ diff --git a/helm/software/matita/template_makefile_devel.in b/helm/software/matita/template_makefile_devel.in deleted file mode 100644 index 98b7c1f20..000000000 --- a/helm/software/matita/template_makefile_devel.in +++ /dev/null @@ -1,39 +0,0 @@ -H=@ - -RT_BASEDIR=$(shell if [ -x "@MATITA_RT_BASE_DIR@/matitamake" -o -x "@MATITA_RT_BASE_DIR@/matitamake.opt" ]; then echo "@MATITA_RT_BASE_DIR@"; else echo ""; fi) -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX="SRC=$(SRC)" -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall.opt - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - -preall.opt: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) init $(devel) diff --git a/helm/software/matita/tests/Makefile b/helm/software/matita/tests/Makefile new file mode 100644 index 000000000..063009116 --- /dev/null +++ b/helm/software/matita/tests/Makefile @@ -0,0 +1,14 @@ +DIR=$(shell basename $$PWD) + +$(DIR) all: + ../matitac 2>/dev/null +$(DIR).opt opt all.opt: + ../matitac.opt 2>/dev/null +clean: + ../matitaclean +clean.opt: + ../matitaclean.opt +depend: + ../matitadep +depend.opt: + ../matitadep.opt diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO001-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO001-1.p.ma index 87ee6a7c5..3cb2beeda 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO001-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO001-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO001-1". + include "logic/equality.ma". (* Inclusion of: BOO001-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO003-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO003-2.p.ma index a964a96ad..f41c21a1f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO003-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO003-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO003-2". + include "logic/equality.ma". (* Inclusion of: BOO003-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO003-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO003-4.p.ma index efeca0198..a3761dfa7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO003-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO003-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO003-4". + include "logic/equality.ma". (* Inclusion of: BOO003-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO004-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO004-2.p.ma index ff3cd85f9..abd4fa54f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO004-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO004-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO004-2". + include "logic/equality.ma". (* Inclusion of: BOO004-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO004-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO004-4.p.ma index 1821077fe..d4cc8aa8c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO004-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO004-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO004-4". + include "logic/equality.ma". (* Inclusion of: BOO004-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO005-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO005-2.p.ma index 5e3def47c..4ba359aeb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO005-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO005-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO005-2". + include "logic/equality.ma". (* Inclusion of: BOO005-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO005-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO005-4.p.ma index 9bd9ce8a9..06363d0c0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO005-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO005-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO005-4". + include "logic/equality.ma". (* Inclusion of: BOO005-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO006-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO006-2.p.ma index 77ea2d76b..3091ecaeb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO006-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO006-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO006-2". + include "logic/equality.ma". (* Inclusion of: BOO006-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO006-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO006-4.p.ma index c05bd84fc..9eeab88a0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO006-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO006-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO006-4". + include "logic/equality.ma". (* Inclusion of: BOO006-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO009-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO009-2.p.ma index ce93dc23b..ac47a7375 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO009-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO009-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO009-2". + include "logic/equality.ma". (* Inclusion of: BOO009-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO009-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO009-4.p.ma index 67631beb7..00794316a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO009-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO009-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO009-4". + include "logic/equality.ma". (* Inclusion of: BOO009-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO010-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO010-2.p.ma index 9517fa3ed..5863f860b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO010-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO010-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO010-2". + include "logic/equality.ma". (* Inclusion of: BOO010-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO010-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO010-4.p.ma index 6cd030d5a..0a392b221 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO010-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO010-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO010-4". + include "logic/equality.ma". (* Inclusion of: BOO010-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO011-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO011-2.p.ma index 33f8f9a87..e9cbcd929 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO011-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO011-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO011-2". + include "logic/equality.ma". (* Inclusion of: BOO011-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO011-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO011-4.p.ma index 5855e8aee..c61c06d42 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO011-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO011-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO011-4". + include "logic/equality.ma". (* Inclusion of: BOO011-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO012-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO012-2.p.ma index 3572d8750..40d9d9b53 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO012-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO012-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO012-2". + include "logic/equality.ma". (* Inclusion of: BOO012-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO012-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO012-4.p.ma index fb67030b9..4c3ad768c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO012-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO012-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO012-4". + include "logic/equality.ma". (* Inclusion of: BOO012-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO013-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO013-2.p.ma index 0f538a7da..5dd357b06 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO013-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO013-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO013-2". + include "logic/equality.ma". (* Inclusion of: BOO013-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO013-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO013-4.p.ma index f4b986a97..2a948d54c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO013-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO013-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO013-4". + include "logic/equality.ma". (* Inclusion of: BOO013-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO016-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO016-2.p.ma index ee7c9969c..f096eb8ae 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO016-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO016-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO016-2". + include "logic/equality.ma". (* Inclusion of: BOO016-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO017-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO017-2.p.ma index 5691fcfb0..95dfd1ba1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO017-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO017-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO017-2". + include "logic/equality.ma". (* Inclusion of: BOO017-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO018-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO018-4.p.ma index 32fe9a460..3c867cf28 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO018-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO018-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO018-4". + include "logic/equality.ma". (* Inclusion of: BOO018-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO034-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO034-1.p.ma index adab6c4ae..d4c19b5fb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO034-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO034-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO034-1". + include "logic/equality.ma". (* Inclusion of: BOO034-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO069-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO069-1.p.ma index 38bbe0e44..44559bdea 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO069-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO069-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO069-1". + include "logic/equality.ma". (* Inclusion of: BOO069-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO071-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO071-1.p.ma index 1cddbb9ae..b84cf7df2 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO071-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO071-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO071-1". + include "logic/equality.ma". (* Inclusion of: BOO071-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/BOO075-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/BOO075-1.p.ma index 971fa231a..ae56431c7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/BOO075-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/BOO075-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO075-1". + include "logic/equality.ma". (* Inclusion of: BOO075-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL004-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL004-3.p.ma index f9a7712ee..e982e3513 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL004-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL004-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL004-3". + include "logic/equality.ma". (* Inclusion of: COL004-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL007-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL007-1.p.ma index 655b2a2ce..b5c637281 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL007-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL007-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL007-1". + include "logic/equality.ma". (* Inclusion of: COL007-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL008-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL008-1.p.ma index a3ff086db..0e9db587e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL008-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL008-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL008-1". + include "logic/equality.ma". (* Inclusion of: COL008-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL010-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL010-1.p.ma index 45bd7de31..421552442 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL010-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL010-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL010-1". + include "logic/equality.ma". (* Inclusion of: COL010-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL012-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL012-1.p.ma index 866be5178..58b5de1f3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL012-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL012-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL012-1". + include "logic/equality.ma". (* Inclusion of: COL012-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL013-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL013-1.p.ma index 07d594e3c..d6290447f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL013-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL013-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL013-1". + include "logic/equality.ma". (* Inclusion of: COL013-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL014-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL014-1.p.ma index 6e618736a..5f92c04ba 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL014-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL014-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL014-1". + include "logic/equality.ma". (* Inclusion of: COL014-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL015-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL015-1.p.ma index fcff6921c..2d77c6c6f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL015-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL015-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL015-1". + include "logic/equality.ma". (* Inclusion of: COL015-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL016-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL016-1.p.ma index 37a3765cb..4da683f9a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL016-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL016-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL016-1". + include "logic/equality.ma". (* Inclusion of: COL016-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL017-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL017-1.p.ma index 36d03e6e5..62f30c7a0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL017-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL017-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL017-1". + include "logic/equality.ma". (* Inclusion of: COL017-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL018-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL018-1.p.ma index e218bae4a..325fde8ce 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL018-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL018-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL018-1". + include "logic/equality.ma". (* Inclusion of: COL018-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL021-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL021-1.p.ma index e8f9c3579..4b809bd6e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL021-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL021-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL021-1". + include "logic/equality.ma". (* Inclusion of: COL021-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL022-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL022-1.p.ma index a311f146f..183ea8551 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL022-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL022-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL022-1". + include "logic/equality.ma". (* Inclusion of: COL022-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL024-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL024-1.p.ma index c38e40574..a779158ba 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL024-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL024-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL024-1". + include "logic/equality.ma". (* Inclusion of: COL024-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL025-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL025-1.p.ma index a7fa25856..46b622eb5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL025-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL025-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL025-1". + include "logic/equality.ma". (* Inclusion of: COL025-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL045-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL045-1.p.ma index df48469b0..5863d6ffd 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL045-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL045-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL045-1". + include "logic/equality.ma". (* Inclusion of: COL045-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL048-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL048-1.p.ma index a0435b2c2..deb4006f5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL048-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL048-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL048-1". + include "logic/equality.ma". (* Inclusion of: COL048-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL050-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL050-1.p.ma index 10f25dc2a..e8383c1b1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL050-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL050-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL050-1". + include "logic/equality.ma". (* Inclusion of: COL050-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL058-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL058-2.p.ma index 5b216a3d2..b109ddc68 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL058-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL058-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL058-2". + include "logic/equality.ma". (* Inclusion of: COL058-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL058-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL058-3.p.ma index 2235cb57d..b5ed2f6ad 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL058-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL058-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL058-3". + include "logic/equality.ma". (* Inclusion of: COL058-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL060-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL060-2.p.ma index da151819a..3dcfb651e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL060-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL060-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL060-2". + include "logic/equality.ma". (* Inclusion of: COL060-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL060-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL060-3.p.ma index d1ff7bc9b..202a46864 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL060-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL060-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL060-3". + include "logic/equality.ma". (* Inclusion of: COL060-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL061-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL061-2.p.ma index 81adc265d..e85df51f3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL061-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL061-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL061-2". + include "logic/equality.ma". (* Inclusion of: COL061-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL061-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL061-3.p.ma index 0359b3ce9..aa80c3f36 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL061-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL061-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL061-3". + include "logic/equality.ma". (* Inclusion of: COL061-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL062-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL062-2.p.ma index 383a285e8..48ff2a903 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL062-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL062-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL062-2". + include "logic/equality.ma". (* Inclusion of: COL062-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL062-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL062-3.p.ma index 8b65e0c4f..b335f6908 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL062-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL062-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL062-3". + include "logic/equality.ma". (* Inclusion of: COL062-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL063-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL063-2.p.ma index 02f91ef49..2050c35cd 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL063-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL063-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL063-2". + include "logic/equality.ma". (* Inclusion of: COL063-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL063-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL063-3.p.ma index 70205ee89..8e5671ae3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL063-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL063-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL063-3". + include "logic/equality.ma". (* Inclusion of: COL063-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL063-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL063-4.p.ma index 38bb35318..bf6fdb5b7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL063-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL063-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL063-4". + include "logic/equality.ma". (* Inclusion of: COL063-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL063-5.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL063-5.p.ma index 4c98273b5..35d1a0c48 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL063-5.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL063-5.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL063-5". + include "logic/equality.ma". (* Inclusion of: COL063-5.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL063-6.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL063-6.p.ma index 19fbd39fa..608ba68ab 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL063-6.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL063-6.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL063-6". + include "logic/equality.ma". (* Inclusion of: COL063-6.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-2.p.ma index 4e6d8af15..5bdab285a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-2". + include "logic/equality.ma". (* Inclusion of: COL064-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-3.p.ma index 5644d38c1..898040321 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-3". + include "logic/equality.ma". (* Inclusion of: COL064-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-4.p.ma index 34fbe9349..d964987e1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-4". + include "logic/equality.ma". (* Inclusion of: COL064-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-5.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-5.p.ma index 414887588..9ea160cdb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-5.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-5.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-5". + include "logic/equality.ma". (* Inclusion of: COL064-5.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-6.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-6.p.ma index 4d054e035..b2e7fad83 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-6.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-6.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-6". + include "logic/equality.ma". (* Inclusion of: COL064-6.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-7.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-7.p.ma index 1c3ddc2f2..a1a903e80 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-7.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-7.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-7". + include "logic/equality.ma". (* Inclusion of: COL064-7.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-8.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-8.p.ma index 120a6d047..1a72e8482 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-8.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-8.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-8". + include "logic/equality.ma". (* Inclusion of: COL064-8.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL064-9.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL064-9.p.ma index 07591bb4c..521947e4d 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL064-9.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL064-9.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL064-9". + include "logic/equality.ma". (* Inclusion of: COL064-9.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL083-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL083-1.p.ma index 89d991761..5580a76cc 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL083-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL083-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL083-1". + include "logic/equality.ma". (* Inclusion of: COL083-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL084-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL084-1.p.ma index 4d2d057bc..8813fc43b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL084-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL084-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL084-1". + include "logic/equality.ma". (* Inclusion of: COL084-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL085-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL085-1.p.ma index 7fd4279ce..0e0cac71b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL085-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL085-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL085-1". + include "logic/equality.ma". (* Inclusion of: COL085-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/COL086-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/COL086-1.p.ma index e4527c48b..2fce42e46 100644 --- a/helm/software/matita/tests/TPTP/Veloci/COL086-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/COL086-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/COL086-1". + include "logic/equality.ma". (* Inclusion of: COL086-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP001-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP001-2.p.ma index d4e79c748..07a012a4a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP001-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP001-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP001-2". + include "logic/equality.ma". (* Inclusion of: GRP001-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP001-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP001-4.p.ma index 544eaf116..01683bfdf 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP001-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP001-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP001-4". + include "logic/equality.ma". (* Inclusion of: GRP001-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP010-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP010-4.p.ma index b6a3f51c1..a7a94c741 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP010-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP010-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP010-4". + include "logic/equality.ma". (* Inclusion of: GRP010-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP011-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP011-4.p.ma index 6391656ba..a935ade1c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP011-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP011-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP011-4". + include "logic/equality.ma". (* Inclusion of: GRP011-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP012-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP012-4.p.ma index ed5338825..067a3f7de 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP012-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP012-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP012-4". + include "logic/equality.ma". (* Inclusion of: GRP012-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP022-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP022-2.p.ma index db2519fe6..a87fe3a57 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP022-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP022-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP022-2". + include "logic/equality.ma". (* Inclusion of: GRP022-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP023-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP023-2.p.ma index 4ad352201..c1a22f39a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP023-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP023-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP023-2". + include "logic/equality.ma". (* Inclusion of: GRP023-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP115-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP115-1.p.ma index 6c605ee94..e6fed36fa 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP115-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP115-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP115-1". + include "logic/equality.ma". (* Inclusion of: GRP115-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP116-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP116-1.p.ma index 3cc4b5719..25e483f3b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP116-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP116-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP116-1". + include "logic/equality.ma". (* Inclusion of: GRP116-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP117-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP117-1.p.ma index 8768d0eab..31fcdf4bb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP117-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP117-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP117-1". + include "logic/equality.ma". (* Inclusion of: GRP117-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP118-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP118-1.p.ma index 4d01353ea..aeb184a1e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP118-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP118-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP118-1". + include "logic/equality.ma". (* Inclusion of: GRP118-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP136-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP136-1.p.ma index e108ae55b..091644967 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP136-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP136-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP136-1". + include "logic/equality.ma". (* Inclusion of: GRP136-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP137-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP137-1.p.ma index 322702cc5..6d1b6b2a0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP137-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP137-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP137-1". + include "logic/equality.ma". (* Inclusion of: GRP137-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP139-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP139-1.p.ma index cf868c306..1752d8580 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP139-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP139-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP139-1". + include "logic/equality.ma". (* Inclusion of: GRP139-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP141-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP141-1.p.ma index 3706a25d7..84e880f7a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP141-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP141-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP141-1". + include "logic/equality.ma". (* Inclusion of: GRP141-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP142-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP142-1.p.ma index 1f13705e1..a8dfa8d6f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP142-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP142-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP142-1". + include "logic/equality.ma". (* Inclusion of: GRP142-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP143-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP143-1.p.ma index be00186ae..c32dac6b7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP143-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP143-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP143-1". + include "logic/equality.ma". (* Inclusion of: GRP143-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP144-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP144-1.p.ma index be20f1901..1ffa96eeb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP144-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP144-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP144-1". + include "logic/equality.ma". (* Inclusion of: GRP144-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP145-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP145-1.p.ma index 032cdfd55..fb0233e25 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP145-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP145-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP145-1". + include "logic/equality.ma". (* Inclusion of: GRP145-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP146-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP146-1.p.ma index 6bacee188..ee91a7e45 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP146-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP146-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP146-1". + include "logic/equality.ma". (* Inclusion of: GRP146-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP149-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP149-1.p.ma index e6c7d4ff6..bcc3de3be 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP149-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP149-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP149-1". + include "logic/equality.ma". (* Inclusion of: GRP149-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP150-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP150-1.p.ma index f612ede8e..569788972 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP150-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP150-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP150-1". + include "logic/equality.ma". (* Inclusion of: GRP150-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP151-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP151-1.p.ma index 240c266b2..d08424625 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP151-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP151-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP151-1". + include "logic/equality.ma". (* Inclusion of: GRP151-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP152-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP152-1.p.ma index d9078e5fb..f795a6412 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP152-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP152-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP152-1". + include "logic/equality.ma". (* Inclusion of: GRP152-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP153-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP153-1.p.ma index 7dc86aa7e..e6abb3997 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP153-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP153-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP153-1". + include "logic/equality.ma". (* Inclusion of: GRP153-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP154-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP154-1.p.ma index 51832886c..501deedf7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP154-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP154-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP154-1". + include "logic/equality.ma". (* Inclusion of: GRP154-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP155-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP155-1.p.ma index 7a940e531..42503caae 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP155-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP155-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP155-1". + include "logic/equality.ma". (* Inclusion of: GRP155-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP156-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP156-1.p.ma index 544290f56..fcb186c2a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP156-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP156-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP156-1". + include "logic/equality.ma". (* Inclusion of: GRP156-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP157-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP157-1.p.ma index 63868e1bf..3f1fe8911 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP157-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP157-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP157-1". + include "logic/equality.ma". (* Inclusion of: GRP157-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP158-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP158-1.p.ma index 710c30a1b..f156eaec4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP158-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP158-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP158-1". + include "logic/equality.ma". (* Inclusion of: GRP158-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP159-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP159-1.p.ma index ca0b0ffdf..752911c3d 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP159-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP159-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP159-1". + include "logic/equality.ma". (* Inclusion of: GRP159-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP160-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP160-1.p.ma index 1d49bcea1..2a98c44ae 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP160-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP160-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP160-1". + include "logic/equality.ma". (* Inclusion of: GRP160-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP161-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP161-1.p.ma index ff4878fbc..b96a0d70a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP161-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP161-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP161-1". + include "logic/equality.ma". (* Inclusion of: GRP161-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP162-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP162-1.p.ma index 4d4fa4e5e..b5b33a25a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP162-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP162-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP162-1". + include "logic/equality.ma". (* Inclusion of: GRP162-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP163-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP163-1.p.ma index 3065332b9..e9dfaebaf 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP163-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP163-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP163-1". + include "logic/equality.ma". (* Inclusion of: GRP163-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP168-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP168-1.p.ma index 905257851..59bd4a635 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP168-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP168-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP168-1". + include "logic/equality.ma". (* Inclusion of: GRP168-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP168-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP168-2.p.ma index 8e6697270..d575e4366 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP168-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP168-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP168-2". + include "logic/equality.ma". (* Inclusion of: GRP168-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP173-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP173-1.p.ma index d6b61595c..9f5b22b10 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP173-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP173-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP173-1". + include "logic/equality.ma". (* Inclusion of: GRP173-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP174-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP174-1.p.ma index bd8fecc10..b08649ba6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP174-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP174-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP174-1". + include "logic/equality.ma". (* Inclusion of: GRP174-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP176-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP176-1.p.ma index fe03f9f02..28e992d2d 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP176-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP176-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP176-1". + include "logic/equality.ma". (* Inclusion of: GRP176-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP176-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP176-2.p.ma index 153ac5806..73db9743a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP176-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP176-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP176-2". + include "logic/equality.ma". (* Inclusion of: GRP176-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP182-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP182-1.p.ma index b2166c28f..68c61f9f4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP182-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP182-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP182-1". + include "logic/equality.ma". (* Inclusion of: GRP182-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP182-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP182-2.p.ma index f8955ab0e..ba9ab8705 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP182-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP182-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP182-2". + include "logic/equality.ma". (* Inclusion of: GRP182-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP182-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP182-3.p.ma index fa4e6ce23..744ad2e04 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP182-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP182-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP182-3". + include "logic/equality.ma". (* Inclusion of: GRP182-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP182-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP182-4.p.ma index 95fb312fb..7c11b0fa4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP182-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP182-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP182-4". + include "logic/equality.ma". (* Inclusion of: GRP182-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP186-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP186-3.p.ma index a39543178..a2fd0a9eb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP186-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP186-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP186-3". + include "logic/equality.ma". (* Inclusion of: GRP186-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP186-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP186-4.p.ma index be8354b19..421da6945 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP186-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP186-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP186-4". + include "logic/equality.ma". (* Inclusion of: GRP186-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP188-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP188-1.p.ma index da64fdee3..7ca52046b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP188-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP188-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP188-1". + include "logic/equality.ma". (* Inclusion of: GRP188-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP188-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP188-2.p.ma index 771056e01..c9dc85905 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP188-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP188-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP188-2". + include "logic/equality.ma". (* Inclusion of: GRP188-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP189-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP189-1.p.ma index 183e7b772..4978c31d2 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP189-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP189-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP189-1". + include "logic/equality.ma". (* Inclusion of: GRP189-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP189-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP189-2.p.ma index 0b47a1614..b36fa01a9 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP189-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP189-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP189-2". + include "logic/equality.ma". (* Inclusion of: GRP189-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP192-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP192-1.p.ma index 01ca783b0..f7b77e363 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP192-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP192-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP192-1". + include "logic/equality.ma". (* Inclusion of: GRP192-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP206-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP206-1.p.ma index 9c5b5bcce..08544742a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP206-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP206-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP206-1". + include "logic/equality.ma". (* Inclusion of: GRP206-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP454-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP454-1.p.ma index 257fdd49a..d0d0b9ce0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP454-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP454-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP454-1". + include "logic/equality.ma". (* Inclusion of: GRP454-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP455-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP455-1.p.ma index deaa9a2f0..5a981ed5a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP455-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP455-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP455-1". + include "logic/equality.ma". (* Inclusion of: GRP455-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP456-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP456-1.p.ma index 228a4f3a6..c9787c2c5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP456-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP456-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP456-1". + include "logic/equality.ma". (* Inclusion of: GRP456-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP457-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP457-1.p.ma index acd2050d2..1bb70c158 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP457-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP457-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP457-1". + include "logic/equality.ma". (* Inclusion of: GRP457-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP458-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP458-1.p.ma index 44091f50e..f3a52a241 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP458-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP458-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP458-1". + include "logic/equality.ma". (* Inclusion of: GRP458-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP459-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP459-1.p.ma index 303f73741..7c717aac6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP459-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP459-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP459-1". + include "logic/equality.ma". (* Inclusion of: GRP459-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP460-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP460-1.p.ma index 698ac8a23..c97120d43 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP460-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP460-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP460-1". + include "logic/equality.ma". (* Inclusion of: GRP460-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP463-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP463-1.p.ma index fcd04c0c5..31e130867 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP463-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP463-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP463-1". + include "logic/equality.ma". (* Inclusion of: GRP463-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP467-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP467-1.p.ma index 1107f4b98..8b295b557 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP467-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP467-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP467-1". + include "logic/equality.ma". (* Inclusion of: GRP467-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP481-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP481-1.p.ma index bf063d591..af2dbb515 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP481-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP481-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP481-1". + include "logic/equality.ma". (* Inclusion of: GRP481-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP484-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP484-1.p.ma index e8588f917..ae8efa8b6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP484-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP484-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP484-1". + include "logic/equality.ma". (* Inclusion of: GRP484-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP485-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP485-1.p.ma index 2a015e13e..77afd17a3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP485-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP485-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP485-1". + include "logic/equality.ma". (* Inclusion of: GRP485-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP486-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP486-1.p.ma index ccdaf0ea9..1517c62d8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP486-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP486-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP486-1". + include "logic/equality.ma". (* Inclusion of: GRP486-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP487-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP487-1.p.ma index a26acef17..83a1864cf 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP487-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP487-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP487-1". + include "logic/equality.ma". (* Inclusion of: GRP487-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP488-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP488-1.p.ma index ff1c3c177..b588912d9 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP488-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP488-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP488-1". + include "logic/equality.ma". (* Inclusion of: GRP488-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP490-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP490-1.p.ma index 78e958798..32e96c095 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP490-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP490-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP490-1". + include "logic/equality.ma". (* Inclusion of: GRP490-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP491-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP491-1.p.ma index 221fdb592..a3bfcd369 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP491-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP491-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP491-1". + include "logic/equality.ma". (* Inclusion of: GRP491-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP492-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP492-1.p.ma index e9f198d2d..c353c8dd4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP492-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP492-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP492-1". + include "logic/equality.ma". (* Inclusion of: GRP492-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP493-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP493-1.p.ma index fc0bf16ce..b3b6e1113 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP493-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP493-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP493-1". + include "logic/equality.ma". (* Inclusion of: GRP493-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP494-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP494-1.p.ma index ea863067a..d731521ca 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP494-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP494-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP494-1". + include "logic/equality.ma". (* Inclusion of: GRP494-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP495-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP495-1.p.ma index 225028412..376a7fb3e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP495-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP495-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP495-1". + include "logic/equality.ma". (* Inclusion of: GRP495-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP496-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP496-1.p.ma index efe2d3a94..6116704e9 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP496-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP496-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP496-1". + include "logic/equality.ma". (* Inclusion of: GRP496-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP497-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP497-1.p.ma index c2f5d7be9..2f36dfcea 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP497-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP497-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP497-1". + include "logic/equality.ma". (* Inclusion of: GRP497-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP498-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP498-1.p.ma index c5875b0b2..a838cf615 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP498-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP498-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP498-1". + include "logic/equality.ma". (* Inclusion of: GRP498-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP509-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP509-1.p.ma index 25618b46a..633a5eb89 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP509-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP509-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP509-1". + include "logic/equality.ma". (* Inclusion of: GRP509-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP510-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP510-1.p.ma index 1003a4014..2c054d9fa 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP510-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP510-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP510-1". + include "logic/equality.ma". (* Inclusion of: GRP510-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP511-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP511-1.p.ma index ff8c9f4c0..9a25b0d9b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP511-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP511-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP511-1". + include "logic/equality.ma". (* Inclusion of: GRP511-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP512-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP512-1.p.ma index 19a8c4a94..fa17d9922 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP512-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP512-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP512-1". + include "logic/equality.ma". (* Inclusion of: GRP512-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP513-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP513-1.p.ma index 03409c949..c5f734d01 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP513-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP513-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP513-1". + include "logic/equality.ma". (* Inclusion of: GRP513-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP514-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP514-1.p.ma index 90593b6c8..7fde98484 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP514-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP514-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP514-1". + include "logic/equality.ma". (* Inclusion of: GRP514-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP515-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP515-1.p.ma index 7b526ef97..489631234 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP515-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP515-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP515-1". + include "logic/equality.ma". (* Inclusion of: GRP515-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP516-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP516-1.p.ma index af15eb7ee..15a873c65 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP516-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP516-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP516-1". + include "logic/equality.ma". (* Inclusion of: GRP516-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP517-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP517-1.p.ma index a488717cd..e4a0a13d6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP517-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP517-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP517-1". + include "logic/equality.ma". (* Inclusion of: GRP517-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP518-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP518-1.p.ma index a953ab610..7c5ef76cc 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP518-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP518-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP518-1". + include "logic/equality.ma". (* Inclusion of: GRP518-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP520-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP520-1.p.ma index ea992df71..3c5f1a9b5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP520-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP520-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP520-1". + include "logic/equality.ma". (* Inclusion of: GRP520-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP541-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP541-1.p.ma index a8f428a0d..7f9233193 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP541-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP541-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP541-1". + include "logic/equality.ma". (* Inclusion of: GRP541-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP542-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP542-1.p.ma index 848748d87..d144c114b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP542-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP542-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP542-1". + include "logic/equality.ma". (* Inclusion of: GRP542-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP543-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP543-1.p.ma index cfc5bab58..5fe948ea6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP543-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP543-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP543-1". + include "logic/equality.ma". (* Inclusion of: GRP543-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP544-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP544-1.p.ma index 96fb69f73..ffaeb374f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP544-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP544-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP544-1". + include "logic/equality.ma". (* Inclusion of: GRP544-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP545-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP545-1.p.ma index 302fb8916..523a17259 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP545-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP545-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP545-1". + include "logic/equality.ma". (* Inclusion of: GRP545-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP546-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP546-1.p.ma index 2488a9484..b4de2a169 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP546-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP546-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP546-1". + include "logic/equality.ma". (* Inclusion of: GRP546-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP547-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP547-1.p.ma index 24ede0fe7..bba8f9f07 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP547-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP547-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP547-1". + include "logic/equality.ma". (* Inclusion of: GRP547-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP548-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP548-1.p.ma index a065d3f1b..be679cf9b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP548-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP548-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP548-1". + include "logic/equality.ma". (* Inclusion of: GRP548-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP549-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP549-1.p.ma index 0bf4dbf1c..55c6e1f1a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP549-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP549-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP549-1". + include "logic/equality.ma". (* Inclusion of: GRP549-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP550-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP550-1.p.ma index a7482f9b5..340171a78 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP550-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP550-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP550-1". + include "logic/equality.ma". (* Inclusion of: GRP550-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP551-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP551-1.p.ma index 3144369c2..d67a994ea 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP551-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP551-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP551-1". + include "logic/equality.ma". (* Inclusion of: GRP551-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP552-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP552-1.p.ma index 9a776c962..e3b3324c8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP552-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP552-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP552-1". + include "logic/equality.ma". (* Inclusion of: GRP552-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP556-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP556-1.p.ma index f314261a2..4817e4e1b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP556-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP556-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP556-1". + include "logic/equality.ma". (* Inclusion of: GRP556-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP558-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP558-1.p.ma index 35670d9cb..da6a12f62 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP558-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP558-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP558-1". + include "logic/equality.ma". (* Inclusion of: GRP558-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP560-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP560-1.p.ma index 113f49edf..aa3fb6419 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP560-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP560-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP560-1". + include "logic/equality.ma". (* Inclusion of: GRP560-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP561-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP561-1.p.ma index dc788b109..2ea4db80e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP561-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP561-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP561-1". + include "logic/equality.ma". (* Inclusion of: GRP561-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP562-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP562-1.p.ma index 99ea92789..b3160a042 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP562-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP562-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP562-1". + include "logic/equality.ma". (* Inclusion of: GRP562-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP564-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP564-1.p.ma index 63b1c2d97..b6071cc66 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP564-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP564-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP564-1". + include "logic/equality.ma". (* Inclusion of: GRP564-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP565-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP565-1.p.ma index ad4f93570..57f5b453d 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP565-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP565-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP565-1". + include "logic/equality.ma". (* Inclusion of: GRP565-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP566-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP566-1.p.ma index 71a827e47..1307c5f23 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP566-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP566-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP566-1". + include "logic/equality.ma". (* Inclusion of: GRP566-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP567-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP567-1.p.ma index 6fbd3492b..2ec8690a4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP567-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP567-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP567-1". + include "logic/equality.ma". (* Inclusion of: GRP567-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP568-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP568-1.p.ma index 884ed5e5c..1d63a33f3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP568-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP568-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP568-1". + include "logic/equality.ma". (* Inclusion of: GRP568-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP569-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP569-1.p.ma index 931c933ba..58f139e4c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP569-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP569-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP569-1". + include "logic/equality.ma". (* Inclusion of: GRP569-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP570-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP570-1.p.ma index d6bdbbfc6..a25f40129 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP570-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP570-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP570-1". + include "logic/equality.ma". (* Inclusion of: GRP570-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP572-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP572-1.p.ma index c3e517cef..9467a1d9b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP572-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP572-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP572-1". + include "logic/equality.ma". (* Inclusion of: GRP572-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP573-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP573-1.p.ma index 8076345cc..c45c0e87e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP573-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP573-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP573-1". + include "logic/equality.ma". (* Inclusion of: GRP573-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP574-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP574-1.p.ma index e6f9dfcec..d2f51431f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP574-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP574-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP574-1". + include "logic/equality.ma". (* Inclusion of: GRP574-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP576-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP576-1.p.ma index aed52d2de..9851667be 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP576-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP576-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP576-1". + include "logic/equality.ma". (* Inclusion of: GRP576-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP577-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP577-1.p.ma index ad7c58b9e..16f1de1b6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP577-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP577-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP577-1". + include "logic/equality.ma". (* Inclusion of: GRP577-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP578-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP578-1.p.ma index 7c9843da7..f1b196450 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP578-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP578-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP578-1". + include "logic/equality.ma". (* Inclusion of: GRP578-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP580-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP580-1.p.ma index 4d729b995..6bcb954fd 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP580-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP580-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP580-1". + include "logic/equality.ma". (* Inclusion of: GRP580-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP581-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP581-1.p.ma index d826e2af1..fa1906ded 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP581-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP581-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP581-1". + include "logic/equality.ma". (* Inclusion of: GRP581-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP582-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP582-1.p.ma index 4c09bb39c..c20b7e4e8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP582-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP582-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP582-1". + include "logic/equality.ma". (* Inclusion of: GRP582-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP583-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP583-1.p.ma index fa95c336a..ed4130734 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP583-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP583-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP583-1". + include "logic/equality.ma". (* Inclusion of: GRP583-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP584-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP584-1.p.ma index db36e336b..84d08821a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP584-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP584-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP584-1". + include "logic/equality.ma". (* Inclusion of: GRP584-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP586-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP586-1.p.ma index f38467e27..0cf2ec1db 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP586-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP586-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP586-1". + include "logic/equality.ma". (* Inclusion of: GRP586-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP588-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP588-1.p.ma index 1d13edfbe..662725950 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP588-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP588-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP588-1". + include "logic/equality.ma". (* Inclusion of: GRP588-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP590-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP590-1.p.ma index f678b3d83..5d587a0e1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP590-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP590-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP590-1". + include "logic/equality.ma". (* Inclusion of: GRP590-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP592-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP592-1.p.ma index 5612e2720..96c9444ca 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP592-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP592-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP592-1". + include "logic/equality.ma". (* Inclusion of: GRP592-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP595-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP595-1.p.ma index e97f64cd3..7491debbf 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP595-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP595-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP595-1". + include "logic/equality.ma". (* Inclusion of: GRP595-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP596-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP596-1.p.ma index 1d8e313ac..c12dfe9ac 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP596-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP596-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP596-1". + include "logic/equality.ma". (* Inclusion of: GRP596-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP597-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP597-1.p.ma index 5923b8e70..df6892318 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP597-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP597-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP597-1". + include "logic/equality.ma". (* Inclusion of: GRP597-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP598-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP598-1.p.ma index 133ed30f6..2f416fbb0 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP598-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP598-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP598-1". + include "logic/equality.ma". (* Inclusion of: GRP598-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP599-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP599-1.p.ma index 31716a710..e55bfc443 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP599-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP599-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP599-1". + include "logic/equality.ma". (* Inclusion of: GRP599-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP600-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP600-1.p.ma index 07535f9bb..f17fdf2cc 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP600-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP600-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP600-1". + include "logic/equality.ma". (* Inclusion of: GRP600-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP602-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP602-1.p.ma index 620ddb94e..bcb8a0053 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP602-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP602-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP602-1". + include "logic/equality.ma". (* Inclusion of: GRP602-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP603-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP603-1.p.ma index 6d7b92f84..82144c1f8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP603-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP603-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP603-1". + include "logic/equality.ma". (* Inclusion of: GRP603-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP604-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP604-1.p.ma index 9e228851d..811970fd5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP604-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP604-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP604-1". + include "logic/equality.ma". (* Inclusion of: GRP604-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP605-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP605-1.p.ma index 89084a07b..5725d6a19 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP605-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP605-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP605-1". + include "logic/equality.ma". (* Inclusion of: GRP605-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP606-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP606-1.p.ma index 09742e1ac..567592450 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP606-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP606-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP606-1". + include "logic/equality.ma". (* Inclusion of: GRP606-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP608-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP608-1.p.ma index de5945331..43fd1ed20 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP608-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP608-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP608-1". + include "logic/equality.ma". (* Inclusion of: GRP608-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP612-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP612-1.p.ma index 3dec26708..c7aa5405b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP612-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP612-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP612-1". + include "logic/equality.ma". (* Inclusion of: GRP612-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP613-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP613-1.p.ma index 206e1edcb..2557b85af 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP613-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP613-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP613-1". + include "logic/equality.ma". (* Inclusion of: GRP613-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP614-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP614-1.p.ma index 203d3f216..27cf8fec1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP614-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP614-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP614-1". + include "logic/equality.ma". (* Inclusion of: GRP614-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP615-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP615-1.p.ma index 2fe6234f6..7be06ff72 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP615-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP615-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP615-1". + include "logic/equality.ma". (* Inclusion of: GRP615-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/GRP616-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/GRP616-1.p.ma index 6649a53d8..762df9925 100644 --- a/helm/software/matita/tests/TPTP/Veloci/GRP616-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/GRP616-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/GRP616-1". + include "logic/equality.ma". (* Inclusion of: GRP616-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT008-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT008-1.p.ma index a8ee942e6..de65d6e9c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT008-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT008-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT008-1". + include "logic/equality.ma". (* Inclusion of: LAT008-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT033-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT033-1.p.ma index e1897a414..9d53a1f55 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT033-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT033-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT033-1". + include "logic/equality.ma". (* Inclusion of: LAT033-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT034-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT034-1.p.ma index 37ce834ab..2ae473b10 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT034-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT034-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT034-1". + include "logic/equality.ma". (* Inclusion of: LAT034-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT039-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT039-1.p.ma index 8ad8654fc..7165bc391 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT039-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT039-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT039-1". + include "logic/equality.ma". (* Inclusion of: LAT039-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT039-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT039-2.p.ma index de4e55ffa..7000124f6 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT039-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT039-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT039-2". + include "logic/equality.ma". (* Inclusion of: LAT039-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT040-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT040-1.p.ma index a4ff6eff6..a9b80b2a2 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT040-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT040-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT040-1". + include "logic/equality.ma". (* Inclusion of: LAT040-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LAT045-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LAT045-1.p.ma index 0b58207db..802ed388b 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LAT045-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LAT045-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LAT045-1". + include "logic/equality.ma". (* Inclusion of: LAT045-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL110-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL110-2.p.ma index 442ce5958..0467eb2a8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL110-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL110-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL110-2". + include "logic/equality.ma". (* Inclusion of: LCL110-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL112-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL112-2.p.ma index 473cf328c..bc5a0af03 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL112-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL112-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL112-2". + include "logic/equality.ma". (* Inclusion of: LCL112-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL113-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL113-2.p.ma index c310916a7..6a19126a7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL113-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL113-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL113-2". + include "logic/equality.ma". (* Inclusion of: LCL113-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL114-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL114-2.p.ma index 46cc01727..98042d05f 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL114-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL114-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL114-2". + include "logic/equality.ma". (* Inclusion of: LCL114-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL115-2.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL115-2.p.ma index 158fef7e8..2bce680be 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL115-2.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL115-2.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL115-2". + include "logic/equality.ma". (* Inclusion of: LCL115-2.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL132-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL132-1.p.ma index 330e40369..9705e8af4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL132-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL132-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL132-1". + include "logic/equality.ma". (* Inclusion of: LCL132-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL133-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL133-1.p.ma index acd9538be..39de88054 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL133-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL133-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL133-1". + include "logic/equality.ma". (* Inclusion of: LCL133-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL134-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL134-1.p.ma index d400f7cff..de3321654 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL134-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL134-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL134-1". + include "logic/equality.ma". (* Inclusion of: LCL134-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL135-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL135-1.p.ma index 9a982d8af..9c7fbd5f8 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL135-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL135-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL135-1". + include "logic/equality.ma". (* Inclusion of: LCL135-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL139-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL139-1.p.ma index 21a301128..88914ef32 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL139-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL139-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL139-1". + include "logic/equality.ma". (* Inclusion of: LCL139-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL140-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL140-1.p.ma index c5148d2a8..e701562f9 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL140-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL140-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL140-1". + include "logic/equality.ma". (* Inclusion of: LCL140-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL141-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL141-1.p.ma index 5f816e926..fb49a5760 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL141-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL141-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL141-1". + include "logic/equality.ma". (* Inclusion of: LCL141-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL153-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL153-1.p.ma index 827b99214..f23d00e59 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL153-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL153-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL153-1". + include "logic/equality.ma". (* Inclusion of: LCL153-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL154-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL154-1.p.ma index 169be886a..1d4c41b30 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL154-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL154-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL154-1". + include "logic/equality.ma". (* Inclusion of: LCL154-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL155-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL155-1.p.ma index d5cb7fb5e..cf915a8a1 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL155-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL155-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL155-1". + include "logic/equality.ma". (* Inclusion of: LCL155-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL156-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL156-1.p.ma index 3d5df92b6..9390e4be5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL156-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL156-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL156-1". + include "logic/equality.ma". (* Inclusion of: LCL156-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL157-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL157-1.p.ma index 97ea2cad9..18c64d538 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL157-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL157-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL157-1". + include "logic/equality.ma". (* Inclusion of: LCL157-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL158-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL158-1.p.ma index 32a4518b7..e6e04fac4 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL158-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL158-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL158-1". + include "logic/equality.ma". (* Inclusion of: LCL158-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL161-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL161-1.p.ma index 3961b05d8..090b2a7a5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL161-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL161-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL161-1". + include "logic/equality.ma". (* Inclusion of: LCL161-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LCL164-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LCL164-1.p.ma index 8850280e9..e5bc4b513 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LCL164-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LCL164-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LCL164-1". + include "logic/equality.ma". (* Inclusion of: LCL164-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LDA001-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/LDA001-1.p.ma index 48e8b32cc..1963dca39 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LDA001-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LDA001-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LDA001-1". + include "logic/equality.ma". (* Inclusion of: LDA001-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/LDA007-3.p.ma b/helm/software/matita/tests/TPTP/Veloci/LDA007-3.p.ma index 534a5a9fd..1aeda095a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/LDA007-3.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/LDA007-3.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/LDA007-3". + include "logic/equality.ma". (* Inclusion of: LDA007-3.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG007-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG007-4.p.ma index a9cdabd1d..97fc8aecb 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG007-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG007-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG007-4". + include "logic/equality.ma". (* Inclusion of: RNG007-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG008-4.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG008-4.p.ma index c56142d62..8652ab6d5 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG008-4.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG008-4.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG008-4". + include "logic/equality.ma". (* Inclusion of: RNG008-4.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG011-5.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG011-5.p.ma index f7df33340..edd9c7110 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG011-5.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG011-5.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG011-5". + include "logic/equality.ma". (* Inclusion of: RNG011-5.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG023-6.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG023-6.p.ma index e69e40345..aa8f019d7 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG023-6.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG023-6.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG023-6". + include "logic/equality.ma". (* Inclusion of: RNG023-6.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG023-7.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG023-7.p.ma index 49260d096..63ae3d9a9 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG023-7.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG023-7.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG023-7". + include "logic/equality.ma". (* Inclusion of: RNG023-7.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG024-6.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG024-6.p.ma index bdb4c04a7..f4282d600 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG024-6.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG024-6.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG024-6". + include "logic/equality.ma". (* Inclusion of: RNG024-6.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/RNG024-7.p.ma b/helm/software/matita/tests/TPTP/Veloci/RNG024-7.p.ma index afb63d9f6..b4d302383 100644 --- a/helm/software/matita/tests/TPTP/Veloci/RNG024-7.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/RNG024-7.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/RNG024-7". + include "logic/equality.ma". (* Inclusion of: RNG024-7.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/ROB002-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/ROB002-1.p.ma index 81aabc975..aca76f33d 100644 --- a/helm/software/matita/tests/TPTP/Veloci/ROB002-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/ROB002-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/ROB002-1". + include "logic/equality.ma". (* Inclusion of: ROB002-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/ROB009-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/ROB009-1.p.ma index e3e2ad2b4..4dadbbb6a 100644 --- a/helm/software/matita/tests/TPTP/Veloci/ROB009-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/ROB009-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/ROB009-1". + include "logic/equality.ma". (* Inclusion of: ROB009-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/ROB010-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/ROB010-1.p.ma index 76f06f1af..ec3632d11 100644 --- a/helm/software/matita/tests/TPTP/Veloci/ROB010-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/ROB010-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/ROB010-1". + include "logic/equality.ma". (* Inclusion of: ROB010-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/ROB013-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/ROB013-1.p.ma index 3039f3412..44e1bf65c 100644 --- a/helm/software/matita/tests/TPTP/Veloci/ROB013-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/ROB013-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/ROB013-1". + include "logic/equality.ma". (* Inclusion of: ROB013-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/TPTP/Veloci/ROB030-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/ROB030-1.p.ma index 72fe9de94..d7fc2ebc3 100644 --- a/helm/software/matita/tests/TPTP/Veloci/ROB030-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/ROB030-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/ROB030-1". + include "logic/equality.ma". (* Inclusion of: ROB030-1.p *) (* ------------------------------------------------------------------------------ *) diff --git a/helm/software/matita/tests/TPTP/Veloci/SYN083-1.p.ma b/helm/software/matita/tests/TPTP/Veloci/SYN083-1.p.ma index c8ac354f0..85efba55e 100644 --- a/helm/software/matita/tests/TPTP/Veloci/SYN083-1.p.ma +++ b/helm/software/matita/tests/TPTP/Veloci/SYN083-1.p.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/SYN083-1". + include "logic/equality.ma". (* Inclusion of: SYN083-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/absurd.ma b/helm/software/matita/tests/absurd.ma index 3a9719e41..9499b63e2 100644 --- a/helm/software/matita/tests/absurd.ma +++ b/helm/software/matita/tests/absurd.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/absurd/". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias id "not" = "cic:/Coq/Init/Logic/not.con". diff --git a/helm/software/matita/tests/apply.ma b/helm/software/matita/tests/apply.ma index a77c99ca1..7295a73b5 100644 --- a/helm/software/matita/tests/apply.ma +++ b/helm/software/matita/tests/apply.ma @@ -13,8 +13,8 @@ (**************************************************************************) (* test _with_ the WHD on the apply argument *) -set "baseuri" "cic:/matita/tests/apply/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "not" = "cic:/Coq/Init/Logic/not.con". alias id "False" = "cic:/Coq/Init/Logic/False.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/apply2.ma b/helm/software/matita/tests/apply2.ma index db87636d7..1d0198fcb 100644 --- a/helm/software/matita/tests/apply2.ma +++ b/helm/software/matita/tests/apply2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/apply2". + include "nat/nat.ma". diff --git a/helm/software/matita/tests/applys.ma b/helm/software/matita/tests/applys.ma index a26594613..fa0d36998 100644 --- a/helm/software/matita/tests/applys.ma +++ b/helm/software/matita/tests/applys.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/applys". + include "nat/div_and_mod.ma". include "nat/factorial.ma". diff --git a/helm/software/matita/tests/assumption.ma b/helm/software/matita/tests/assumption.ma index 4b7859e6b..9128f20c6 100644 --- a/helm/software/matita/tests/assumption.ma +++ b/helm/software/matita/tests/assumption.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/assumption". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias num (instance 0) = "Coq natural number". diff --git a/helm/software/matita/tests/bad_induction.ma b/helm/software/matita/tests/bad_induction.ma index b009e18d1..172aa8e11 100644 --- a/helm/software/matita/tests/bad_induction.ma +++ b/helm/software/matita/tests/bad_induction.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/nat/bad_induction". + include "nat/nat.ma". diff --git a/helm/software/matita/tests/bad_tests/auto.ma b/helm/software/matita/tests/bad_tests/auto.ma index 2972bfa62..35a2496e6 100755 --- a/helm/software/matita/tests/bad_tests/auto.ma +++ b/helm/software/matita/tests/bad_tests/auto.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/auto/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "O" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/1)". alias id "S" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/2)". diff --git a/helm/software/matita/tests/bad_tests/baseuri.ma b/helm/software/matita/tests/bad_tests/baseuri.ma index 0e06223fa..127de8565 100644 --- a/helm/software/matita/tests/bad_tests/baseuri.ma +++ b/helm/software/matita/tests/bad_tests/baseuri.ma @@ -12,5 +12,5 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/baseuri/". -set "baseuri" "cic:/matita/tests/baseuri/". + + diff --git a/helm/software/matita/tests/bool.ma b/helm/software/matita/tests/bool.ma index fe39c310f..3318b74cd 100644 --- a/helm/software/matita/tests/bool.ma +++ b/helm/software/matita/tests/bool.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/bool/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/change.ma b/helm/software/matita/tests/change.ma index 214d0fbe3..fca6c846d 100644 --- a/helm/software/matita/tests/change.ma +++ b/helm/software/matita/tests/change.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/change/". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "Coq natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias symbol "plus" (instance 0) = "Coq's natural plus". diff --git a/helm/software/matita/tests/clear.ma b/helm/software/matita/tests/clear.ma index 617965258..25c1b64f2 100644 --- a/helm/software/matita/tests/clear.ma +++ b/helm/software/matita/tests/clear.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/clear". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias id "True" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/clearbody.ma b/helm/software/matita/tests/clearbody.ma index 3c95a8a1f..bac472d67 100644 --- a/helm/software/matita/tests/clearbody.ma +++ b/helm/software/matita/tests/clearbody.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/clearbody". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "Coq natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias symbol "plus" (instance 0) = "Coq's natural plus". diff --git a/helm/software/matita/tests/coercions.ma b/helm/software/matita/tests/coercions.ma index ca8c4abab..e9026af33 100644 --- a/helm/software/matita/tests/coercions.ma +++ b/helm/software/matita/tests/coercions.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/coercions/". + include "nat/compare.ma". include "nat/times.ma". diff --git a/helm/software/matita/tests/coercions_contravariant.ma b/helm/software/matita/tests/coercions_contravariant.ma index 64f85ea75..153c295c5 100644 --- a/helm/software/matita/tests/coercions_contravariant.ma +++ b/helm/software/matita/tests/coercions_contravariant.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". + include "logic/equality.ma". include "nat/nat.ma". @@ -26,8 +26,8 @@ axiom d : ∀n,m. B n -> B1 m. axiom f : ∀n,m. A n -> B m. axiom g : ∀n.B n. -coercion cic:/matita/test/c.con. -coercion cic:/matita/test/d.con. +coercion cic:/matita/tests/coercions_contravariant/c.con. +coercion cic:/matita/tests/coercions_contravariant/d.con. definition foo := λn,n1,m,m1.(λx.d m m1 (f n m (c n1 n x)) : A1 n1 -> B1 m1). definition foo1_1 := λn,n1,m,m1.(f n m : A1 n1 -> B1 m1). @@ -35,4 +35,4 @@ definition foo1_1 := λn,n1,m,m1.(f n m : A1 n1 -> B1 m1). definition h := λn,m.λx:A n.g m. definition foo2 := λn,n1,m,m1.(h n m : A1 n1 -> B1 m1). definition foo3 := λn1,n,m,m1.(h n m : A1 n1 -> B1 m1). -definition foo4 := λn1,n,m1,m.(h n m : A1 n1 -> B1 m1). \ No newline at end of file +definition foo4 := λn1,n,m1,m.(h n m : A1 n1 -> B1 m1). diff --git a/helm/software/matita/tests/coercions_dependent.ma b/helm/software/matita/tests/coercions_dependent.ma index b89abbf21..3b6602bbb 100644 --- a/helm/software/matita/tests/coercions_dependent.ma +++ b/helm/software/matita/tests/coercions_dependent.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". + include "nat/nat.ma". include "list/list.ma". @@ -27,7 +27,7 @@ axiom c : ∀A,B.∀l:list A.vec B (length A l). axiom veclen : ∀A,n.vec A n -> nat. -coercion cic:/matita/test/c.con. +coercion cic:/matita/tests/coercions_dependent/c.con. alias num (instance 0) = "natural number". definition xxx := veclen nat ? [3; 4; 7]. diff --git a/helm/software/matita/tests/coercions_dupelim.ma b/helm/software/matita/tests/coercions_dupelim.ma index bfe2b3438..5c1c0c9f8 100644 --- a/helm/software/matita/tests/coercions_dupelim.ma +++ b/helm/software/matita/tests/coercions_dupelim.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". + include "nat/nat.ma". diff --git a/helm/software/matita/tests/coercions_nonuniform.ma b/helm/software/matita/tests/coercions_nonuniform.ma index 0cf156537..f21d82911 100644 --- a/helm/software/matita/tests/coercions_nonuniform.ma +++ b/helm/software/matita/tests/coercions_nonuniform.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/coercions_nonuniform/". + axiom A : Type. axiom B : A -> Type. @@ -21,7 +21,7 @@ axiom f1 : A -> A. axiom k : ∀a:A.B (f a). -coercion cic:/matita/test/coercions_nonuniform/k.con. +coercion cic:/matita/tests/coercions_nonuniform/k.con. axiom C : Type. @@ -33,8 +33,8 @@ axiom C : Type. axiom c2 : ∀a.B (f a) -> B (f1 a). axiom c1 : ∀a:A. B (f1 a) -> C. -coercion cic:/matita/test/coercions_nonuniform/c1.con. -coercion cic:/matita/test/coercions_nonuniform/c2.con. +coercion cic:/matita/tests/coercions_nonuniform/c1.con. +coercion cic:/matita/tests/coercions_nonuniform/c2.con. axiom g : C -> C. @@ -43,4 +43,4 @@ definition test := λa:A.g a. (* Coq < Coercion c1 : B >-> C. User error: c1 does not respect the inheritance uniform condition -*) \ No newline at end of file +*) diff --git a/helm/software/matita/tests/coercions_open.ma b/helm/software/matita/tests/coercions_open.ma index d0d8caedb..69723aa89 100644 --- a/helm/software/matita/tests/coercions_open.ma +++ b/helm/software/matita/tests/coercions_open.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". + include "logic/equality.ma". include "nat/nat.ma". @@ -27,12 +27,12 @@ axiom eatB : ∀n. B n -> A O. axiom jmcBA : ∀n,m.∀p:A n = B m.B m -> A n. axiom jmcAB : ∀n,m.∀p:A n = B m.A n -> B m. -coercion cic:/matita/test/jmcAB.con. -coercion cic:/matita/test/jmcBA.con. +coercion cic:/matita/tests/coercions_open/jmcAB.con. +coercion cic:/matita/tests/coercions_open/jmcBA.con. axiom daemon : ∀x,y:A O.x = y. alias num (instance 0) = "natural number". lemma xx : ∀b:B 2.∀a:A 1.eatA ? b = eatB ? a. intros; [3,5,7,9: apply AB|1: apply daemon];skip. -qed. \ No newline at end of file +qed. diff --git a/helm/software/matita/tests/coercions_propagation.ma b/helm/software/matita/tests/coercions_propagation.ma index 63c48e66b..7e3536b07 100644 --- a/helm/software/matita/tests/coercions_propagation.ma +++ b/helm/software/matita/tests/coercions_propagation.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/coercions_propagation/". + include "logic/connectives.ma". include "nat/orders.ma". @@ -21,15 +21,15 @@ inductive sigma (A:Type) (P:A → Prop) : Type ≝ sigma_intro: ∀a:A. P a → sigma A P. interpretation "sigma" 'exists \eta.x = - (cic:/matita/test/coercions_propagation/sigma.ind#xpointer(1/1) _ x). + (cic:/matita/tests/coercions_propagation/sigma.ind#xpointer(1/1) _ x). definition inject ≝ λP.λa:nat.λp:P a. sigma_intro ? P ? p. -coercion cic:/matita/test/coercions_propagation/inject.con 0 1. +coercion cic:/matita/tests/coercions_propagation/inject.con 0 1. definition eject ≝ λP.λc: ∃n:nat.P n. match c with [ sigma_intro w _ ⇒ w]. -coercion cic:/matita/test/coercions_propagation/eject.con. +coercion cic:/matita/tests/coercions_propagation/eject.con. alias num (instance 0) = "natural number". theorem test: ∃n. 0 ≤ n. @@ -71,11 +71,11 @@ inductive NN (A:Type) : nat -> Type ≝ definition injectN ≝ λA,k.λP.λa:NN A k.λp:P a. sigma_intro ? P ? p. -coercion cic:/matita/test/coercions_propagation/injectN.con 0 1. +coercion cic:/matita/tests/coercions_propagation/injectN.con 0 1. definition ejectN ≝ λA,k.λP.λc: ∃n:NN A k.P n. match c with [ sigma_intro w _ ⇒ w]. -coercion cic:/matita/test/coercions_propagation/ejectN.con. +coercion cic:/matita/tests/coercions_propagation/ejectN.con. definition PN := λA,k.λx:NN A k. 1 <= k. diff --git a/helm/software/matita/tests/coercions_russell.ma b/helm/software/matita/tests/coercions_russell.ma index 36217ad9d..203faece5 100644 --- a/helm/software/matita/tests/coercions_russell.ma +++ b/helm/software/matita/tests/coercions_russell.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/russell/". + include "nat/orders.ma". include "list/list.ma". @@ -22,15 +22,15 @@ inductive sigma (A:Type) (P:A → Prop) : Type ≝ sig_intro: ∀a:A. P a → sigma A P. interpretation "sigma" 'exists \eta.x = - (cic:/matita/test/russell/sigma.ind#xpointer(1/1) _ x). + (cic:/matita/tests/coercions_russell/sigma.ind#xpointer(1/1) _ x). definition inject ≝ λP.λa:list nat.λp:P a. sig_intro ? P ? p. -coercion cic:/matita/test/russell/inject.con 0 1. +coercion cic:/matita/tests/coercions_russell/inject.con 0 1. definition eject ≝ λP.λc: ∃n:list nat.P n. match c with [ sig_intro w _ ⇒ w]. -coercion cic:/matita/test/russell/eject.con. +coercion cic:/matita/tests/coercions_russell/eject.con. alias symbol "exists" (instance 2) = "exists". lemma tl : ∀l:list nat. l ≠ [] → ∃l1.∃a.a :: l1 = l. @@ -55,7 +55,7 @@ qed. definition nat_return := λn:nat. Some ? n. -coercion cic:/matita/test/russell/nat_return.con. +coercion cic:/matita/tests/coercions_russell/nat_return.con. definition raise_exn := None nat. @@ -76,11 +76,11 @@ include "nat/compare.ma". definition inject_opt ≝ λP.λa:option nat.λp:P a. sig_intro ? P ? p. -coercion cic:/matita/test/russell/inject_opt.con 0 1. +coercion cic:/matita/tests/coercions_russell/inject_opt.con 0 1. definition eject_opt ≝ λP.λc: ∃n:option nat.P n. match c with [ sig_intro w _ ⇒ w]. -coercion cic:/matita/test/russell/eject_opt.con. +coercion cic:/matita/tests/coercions_russell/eject_opt.con. (* we may define mem as in the following lemma and get rid of it *) definition find_spec ≝ @@ -106,7 +106,7 @@ definition if : ∀A:Type.bool → A → A → A ≝ notation < "'If' \nbsp b \nbsp 'Then' \nbsp t \nbsp 'Else' \nbsp f" for @{ 'if $b $t $f }. notation > "'If' b 'Then' t 'Else' f" for @{ 'if $b $t $f }. -interpretation "if" 'if a b c = (cic:/matita/test/russell/if.con _ a b c). +interpretation "if" 'if a b c = (cic:/matita/tests/coercions_russell/if.con _ a b c). definition sigma_find_spec : ∀p,l. sigma ? (λres.find_spec l p res). (* define the find function *) diff --git a/helm/software/matita/tests/comments.ma b/helm/software/matita/tests/comments.ma index cb54a90d3..dfb631203 100644 --- a/helm/software/matita/tests/comments.ma +++ b/helm/software/matita/tests/comments.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/comments/". -include "../legacy/coq.ma". + +include "coq.ma". (* commento che va nell'ast, ma non viene contato come step perche' non e' un executable diff --git a/helm/software/matita/tests/compose.ma b/helm/software/matita/tests/compose.ma index 5d6035777..02316c6e0 100644 --- a/helm/software/matita/tests/compose.ma +++ b/helm/software/matita/tests/compose.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/compose/LCL002-1". + include "logic/equality.ma". theorem an_1: diff --git a/helm/software/matita/tests/constructor.ma b/helm/software/matita/tests/constructor.ma index f33044f12..8e785ba82 100644 --- a/helm/software/matita/tests/constructor.ma +++ b/helm/software/matita/tests/constructor.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/constructor". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/continuationals.ma b/helm/software/matita/tests/continuationals.ma index a9d85ce25..ad9d73c4b 100644 --- a/helm/software/matita/tests/continuationals.ma +++ b/helm/software/matita/tests/continuationals.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/continuationals". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "S" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/2)". diff --git a/helm/software/matita/tests/contradiction.ma b/helm/software/matita/tests/contradiction.ma index ed1ef6b3c..a8d8bc3b1 100644 --- a/helm/software/matita/tests/contradiction.ma +++ b/helm/software/matita/tests/contradiction.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/contradiction". -include "../legacy/coq.ma". + +include "coq.ma". alias id "True" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1)". alias id "not" = "cic:/Coq/Init/Logic/not.con". alias num (instance 0) = "natural number". diff --git a/helm/software/matita/tests/cut.ma b/helm/software/matita/tests/cut.ma index 24d17f13d..1de0ead4a 100644 --- a/helm/software/matita/tests/cut.ma +++ b/helm/software/matita/tests/cut.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/cut". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/decl.ma b/helm/software/matita/tests/decl.ma index 40f8d3700..5308f9350 100644 --- a/helm/software/matita/tests/decl.ma +++ b/helm/software/matita/tests/decl.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/decl". + include "nat/times.ma". include "nat/orders.ma". diff --git a/helm/software/matita/tests/decompose.ma b/helm/software/matita/tests/decompose.ma index 2ba58c158..39d04755e 100644 --- a/helm/software/matita/tests/decompose.ma +++ b/helm/software/matita/tests/decompose.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/decompose". + include "logic/connectives.ma". diff --git a/helm/software/matita/tests/demodulation_coq.ma b/helm/software/matita/tests/demodulation_coq.ma index cb7a830eb..037f19260 100644 --- a/helm/software/matita/tests/demodulation_coq.ma +++ b/helm/software/matita/tests/demodulation_coq.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/demodulation/". -include "../legacy/coq.ma". + +include "coq.ma". alias num = "Coq natural number". alias symbol "times" = "Coq's natural times". diff --git a/helm/software/matita/tests/demodulation_matita.ma b/helm/software/matita/tests/demodulation_matita.ma index 0f4827e46..d1201a6c4 100644 --- a/helm/software/matita/tests/demodulation_matita.ma +++ b/helm/software/matita/tests/demodulation_matita.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/demodulation_matita/". + include "nat/minus.ma". diff --git a/helm/software/matita/tests/dependent_injection.ma b/helm/software/matita/tests/dependent_injection.ma index e217a7652..c58da98a9 100644 --- a/helm/software/matita/tests/dependent_injection.ma +++ b/helm/software/matita/tests/dependent_injection.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/dependent_injection". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "bool" = "cic:/Coq/Init/Datatypes/bool.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/dependent_type_inference.ma b/helm/software/matita/tests/dependent_type_inference.ma index 11a42acac..d52faff17 100644 --- a/helm/software/matita/tests/dependent_type_inference.ma +++ b/helm/software/matita/tests/dependent_type_inference.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/dependent_type_inference/". + include "nat/nat.ma". diff --git a/helm/software/matita/tests/depends b/helm/software/matita/tests/depends new file mode 100644 index 000000000..200a4088c --- /dev/null +++ b/helm/software/matita/tests/depends @@ -0,0 +1,350 @@ +naiveparamod.ma logic/equality.ma +coercions_nonuniform.ma +paramodulation.ma coq.ma +demodulation_coq.ma coq.ma +assumption.ma coq.ma +elim.ma coq.ma +generalize.ma coq.ma +comments.ma coq.ma +overred.ma logic/equality.ma +clear.ma coq.ma +metasenv_ordering.ma coq.ma +tinycals.ma logic/connectives.ma +demodulation_matita.ma nat/minus.ma +fguidi.ma coq.ma +inversion2.ma coq.ma +absurd.ma coq.ma +decompose.ma logic/connectives.ma +unfold.ma coq.ma +dependent_injection.ma coq.ma +tacticals.ma +multiple_inheritance.ma logic/equality.ma +second.ma first.ma +destruct.ma datatypes/constructors.ma logic/equality.ma nat/nat.ma +test3.ma coq.ma +continuationals.ma coq.ma +coercions_dupelim.ma logic/equality.ma nat/nat.ma +apply.ma coq.ma +coercions_open.ma logic/equality.ma nat/nat.ma +match_inference.ma +hard_refine.ma coq.ma +fix_betareduction.ma coq.ma +push_pop_status_aux1.ma +push_pop_status.ma push_pop_status_aux1.ma +decl.ma nat/orders.ma nat/times.ma +pullback.ma +mysql_escaping.ma +rewrite.ma coq.ma +push_pop_status_aux2.ma +injection.ma coq.ma +contradiction.ma coq.ma +fold.ma coq.ma +coercions.ma nat/compare.ma nat/times.ma +record.ma +bad_induction.ma logic/equality.ma nat/nat.ma +first.ma +cut.ma coq.ma +letrecand.ma nat/nat.ma +coercions_contravariant.ma logic/equality.ma nat/nat.ma +test4.ma coq.ma +dependent_type_inference.ma nat/nat.ma +coercions_propagation.ma logic/connectives.ma nat/orders.ma +letrec.ma +apply2.ma nat/nat.ma +inversion.ma coq.ma +replace.ma coq.ma +applys.ma nat/div_and_mod.ma nat/factorial.ma nat/primes.ma +third.ma first.ma second.ma +simpl.ma coq.ma +coercions_dependent.ma decidable_kit/list_aux.ma list/list.ma nat/nat.ma +constructor.ma coq.ma +test2.ma coq.ma +compose.ma logic/equality.ma +coercions_russell.ma datatypes/bool.ma datatypes/constructors.ma list/list.ma list/sort.ma nat/compare.ma nat/orders.ma +clearbody.ma coq.ma +bool.ma coq.ma +change.ma coq.ma +interactive/grafite.ma +interactive/drop.ma +interactive/test7.ma +interactive/automatic_insertion.ma +interactive/test5.ma +interactive/test_instance.ma +interactive/test6.ma +bad_tests/baseuri.ma +bad_tests/auto.ma coq.ma +paramodulation/irratsqrt2.ma nat/minus.ma nat/times.ma +paramodulation/boolean_algebra.ma coq.ma +paramodulation/group.ma coq.ma +paramodulation/BOO075-1.ma +TPTP/Veloci/BOO012-4.p.ma logic/equality.ma +TPTP/Veloci/COL064-2.p.ma logic/equality.ma +TPTP/Veloci/COL012-1.p.ma logic/equality.ma +TPTP/Veloci/GRP570-1.p.ma logic/equality.ma +TPTP/Veloci/GRP189-1.p.ma logic/equality.ma +TPTP/Veloci/COL008-1.p.ma logic/equality.ma +TPTP/Veloci/COL062-3.p.ma logic/equality.ma +TPTP/Veloci/SYN083-1.p.ma logic/equality.ma +TPTP/Veloci/LAT039-2.p.ma logic/equality.ma +TPTP/Veloci/GRP173-1.p.ma logic/equality.ma +TPTP/Veloci/COL015-1.p.ma logic/equality.ma +TPTP/Veloci/RNG024-6.p.ma logic/equality.ma +TPTP/Veloci/COL062-2.p.ma logic/equality.ma +TPTP/Veloci/GRP576-1.p.ma logic/equality.ma +TPTP/Veloci/GRP137-1.p.ma logic/equality.ma +TPTP/Veloci/COL063-5.p.ma logic/equality.ma +TPTP/Veloci/COL045-1.p.ma logic/equality.ma +TPTP/Veloci/GRP011-4.p.ma logic/equality.ma +TPTP/Veloci/GRP578-1.p.ma logic/equality.ma +TPTP/Veloci/GRP168-1.p.ma logic/equality.ma +TPTP/Veloci/GRP588-1.p.ma logic/equality.ma +TPTP/Veloci/BOO005-2.p.ma logic/equality.ma +TPTP/Veloci/GRP161-1.p.ma logic/equality.ma +TPTP/Veloci/COL050-1.p.ma logic/equality.ma +TPTP/Veloci/GRP552-1.p.ma logic/equality.ma +TPTP/Veloci/GRP551-1.p.ma logic/equality.ma +TPTP/Veloci/GRP182-4.p.ma logic/equality.ma +TPTP/Veloci/GRP467-1.p.ma logic/equality.ma +TPTP/Veloci/LCL155-1.p.ma logic/equality.ma +TPTP/Veloci/COL086-1.p.ma logic/equality.ma +TPTP/Veloci/GRP614-1.p.ma logic/equality.ma +TPTP/Veloci/COL048-1.p.ma logic/equality.ma +TPTP/Veloci/GRP517-1.p.ma logic/equality.ma +TPTP/Veloci/GRP493-1.p.ma logic/equality.ma +TPTP/Veloci/LCL113-2.p.ma logic/equality.ma +TPTP/Veloci/BOO006-2.p.ma logic/equality.ma +TPTP/Veloci/GRP612-1.p.ma logic/equality.ma +TPTP/Veloci/GRP518-1.p.ma logic/equality.ma +TPTP/Veloci/GRP158-1.p.ma logic/equality.ma +TPTP/Veloci/BOO003-2.p.ma logic/equality.ma +TPTP/Veloci/BOO005-4.p.ma logic/equality.ma +TPTP/Veloci/GRP595-1.p.ma logic/equality.ma +TPTP/Veloci/COL060-2.p.ma logic/equality.ma +TPTP/Veloci/GRP494-1.p.ma logic/equality.ma +TPTP/Veloci/GRP163-1.p.ma logic/equality.ma +TPTP/Veloci/GRP168-2.p.ma logic/equality.ma +TPTP/Veloci/BOO075-1.p.ma logic/equality.ma +TPTP/Veloci/GRP605-1.p.ma logic/equality.ma +TPTP/Veloci/RNG007-4.p.ma logic/equality.ma +TPTP/Veloci/GRP486-1.p.ma logic/equality.ma +TPTP/Veloci/GRP149-1.p.ma logic/equality.ma +TPTP/Veloci/LDA007-3.p.ma logic/equality.ma +TPTP/Veloci/GRP568-1.p.ma logic/equality.ma +TPTP/Veloci/GRP189-2.p.ma logic/equality.ma +TPTP/Veloci/COL025-1.p.ma logic/equality.ma +TPTP/Veloci/BOO009-4.p.ma logic/equality.ma +TPTP/Veloci/ROB009-1.p.ma logic/equality.ma +TPTP/Veloci/GRP511-1.p.ma logic/equality.ma +TPTP/Veloci/GRP516-1.p.ma logic/equality.ma +TPTP/Veloci/GRP562-1.p.ma logic/equality.ma +TPTP/Veloci/GRP597-1.p.ma logic/equality.ma +TPTP/Veloci/GRP509-1.p.ma logic/equality.ma +TPTP/Veloci/LCL161-1.p.ma logic/equality.ma +TPTP/Veloci/BOO010-2.p.ma logic/equality.ma +TPTP/Veloci/RNG023-7.p.ma logic/equality.ma +TPTP/Veloci/GRP491-1.p.ma logic/equality.ma +TPTP/Veloci/GRP615-1.p.ma logic/equality.ma +TPTP/Veloci/GRP142-1.p.ma logic/equality.ma +TPTP/Veloci/GRP485-1.p.ma logic/equality.ma +TPTP/Veloci/GRP141-1.p.ma logic/equality.ma +TPTP/Veloci/GRP569-1.p.ma logic/equality.ma +TPTP/Veloci/LCL153-1.p.ma logic/equality.ma +TPTP/Veloci/GRP192-1.p.ma logic/equality.ma +TPTP/Veloci/BOO013-4.p.ma logic/equality.ma +TPTP/Veloci/BOO034-1.p.ma logic/equality.ma +TPTP/Veloci/BOO012-2.p.ma logic/equality.ma +TPTP/Veloci/COL007-1.p.ma logic/equality.ma +TPTP/Veloci/GRP547-1.p.ma logic/equality.ma +TPTP/Veloci/GRP510-1.p.ma logic/equality.ma +TPTP/Veloci/COL024-1.p.ma logic/equality.ma +TPTP/Veloci/LDA001-1.p.ma logic/equality.ma +TPTP/Veloci/GRP513-1.p.ma logic/equality.ma +TPTP/Veloci/LAT008-1.p.ma logic/equality.ma +TPTP/Veloci/GRP206-1.p.ma logic/equality.ma +TPTP/Veloci/GRP580-1.p.ma logic/equality.ma +TPTP/Veloci/GRP598-1.p.ma logic/equality.ma +TPTP/Veloci/COL063-6.p.ma logic/equality.ma +TPTP/Veloci/GRP153-1.p.ma logic/equality.ma +TPTP/Veloci/GRP151-1.p.ma logic/equality.ma +TPTP/Veloci/ROB010-1.p.ma logic/equality.ma +TPTP/Veloci/COL004-3.p.ma logic/equality.ma +TPTP/Veloci/GRP567-1.p.ma logic/equality.ma +TPTP/Veloci/LAT045-1.p.ma logic/equality.ma +TPTP/Veloci/GRP492-1.p.ma logic/equality.ma +TPTP/Veloci/LCL133-1.p.ma logic/equality.ma +TPTP/Veloci/COL063-4.p.ma logic/equality.ma +TPTP/Veloci/GRP463-1.p.ma logic/equality.ma +TPTP/Veloci/BOO004-2.p.ma logic/equality.ma +TPTP/Veloci/LCL134-1.p.ma logic/equality.ma +TPTP/Veloci/RNG023-6.p.ma logic/equality.ma +TPTP/Veloci/GRP487-1.p.ma logic/equality.ma +TPTP/Veloci/COL016-1.p.ma logic/equality.ma +TPTP/Veloci/GRP586-1.p.ma logic/equality.ma +TPTP/Veloci/ROB013-1.p.ma logic/equality.ma +TPTP/Veloci/LCL140-1.p.ma logic/equality.ma +TPTP/Veloci/LCL132-1.p.ma logic/equality.ma +TPTP/Veloci/BOO010-4.p.ma logic/equality.ma +TPTP/Veloci/COL014-1.p.ma logic/equality.ma +TPTP/Veloci/COL064-6.p.ma logic/equality.ma +TPTP/Veloci/GRP162-1.p.ma logic/equality.ma +TPTP/Veloci/GRP602-1.p.ma logic/equality.ma +TPTP/Veloci/ROB030-1.p.ma logic/equality.ma +TPTP/Veloci/GRP496-1.p.ma logic/equality.ma +TPTP/Veloci/COL058-2.p.ma logic/equality.ma +TPTP/Veloci/LCL112-2.p.ma logic/equality.ma +TPTP/Veloci/GRP484-1.p.ma logic/equality.ma +TPTP/Veloci/LAT034-1.p.ma logic/equality.ma +TPTP/Veloci/COL010-1.p.ma logic/equality.ma +TPTP/Veloci/GRP146-1.p.ma logic/equality.ma +TPTP/Veloci/GRP454-1.p.ma logic/equality.ma +TPTP/Veloci/BOO009-2.p.ma logic/equality.ma +TPTP/Veloci/LAT039-1.p.ma logic/equality.ma +TPTP/Veloci/COL083-1.p.ma logic/equality.ma +TPTP/Veloci/GRP495-1.p.ma logic/equality.ma +TPTP/Veloci/GRP143-1.p.ma logic/equality.ma +TPTP/Veloci/BOO004-4.p.ma logic/equality.ma +TPTP/Veloci/GRP604-1.p.ma logic/equality.ma +TPTP/Veloci/GRP488-1.p.ma logic/equality.ma +TPTP/Veloci/LAT040-1.p.ma logic/equality.ma +TPTP/Veloci/GRP182-1.p.ma logic/equality.ma +TPTP/Veloci/GRP543-1.p.ma logic/equality.ma +TPTP/Veloci/GRP118-1.p.ma logic/equality.ma +TPTP/Veloci/GRP514-1.p.ma logic/equality.ma +TPTP/Veloci/BOO003-4.p.ma logic/equality.ma +TPTP/Veloci/LCL157-1.p.ma logic/equality.ma +TPTP/Veloci/GRP542-1.p.ma logic/equality.ma +TPTP/Veloci/GRP182-3.p.ma logic/equality.ma +TPTP/Veloci/GRP117-1.p.ma logic/equality.ma +TPTP/Veloci/GRP606-1.p.ma logic/equality.ma +TPTP/Veloci/GRP456-1.p.ma logic/equality.ma +TPTP/Veloci/GRP549-1.p.ma logic/equality.ma +TPTP/Veloci/GRP154-1.p.ma logic/equality.ma +TPTP/Veloci/RNG008-4.p.ma logic/equality.ma +TPTP/Veloci/GRP561-1.p.ma logic/equality.ma +TPTP/Veloci/GRP139-1.p.ma logic/equality.ma +TPTP/Veloci/BOO018-4.p.ma logic/equality.ma +TPTP/Veloci/GRP144-1.p.ma logic/equality.ma +TPTP/Veloci/COL013-1.p.ma logic/equality.ma +TPTP/Veloci/BOO011-4.p.ma logic/equality.ma +TPTP/Veloci/LCL154-1.p.ma logic/equality.ma +TPTP/Veloci/GRP574-1.p.ma logic/equality.ma +TPTP/Veloci/GRP565-1.p.ma logic/equality.ma +TPTP/Veloci/GRP459-1.p.ma logic/equality.ma +TPTP/Veloci/GRP582-1.p.ma logic/equality.ma +TPTP/Veloci/GRP545-1.p.ma logic/equality.ma +TPTP/Veloci/LCL115-2.p.ma logic/equality.ma +TPTP/Veloci/GRP572-1.p.ma logic/equality.ma +TPTP/Veloci/GRP583-1.p.ma logic/equality.ma +TPTP/Veloci/GRP116-1.p.ma logic/equality.ma +TPTP/Veloci/COL064-9.p.ma logic/equality.ma +TPTP/Veloci/GRP560-1.p.ma logic/equality.ma +TPTP/Veloci/GRP145-1.p.ma logic/equality.ma +TPTP/Veloci/GRP160-1.p.ma logic/equality.ma +TPTP/Veloci/GRP581-1.p.ma logic/equality.ma +TPTP/Veloci/GRP001-2.p.ma logic/equality.ma +TPTP/Veloci/LAT033-1.p.ma logic/equality.ma +TPTP/Veloci/GRP023-2.p.ma logic/equality.ma +TPTP/Veloci/GRP001-4.p.ma logic/equality.ma +TPTP/Veloci/GRP603-1.p.ma logic/equality.ma +TPTP/Veloci/COL061-3.p.ma logic/equality.ma +TPTP/Veloci/COL064-5.p.ma logic/equality.ma +TPTP/Veloci/COL084-1.p.ma logic/equality.ma +TPTP/Veloci/GRP544-1.p.ma logic/equality.ma +TPTP/Veloci/GRP515-1.p.ma logic/equality.ma +TPTP/Veloci/GRP548-1.p.ma logic/equality.ma +TPTP/Veloci/COL022-1.p.ma logic/equality.ma +TPTP/Veloci/GRP188-2.p.ma logic/equality.ma +TPTP/Veloci/LCL164-1.p.ma logic/equality.ma +TPTP/Veloci/COL061-2.p.ma logic/equality.ma +TPTP/Veloci/GRP174-1.p.ma logic/equality.ma +TPTP/Veloci/GRP608-1.p.ma logic/equality.ma +TPTP/Veloci/GRP012-4.p.ma logic/equality.ma +TPTP/Veloci/BOO001-1.p.ma logic/equality.ma +TPTP/Veloci/GRP010-4.p.ma logic/equality.ma +TPTP/Veloci/COL018-1.p.ma logic/equality.ma +TPTP/Veloci/GRP458-1.p.ma logic/equality.ma +TPTP/Veloci/BOO071-1.p.ma logic/equality.ma +TPTP/Veloci/GRP497-1.p.ma logic/equality.ma +TPTP/Veloci/COL017-1.p.ma logic/equality.ma +TPTP/Veloci/COL060-3.p.ma logic/equality.ma +TPTP/Veloci/COL021-1.p.ma logic/equality.ma +TPTP/Veloci/GRP613-1.p.ma logic/equality.ma +TPTP/Veloci/GRP159-1.p.ma logic/equality.ma +TPTP/Veloci/LCL135-1.p.ma logic/equality.ma +TPTP/Veloci/GRP176-2.p.ma logic/equality.ma +TPTP/Veloci/GRP157-1.p.ma logic/equality.ma +TPTP/Veloci/GRP600-1.p.ma logic/equality.ma +TPTP/Veloci/COL064-7.p.ma logic/equality.ma +TPTP/Veloci/COL064-8.p.ma logic/equality.ma +TPTP/Veloci/GRP577-1.p.ma logic/equality.ma +TPTP/Veloci/GRP136-1.p.ma logic/equality.ma +TPTP/Veloci/BOO006-4.p.ma logic/equality.ma +TPTP/Veloci/GRP592-1.p.ma logic/equality.ma +TPTP/Veloci/GRP156-1.p.ma logic/equality.ma +TPTP/Veloci/GRP176-1.p.ma logic/equality.ma +TPTP/Veloci/RNG011-5.p.ma logic/equality.ma +TPTP/Veloci/GRP186-3.p.ma logic/equality.ma +TPTP/Veloci/GRP186-4.p.ma logic/equality.ma +TPTP/Veloci/GRP520-1.p.ma logic/equality.ma +TPTP/Veloci/COL058-3.p.ma logic/equality.ma +TPTP/Veloci/BOO069-1.p.ma logic/equality.ma +TPTP/Veloci/GRP022-2.p.ma logic/equality.ma +TPTP/Veloci/GRP155-1.p.ma logic/equality.ma +TPTP/Veloci/GRP188-1.p.ma logic/equality.ma +TPTP/Veloci/BOO016-2.p.ma logic/equality.ma +TPTP/Veloci/GRP498-1.p.ma logic/equality.ma +TPTP/Veloci/GRP590-1.p.ma logic/equality.ma +TPTP/Veloci/ROB002-1.p.ma logic/equality.ma +TPTP/Veloci/GRP152-1.p.ma logic/equality.ma +TPTP/Veloci/LCL110-2.p.ma logic/equality.ma +TPTP/Veloci/BOO017-2.p.ma logic/equality.ma +TPTP/Veloci/COL064-4.p.ma logic/equality.ma +TPTP/Veloci/LCL139-1.p.ma logic/equality.ma +TPTP/Veloci/COL063-2.p.ma logic/equality.ma +TPTP/Veloci/GRP182-2.p.ma logic/equality.ma +TPTP/Veloci/GRP490-1.p.ma logic/equality.ma +TPTP/Veloci/GRP115-1.p.ma logic/equality.ma +TPTP/Veloci/LCL141-1.p.ma logic/equality.ma +TPTP/Veloci/GRP564-1.p.ma logic/equality.ma +TPTP/Veloci/GRP481-1.p.ma logic/equality.ma +TPTP/Veloci/GRP455-1.p.ma logic/equality.ma +TPTP/Veloci/GRP550-1.p.ma logic/equality.ma +TPTP/Veloci/GRP599-1.p.ma logic/equality.ma +TPTP/Veloci/GRP596-1.p.ma logic/equality.ma +TPTP/Veloci/GRP460-1.p.ma logic/equality.ma +TPTP/Veloci/RNG024-7.p.ma logic/equality.ma +TPTP/Veloci/COL085-1.p.ma logic/equality.ma +TPTP/Veloci/LCL158-1.p.ma logic/equality.ma +TPTP/Veloci/GRP512-1.p.ma logic/equality.ma +TPTP/Veloci/GRP616-1.p.ma logic/equality.ma +TPTP/Veloci/GRP150-1.p.ma logic/equality.ma +TPTP/Veloci/GRP584-1.p.ma logic/equality.ma +TPTP/Veloci/COL064-3.p.ma logic/equality.ma +TPTP/Veloci/BOO013-2.p.ma logic/equality.ma +TPTP/Veloci/GRP566-1.p.ma logic/equality.ma +TPTP/Veloci/LCL156-1.p.ma logic/equality.ma +TPTP/Veloci/GRP573-1.p.ma logic/equality.ma +TPTP/Veloci/GRP541-1.p.ma logic/equality.ma +TPTP/Veloci/LCL114-2.p.ma logic/equality.ma +TPTP/Veloci/BOO011-2.p.ma logic/equality.ma +TPTP/Veloci/GRP546-1.p.ma logic/equality.ma +TPTP/Veloci/COL063-3.p.ma logic/equality.ma +TPTP/Veloci/GRP556-1.p.ma logic/equality.ma +TPTP/Veloci/GRP558-1.p.ma logic/equality.ma +TPTP/Veloci/GRP457-1.p.ma logic/equality.ma +coq.ma +datatypes/bool.ma +datatypes/constructors.ma +decidable_kit/list_aux.ma +list/list.ma +list/sort.ma +logic/connectives.ma +logic/equality.ma +nat/compare.ma +nat/div_and_mod.ma +nat/factorial.ma +nat/minus.ma +nat/nat.ma +nat/orders.ma +nat/primes.ma +nat/times.ma diff --git a/helm/software/matita/tests/destruct.ma b/helm/software/matita/tests/destruct.ma index 55275c480..5a61101ca 100644 --- a/helm/software/matita/tests/destruct.ma +++ b/helm/software/matita/tests/destruct.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/discriminate". + include "logic/equality.ma". include "nat/nat.ma". diff --git a/helm/software/matita/tests/elim.ma b/helm/software/matita/tests/elim.ma index e038c5da2..42dc195cb 100644 --- a/helm/software/matita/tests/elim.ma +++ b/helm/software/matita/tests/elim.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/elim". -include "../legacy/coq.ma". + +include "coq.ma". inductive stupidtype: Set \def | Base : stupidtype diff --git a/helm/software/matita/tests/fguidi.ma b/helm/software/matita/tests/fguidi.ma index a95e954c1..b6bc3d907 100644 --- a/helm/software/matita/tests/fguidi.ma +++ b/helm/software/matita/tests/fguidi.ma @@ -12,13 +12,13 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/fguidi/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "O" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/1)". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "S" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/2)". -alias id "le" = "cic:/matita/fguidi/le.ind#xpointer(1/1)". +alias id "le" = "cic:/matita/tests/fguidi/le.ind#xpointer(1/1)". alias id "False_ind" = "cic:/Coq/Init/Logic/False_ind.con". alias id "I" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1/1)". alias id "ex_intro" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1/1)". diff --git a/helm/software/matita/tests/first.ma b/helm/software/matita/tests/first.ma index 4fca7b199..bbd1e11c1 100644 --- a/helm/software/matita/tests/first.ma +++ b/helm/software/matita/tests/first.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/first/". + inductive nat : Set \def | O : nat diff --git a/helm/software/matita/tests/fix_betareduction.ma b/helm/software/matita/tests/fix_betareduction.ma index 65c916f17..cf85e58a8 100644 --- a/helm/software/matita/tests/fix_betareduction.ma +++ b/helm/software/matita/tests/fix_betareduction.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/fix_betareduction/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". alias id "n" = "cic:/Suresnes/BDD/canonicite/Canonicity_BDT/n.con". diff --git a/helm/software/matita/tests/fold.ma b/helm/software/matita/tests/fold.ma index cd507c7de..f21615185 100644 --- a/helm/software/matita/tests/fold.ma +++ b/helm/software/matita/tests/fold.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/fold". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias num (instance 0) = "natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/generalize.ma b/helm/software/matita/tests/generalize.ma index a3aacd3bf..077eb3265 100644 --- a/helm/software/matita/tests/generalize.ma +++ b/helm/software/matita/tests/generalize.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/generalize". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "Coq natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/hard_refine.ma b/helm/software/matita/tests/hard_refine.ma index 059a27be3..88adc389b 100644 --- a/helm/software/matita/tests/hard_refine.ma +++ b/helm/software/matita/tests/hard_refine.ma @@ -1,5 +1,5 @@ -set "baseuri" "cic:/matita/TPTP/BOO024-1". -include "../legacy/coq.ma". + +include "coq.ma". alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". (* Inclusion of: BOO024-1.p *) (* -------------------------------------------------------------------------- *) diff --git a/helm/software/matita/tests/injection.ma b/helm/software/matita/tests/injection.ma index 2cc7110ff..b805df687 100644 --- a/helm/software/matita/tests/injection.ma +++ b/helm/software/matita/tests/injection.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/injection". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "bool" = "cic:/Coq/Init/Datatypes/bool.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/interactive/automatic_insertion.ma b/helm/software/matita/tests/interactive/automatic_insertion.ma index 56212bdc5..c2a5c2c54 100644 --- a/helm/software/matita/tests/interactive/automatic_insertion.ma +++ b/helm/software/matita/tests/interactive/automatic_insertion.ma @@ -12,6 +12,6 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/xxx". + theorem t: And True (eq nat O O). split. exact (refl_equal nat O). exact I. qed. \ No newline at end of file diff --git a/helm/software/matita/tests/interactive/drop.ma b/helm/software/matita/tests/interactive/drop.ma index b8718cdb8..eefcd378b 100644 --- a/helm/software/matita/tests/interactive/drop.ma +++ b/helm/software/matita/tests/interactive/drop.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/drop". + alias id "O" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/1)". alias num (instance 0) = "natural number". diff --git a/helm/software/matita/tests/interactive/grafite.ma b/helm/software/matita/tests/interactive/grafite.ma index aaf570091..e71310a26 100644 --- a/helm/software/matita/tests/interactive/grafite.ma +++ b/helm/software/matita/tests/interactive/grafite.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/grafite/". + (* commento *) (** hint. *) diff --git a/helm/software/matita/tests/interactive/test5.ma b/helm/software/matita/tests/interactive/test5.ma index e48cc827e..8f36be288 100644 --- a/helm/software/matita/tests/interactive/test5.ma +++ b/helm/software/matita/tests/interactive/test5.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/interactive/test5/". + whelp instance \lambda A:Set. diff --git a/helm/software/matita/tests/interactive/test6.ma b/helm/software/matita/tests/interactive/test6.ma index 4afdd3741..42a99ff1b 100644 --- a/helm/software/matita/tests/interactive/test6.ma +++ b/helm/software/matita/tests/interactive/test6.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/interactive/test6/". + whelp instance \lambda A:Set. diff --git a/helm/software/matita/tests/interactive/test7.ma b/helm/software/matita/tests/interactive/test7.ma index d7347ed9f..55f22643a 100644 --- a/helm/software/matita/tests/interactive/test7.ma +++ b/helm/software/matita/tests/interactive/test7.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/interactive/test7/". + whelp instance \lambda A:Set. diff --git a/helm/software/matita/tests/interactive/test_instance.ma b/helm/software/matita/tests/interactive/test_instance.ma index 7e02c0fff..7aed7b6f8 100644 --- a/helm/software/matita/tests/interactive/test_instance.ma +++ b/helm/software/matita/tests/interactive/test_instance.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/tests/interactive/instance/". + whelp instance \lambda A:Set.\lambda P:A \to A \to Prop.\forall x:A. P x x. whelp instance \lambda A:Set.\lambda P:A \to A \to Prop.\forall x,y:A. P x y \to P y x. diff --git a/helm/software/matita/tests/inversion.ma b/helm/software/matita/tests/inversion.ma index 4c33beee0..f99acff11 100644 --- a/helm/software/matita/tests/inversion.ma +++ b/helm/software/matita/tests/inversion.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/inversion_sum/". -include "../legacy/coq.ma". + +include "coq.ma". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/inversion2.ma b/helm/software/matita/tests/inversion2.ma index c99c59bcf..8261b33f0 100644 --- a/helm/software/matita/tests/inversion2.ma +++ b/helm/software/matita/tests/inversion2.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/inversion2/". -include "../legacy/coq.ma". + +include "coq.ma". inductive nat : Set \def O : nat diff --git a/helm/software/matita/tests/letrec.ma b/helm/software/matita/tests/letrec.ma index 55933cd31..734a4a962 100644 --- a/helm/software/matita/tests/letrec.ma +++ b/helm/software/matita/tests/letrec.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/letrec/". + alias id "O" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/1)". diff --git a/helm/software/matita/tests/letrecand.ma b/helm/software/matita/tests/letrecand.ma index d9dfec329..d2ac486b4 100644 --- a/helm/software/matita/tests/letrecand.ma +++ b/helm/software/matita/tests/letrecand.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/letrecand". + include "nat/nat.ma". diff --git a/helm/software/matita/tests/makefile b/helm/software/matita/tests/makefile deleted file mode 100644 index c610118b6..000000000 --- a/helm/software/matita/tests/makefile +++ /dev/null @@ -1,37 +0,0 @@ -H=@ - -RT_BASEDIR=../ -OPTIONS=-bench -MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS) -CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) -MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS) -CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) - -devel:=$(shell basename `pwd`) - -ifneq "$(SRC)" "" - XXX=SRC=$(SRC) -endif - -all: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) -clean: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) -cleanall: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all - -all.opt opt: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) -clean.opt: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) -cleanall.opt: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all - -%.mo: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ -%.mo.opt: preall - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $(@:.opt=) - -preall: - $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) - diff --git a/helm/software/matita/tests/match_inference.ma b/helm/software/matita/tests/match_inference.ma index 0e27ce409..539fac9cc 100644 --- a/helm/software/matita/tests/match_inference.ma +++ b/helm/software/matita/tests/match_inference.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/match_inference/". + inductive pos: Set \def | one : pos diff --git a/helm/software/matita/tests/metasenv_ordering.ma b/helm/software/matita/tests/metasenv_ordering.ma index de9746d52..ff61c9da6 100644 --- a/helm/software/matita/tests/metasenv_ordering.ma +++ b/helm/software/matita/tests/metasenv_ordering.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/metasenv_ordering". -include "../legacy/coq.ma". + +include "coq.ma". alias num (instance 0) = "natural number". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/multiple_inheritance.ma b/helm/software/matita/tests/multiple_inheritance.ma index df15e704f..1aa708fb1 100644 --- a/helm/software/matita/tests/multiple_inheritance.ma +++ b/helm/software/matita/tests/multiple_inheritance.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/". + include "logic/equality.ma". @@ -31,7 +31,7 @@ lemma r2 : R → R2. [ exact (C r) | rewrite > (with_ r); exact (mult (r2_ r))] qed. -coercion cic:/matita/test/r2.con. +coercion cic:/matita/tests/multiple_inheritance/r2.con. (* convertibility test *) lemma conv_test : ∀r:R.C r -> K r. diff --git a/helm/software/matita/tests/mysql_escaping.ma b/helm/software/matita/tests/mysql_escaping.ma index bd0eb8d5a..e9e6c8b1b 100644 --- a/helm/software/matita/tests/mysql_escaping.ma +++ b/helm/software/matita/tests/mysql_escaping.ma @@ -12,6 +12,6 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/mysql_escaping/". + theorem a' : Prop \to Prop.intros.assumption.qed. diff --git a/helm/software/matita/tests/naiveparamod.ma b/helm/software/matita/tests/naiveparamod.ma index 624604842..ef86f372d 100644 --- a/helm/software/matita/tests/naiveparamod.ma +++ b/helm/software/matita/tests/naiveparamod.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/naiveparamod". + include "logic/equality.ma". diff --git a/helm/software/matita/tests/overred.ma b/helm/software/matita/tests/overred.ma index 2034001bd..b270912ad 100644 --- a/helm/software/matita/tests/overred.ma +++ b/helm/software/matita/tests/overred.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/overred/". + include "logic/equality.ma". @@ -24,10 +24,10 @@ definition T3 : Type := T2. axiom t3 : T3. axiom c : T2 -> X -> X. -coercion cic:/matita/test/overred/c.con 1. +coercion cic:/matita/tests/overred/c.con 1. axiom daemon : c t3 x = x. theorem find_a_coercion_from_T2_for_a_term_in_T3 : (* c *) t3 x = x. apply daemon. -qed. \ No newline at end of file +qed. diff --git a/helm/software/matita/tests/paramodulation.ma b/helm/software/matita/tests/paramodulation.ma index 2d090e1b0..074dcc96a 100644 --- a/helm/software/matita/tests/paramodulation.ma +++ b/helm/software/matita/tests/paramodulation.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/paramodulation". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias symbol "plus" (instance 0) = "Coq's natural plus". diff --git a/helm/software/matita/tests/paramodulation/BOO075-1.ma b/helm/software/matita/tests/paramodulation/BOO075-1.ma index 7c46167f4..67a89bf6c 100644 --- a/helm/software/matita/tests/paramodulation/BOO075-1.ma +++ b/helm/software/matita/tests/paramodulation/BOO075-1.ma @@ -1,4 +1,4 @@ -set "baseuri" "cic:/matita/TPTP/BOO075-1". + inductive eq (A:Type) (x:A) : A \to Prop \def refl_eq : eq A x x. @@ -30,17 +30,17 @@ intros.elim H1.assumption. qed. default "equality" - cic:/matita/TPTP/BOO075-1/eq.ind - cic:/matita/TPTP/BOO075-1/sym_eq.con - cic:/matita/TPTP/BOO075-1/trans_eq.con - cic:/matita/TPTP/BOO075-1/eq_ind.con - cic:/matita/TPTP/BOO075-1/eq_elim_r.con - cic:/matita/TPTP/BOO075-1/eq_rec.con - cic:/matita/TPTP/BOO075-1/eq_elim_r'.con - cic:/matita/TPTP/BOO075-1/eq_rect.con - cic:/matita/TPTP/BOO075-1/eq_elim_r''.con - cic:/matita/TPTP/BOO075-1/eq_f.con - cic:/matita/TPTP/BOO075-1/eq_f1.con. + cic:/matita/tests/paramodulation/BOO075-1/eq.ind + cic:/matita/tests/paramodulation/BOO075-1/sym_eq.con + cic:/matita/tests/paramodulation/BOO075-1/trans_eq.con + cic:/matita/tests/paramodulation/BOO075-1/eq_ind.con + cic:/matita/tests/paramodulation/BOO075-1/eq_elim_r.con + cic:/matita/tests/paramodulation/BOO075-1/eq_rec.con + cic:/matita/tests/paramodulation/BOO075-1/eq_elim_r'.con + cic:/matita/tests/paramodulation/BOO075-1/eq_rect.con + cic:/matita/tests/paramodulation/BOO075-1/eq_elim_r''.con + cic:/matita/tests/paramodulation/BOO075-1/eq_f.con + cic:/matita/tests/paramodulation/BOO075-1/eq_f1.con. theorem eq_f: \forall A,B:Type.\forall f:A\to B. \forall x,y:A. eq A x y \to eq B (f x) (f y). @@ -55,7 +55,7 @@ qed. inductive ex (A:Type) (P:A \to Prop) : Prop \def ex_intro: \forall x:A. P x \to ex A P. interpretation "exists" 'exists \eta.x = - (cic:/matita/TPTP/BOO075-1/ex.ind#xpointer(1/1) _ x). + (cic:/matita/tests/paramodulation/BOO075-1/ex.ind#xpointer(1/1) _ x). notation < "hvbox(\exists ident i opt (: ty) break . p)" right associative with precedence 20 diff --git a/helm/software/matita/tests/paramodulation/boolean_algebra.ma b/helm/software/matita/tests/paramodulation/boolean_algebra.ma index ab47854da..6822cfb3e 100644 --- a/helm/software/matita/tests/paramodulation/boolean_algebra.ma +++ b/helm/software/matita/tests/paramodulation/boolean_algebra.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/SK/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/paramodulation/group.ma b/helm/software/matita/tests/paramodulation/group.ma index 621e2d449..c8645cc82 100644 --- a/helm/software/matita/tests/paramodulation/group.ma +++ b/helm/software/matita/tests/paramodulation/group.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/paramodulation/group". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias id "eq" = "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/paramodulation/irratsqrt2.ma b/helm/software/matita/tests/paramodulation/irratsqrt2.ma index 5c976bcb9..5f845b4f0 100644 --- a/helm/software/matita/tests/paramodulation/irratsqrt2.ma +++ b/helm/software/matita/tests/paramodulation/irratsqrt2.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/paramodulation/irratsqrt2/". + include "nat/times.ma". include "nat/minus.ma". diff --git a/helm/software/matita/tests/pullback.ma b/helm/software/matita/tests/pullback.ma index 935a90dcf..1196255d9 100644 --- a/helm/software/matita/tests/pullback.ma +++ b/helm/software/matita/tests/pullback.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/pullback". + inductive T : Type \def t : T. inductive L : Type \def l : L. diff --git a/helm/software/matita/tests/push_pop_status.ma b/helm/software/matita/tests/push_pop_status.ma new file mode 100644 index 000000000..a885f4e9d --- /dev/null +++ b/helm/software/matita/tests/push_pop_status.ma @@ -0,0 +1,95 @@ + +(* XXX coercions *) +axiom A: Type. +axiom B: Type. +axiom cAB: A -> B. +coercion cic:/matita/tests/push_pop_status/cAB.con. + +inductive eq (A:Type) (x:A) : A \to Prop \def + refl_eq : eq A x x. + +(* XXX notation *) +notation "hvbox(a break === b)" non associative with precedence 45 for @{ 'eqqq $a $b }. +interpretation "test" 'eqqq x y = (cic:/matita/tests/push_pop_status/eq.ind#xpointer(1/1) _ x y). + +theorem eq_rect': + \forall A. \forall x:A. \forall P: \forall y:A. x===y \to Type. + P ? (refl_eq ? x) \to \forall y:A. \forall p:x===y. P y p. + intros. + exact + (match p1 return \lambda y. \lambda p.P y p with + [refl_eq \Rightarrow p]). +qed. + +lemma sym_eq : \forall A:Type.\forall x,y:A. x===y \to y===x. +intros.elim H. apply refl_eq. +qed. + +lemma trans_eq : \forall A:Type.\forall x,y,z:A. x===y \to y===z \to x===z. +intros.elim H1.assumption. +qed. + +theorem eq_elim_r: + \forall A:Type.\forall x:A. \forall P: A \to Prop. + P x \to \forall y:A. y===x \to P y. +intros. elim (sym_eq ? ? ? H1).assumption. +qed. + +theorem eq_elim_r': + \forall A:Type.\forall x:A. \forall P: A \to Set. + P x \to \forall y:A. y===x \to P y. +intros. elim (sym_eq ? ? ? H).assumption. +qed. + +theorem eq_elim_r'': + \forall A:Type.\forall x:A. \forall P: A \to Type. + P x \to \forall y:A. y===x \to P y. +intros. elim (sym_eq ? ? ? H).assumption. +qed. + +theorem eq_f: \forall A,B:Type.\forall f:A\to B. +\forall x,y:A. x===y \to f x === f y. +intros.elim H.apply refl_eq. +qed. + +theorem eq_f': \forall A,B:Type.\forall f:A\to B. +\forall x,y:A. x===y \to f y === f x. +intros.elim H.apply refl_eq. +qed. + +(* XXX defaults *) +default "equality" + cic:/matita/tests/push_pop_status/eq.ind + cic:/matita/tests/push_pop_status/sym_eq.con + cic:/matita/tests/push_pop_status/trans_eq.con + cic:/matita/tests/push_pop_status/eq_ind.con + cic:/matita/tests/push_pop_status/eq_elim_r.con + cic:/matita/tests/push_pop_status/eq_rec.con + cic:/matita/tests/push_pop_status/eq_elim_r'.con + cic:/matita/tests/push_pop_status/eq_rect.con + cic:/matita/tests/push_pop_status/eq_elim_r''.con + cic:/matita/tests/push_pop_status/eq_f.con + cic:/matita/tests/push_pop_status/eq_f'.con. (* \x.sym (eq_f x) *) + +include "push_pop_status_aux1.ma". +(* include "push_pop_status_aux2.ma". *) + +(* XXX default *) +theorem prova: \forall x:A. eq A x x. +intros. reflexivity. +qed. + +(* XXX notation *) +theorem prova1: \forall x:A. x === x. +intros. apply refl_eq. +qed. + +(* XXX coercion *) +theorem pippo: A -> B. +intro a. +apply (a : B). +qed. + +definition X := b. + + diff --git a/helm/software/matita/tests/push_pop_status_aux1.ma b/helm/software/matita/tests/push_pop_status_aux1.ma new file mode 100644 index 000000000..80e9a2f63 --- /dev/null +++ b/helm/software/matita/tests/push_pop_status_aux1.ma @@ -0,0 +1 @@ +axiom c : Type. diff --git a/helm/software/matita/tests/push_pop_status_aux2.ma b/helm/software/matita/tests/push_pop_status_aux2.ma new file mode 100644 index 000000000..4799d5ba1 --- /dev/null +++ b/helm/software/matita/tests/push_pop_status_aux2.ma @@ -0,0 +1,2 @@ +axiom c : Type. +axiom x : c === c. diff --git a/helm/software/matita/tests/record.ma b/helm/software/matita/tests/record.ma index bc5d2e217..24bed8ade 100644 --- a/helm/software/matita/tests/record.ma +++ b/helm/software/matita/tests/record.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/record/". + record empty : Type \def {}. diff --git a/helm/software/matita/tests/replace.ma b/helm/software/matita/tests/replace.ma index 2961fdc7e..37a530978 100644 --- a/helm/software/matita/tests/replace.ma +++ b/helm/software/matita/tests/replace.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/replace/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias num (instance 0) = "Coq natural number". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". diff --git a/helm/software/matita/tests/rewrite.ma b/helm/software/matita/tests/rewrite.ma index dff3b2300..a1956c9b5 100644 --- a/helm/software/matita/tests/rewrite.ma +++ b/helm/software/matita/tests/rewrite.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/rewrite/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias num (instance 0) = "Coq natural number". diff --git a/helm/software/matita/tests/root b/helm/software/matita/tests/root new file mode 100644 index 000000000..175ea39f8 --- /dev/null +++ b/helm/software/matita/tests/root @@ -0,0 +1,2 @@ +baseuri=cic:/matita/tests +include_paths=../legacy diff --git a/helm/software/matita/tests/second.ma b/helm/software/matita/tests/second.ma index 450c67671..284be0701 100644 --- a/helm/software/matita/tests/second.ma +++ b/helm/software/matita/tests/second.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/second/". + alias id "nat" = "cic:/matita/tests/first/nat.ind#xpointer(1/1)". alias id "O" = "cic:/matita/tests/first/nat.ind#xpointer(1/1/1)". alias id "eq" = "cic:/matita/tests/first/eq.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/simpl.ma b/helm/software/matita/tests/simpl.ma index 61150e817..7af3f5521 100644 --- a/helm/software/matita/tests/simpl.ma +++ b/helm/software/matita/tests/simpl.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/simpl/". -include "../legacy/coq.ma". + +include "coq.ma". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". alias id "plus" = "cic:/Coq/Init/Peano/plus.con". diff --git a/helm/software/matita/tests/tacticals.ma b/helm/software/matita/tests/tacticals.ma index a44e80a86..f1e8998f0 100644 --- a/helm/software/matita/tests/tacticals.ma +++ b/helm/software/matita/tests/tacticals.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/test/tacticals". + inductive myand (A, B: Prop) : Prop \def | myconj : ∀a:A.∀b:B. myand A B. diff --git a/helm/software/matita/tests/test2.ma b/helm/software/matita/tests/test2.ma index 93da2ecce..bcd2def53 100644 --- a/helm/software/matita/tests/test2.ma +++ b/helm/software/matita/tests/test2.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/test2/". -include "../legacy/coq.ma". + +include "coq.ma". alias id "nat" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1)". alias symbol "and" (instance 0) = "Coq's logical and". diff --git a/helm/software/matita/tests/test3.ma b/helm/software/matita/tests/test3.ma index 85180da5b..a2e2e40df 100644 --- a/helm/software/matita/tests/test3.ma +++ b/helm/software/matita/tests/test3.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/test3/". -include "../legacy/coq.ma". + +include "coq.ma". alias symbol "eq" (instance 0) = "Coq's leibnitz's equality". theorem a:\forall x.x=x. diff --git a/helm/software/matita/tests/test4.ma b/helm/software/matita/tests/test4.ma index 55cfb6aaf..a8e219fcb 100644 --- a/helm/software/matita/tests/test4.ma +++ b/helm/software/matita/tests/test4.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/test4/". -include "../legacy/coq.ma". + +include "coq.ma". (* commento che va nell'ast, ma non viene contato diff --git a/helm/software/matita/tests/third.ma b/helm/software/matita/tests/third.ma index 124cdc121..70041dc3a 100644 --- a/helm/software/matita/tests/third.ma +++ b/helm/software/matita/tests/third.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/third/". + alias id "nat" = "cic:/matita/tests/first/nat.ind#xpointer(1/1)". alias id "O" = "cic:/matita/tests/first/nat.ind#xpointer(1/1/1)". alias id "eq" = "cic:/matita/tests/first/eq.ind#xpointer(1/1)". diff --git a/helm/software/matita/tests/tinycals.ma b/helm/software/matita/tests/tinycals.ma index 465d7c06e..3ceba6eaa 100644 --- a/helm/software/matita/tests/tinycals.ma +++ b/helm/software/matita/tests/tinycals.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/tests/tinycals". + theorem prova: \forall A,B,C:Prop. diff --git a/helm/software/matita/tests/unfold.ma b/helm/software/matita/tests/unfold.ma index 3318db17d..a4bd93150 100644 --- a/helm/software/matita/tests/unfold.ma +++ b/helm/software/matita/tests/unfold.ma @@ -12,9 +12,9 @@ (* *) (**************************************************************************) -set "baseuri" "cic:/matita/unfold". -include "../legacy/coq.ma". + +include "coq.ma". alias symbol "plus" (instance 0) = "Coq's natural plus". definition myplus \def \lambda x,y. x+y. -- 2.39.2