]> matita.cs.unibo.it Git - helm.git/commitdiff
BIG FAT WARNING: DEVELOPMENTS DIE HERE
authorEnrico Tassi <enrico.tassi@inria.fr>
Thu, 10 Jan 2008 22:32:03 +0000 (22:32 +0000)
committerEnrico Tassi <enrico.tassi@inria.fr>
Thu, 10 Jan 2008 22:32:03 +0000 (22:32 +0000)
What follows is the email on the helm mailing list

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 "<W> 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.

791 files changed:
helm/software/Makefile
helm/software/components/acic_content/termAcicContent.ml
helm/software/components/acic_content/termAcicContent.mli
helm/software/components/cic/libraryObjects.ml
helm/software/components/cic/libraryObjects.mli
helm/software/components/cic_disambiguation/.depend
helm/software/components/cic_disambiguation/.depend.opt
helm/software/components/cic_disambiguation/number_notation.ml
helm/software/components/content_pres/termContentPres.ml
helm/software/components/content_pres/termContentPres.mli
helm/software/components/extlib/hExtlib.ml
helm/software/components/extlib/hExtlib.mli
helm/software/components/grafite_engine/grafiteEngine.ml
helm/software/components/grafite_engine/grafiteEngine.mli
helm/software/components/grafite_engine/grafiteSync.ml
helm/software/components/grafite_engine/grafiteSync.mli
helm/software/components/grafite_engine/grafiteTypes.ml
helm/software/components/grafite_engine/grafiteTypes.mli
helm/software/components/grafite_parser/.depend
helm/software/components/grafite_parser/.depend.opt
helm/software/components/grafite_parser/dependenciesParser.ml
helm/software/components/grafite_parser/dependenciesParser.mli
helm/software/components/grafite_parser/grafiteDisambiguate.ml
helm/software/components/grafite_parser/grafiteDisambiguate.mli
helm/software/components/grafite_parser/grafiteParser.ml
helm/software/components/grafite_parser/grafiteParser.mli
helm/software/components/grafite_parser/grafiteWalker.ml
helm/software/components/grafite_parser/grafiteWalker.mli
helm/software/components/grafite_parser/test_dep.ml
helm/software/components/lexicon/cicNotation.ml
helm/software/components/lexicon/cicNotation.mli
helm/software/components/library/.depend
helm/software/components/library/.depend.opt
helm/software/components/library/Makefile
helm/software/components/library/coercDb.ml
helm/software/components/library/coercDb.mli
helm/software/components/library/librarian.ml [new file with mode: 0644]
helm/software/components/library/librarian.mli [new file with mode: 0644]
helm/software/components/library/libraryClean.ml
helm/software/components/library/librarySync.ml
helm/software/components/library/librarySync.mli
helm/software/components/syntax_extensions/pa_unicode_macro.ml
helm/software/components/tactics/tactics.mli
helm/software/configure.ac
helm/software/make/main.ml [deleted file]
helm/software/make/make.ml [deleted file]
helm/software/make/make.mli [deleted file]
helm/software/make/test/a.c [deleted file]
helm/software/make/test/b.c [deleted file]
helm/software/make/test/c.c [deleted file]
helm/software/make/test/d.c [deleted file]
helm/software/make/test/e.c [deleted file]
helm/software/matita/.depend
helm/software/matita/.depend.opt
helm/software/matita/Makefile
helm/software/matita/bench_disamberrors [deleted file]
helm/software/matita/bench_summary.py [deleted file]
helm/software/matita/buildTimeConf.ml.in
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/Makefile [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/blt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/definitions.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/depends [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/arith.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/ext/tactics.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/plist/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/preamble.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/root [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/spare.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/theory.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-1/types/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/Makefile [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/depend [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/makefile [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/preamble.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/root [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/A/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/C/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/G/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/Makefile [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/T/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aplus/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/aprem/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/aprem.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/cimp.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/lift1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/pr3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/arity/subst0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/asucc/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cimp/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clear/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/clen/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/cnt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/arity.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/clear.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csuba/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/arity.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/clear.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/csuba.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/drop1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubc/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/clear.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst0/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubst1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/clear.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/pc3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/csubt/ty3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/depends [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/drop1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex0/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ex2/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/flt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/fsubst0/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/clear.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/drop.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/flt.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/getl/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/iso/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/asucc.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/leq/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift/tlt.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/lift1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/llt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/next_plus/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/arity.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/iso.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/lift1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/pr3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/nf2/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fsubst0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/left.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/nf2.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/pc1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pc3/wcpr0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/pr0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr0/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/pr1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/clen.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/pr2.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr2/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/iso.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/pr3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/pr3/wcpr0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/r/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/root [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/s/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/arity.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sc3/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/lift1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/nf2.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/sn3/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/subst0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst0/tlt.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/subst1/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau0/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/cnt.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tau1/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlist/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/tlt/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/arity_props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/dec.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fsubst0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/nf2.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/pr3_props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/subst1.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/ty3/tau0.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/fwd.ma
helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/wcpr0/getl.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/defs.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/fun.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/inv.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Lift/props.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/Makefile [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Context.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/datatypes/Term.ma
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/depends [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/makefile [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble.ma [deleted file]
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma [new file with mode: 0644]
helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/root [new file with mode: 0644]
helm/software/matita/contribs/LOGIC/CLE/defs.ma
helm/software/matita/contribs/LOGIC/Insert/defs.ma
helm/software/matita/contribs/LOGIC/Insert/fun.ma
helm/software/matita/contribs/LOGIC/Insert/inv.ma
helm/software/matita/contribs/LOGIC/Insert/props.ma
helm/software/matita/contribs/LOGIC/Lift/defs.ma
helm/software/matita/contribs/LOGIC/Makefile [new file with mode: 0644]
helm/software/matita/contribs/LOGIC/NTrack/defs.ma
helm/software/matita/contribs/LOGIC/NTrack/inv.ma
helm/software/matita/contribs/LOGIC/NTrack/order.ma
helm/software/matita/contribs/LOGIC/NTrack/props.ma
helm/software/matita/contribs/LOGIC/PEq/defs.ma
helm/software/matita/contribs/LOGIC/PNF/defs.ma
helm/software/matita/contribs/LOGIC/PRed/defs.ma
helm/software/matita/contribs/LOGIC/PRed/wlt.ma
helm/software/matita/contribs/LOGIC/Track/defs.ma
helm/software/matita/contribs/LOGIC/Track/inv.ma
helm/software/matita/contribs/LOGIC/Track/order.ma
helm/software/matita/contribs/LOGIC/Track/pred.ma
helm/software/matita/contribs/LOGIC/WLT/defs.ma
helm/software/matita/contribs/LOGIC/Weight/defs.ma
helm/software/matita/contribs/LOGIC/datatypes_defs/Context.ma
helm/software/matita/contribs/LOGIC/datatypes_defs/Formula.ma
helm/software/matita/contribs/LOGIC/datatypes_defs/Proof.ma
helm/software/matita/contribs/LOGIC/datatypes_defs/Sequent.ma
helm/software/matita/contribs/LOGIC/datatypes_props/Sequent.ma
helm/software/matita/contribs/LOGIC/depends [new file with mode: 0644]
helm/software/matita/contribs/LOGIC/makefile [deleted file]
helm/software/matita/contribs/LOGIC/preamble.ma [deleted file]
helm/software/matita/contribs/LOGIC/preamble0.ma [new file with mode: 0644]
helm/software/matita/contribs/LOGIC/root [new file with mode: 0644]
helm/software/matita/contribs/Makefile
helm/software/matita/contribs/RELATIONAL/Makefile [new file with mode: 0644]
helm/software/matita/contribs/RELATIONAL/NLE/defs.ma
helm/software/matita/contribs/RELATIONAL/NLE/inv.ma
helm/software/matita/contribs/RELATIONAL/NLE/nplus.ma
helm/software/matita/contribs/RELATIONAL/NLE/order.ma
helm/software/matita/contribs/RELATIONAL/NLE/props.ma
helm/software/matita/contribs/RELATIONAL/NPlus/defs.ma
helm/software/matita/contribs/RELATIONAL/NPlus/fun.ma
helm/software/matita/contribs/RELATIONAL/NPlus/inv.ma
helm/software/matita/contribs/RELATIONAL/NPlus/monoid.ma
helm/software/matita/contribs/RELATIONAL/NPlusList/defs.ma
helm/software/matita/contribs/RELATIONAL/NPlusList/props.ma
helm/software/matita/contribs/RELATIONAL/ZEq/defs.ma
helm/software/matita/contribs/RELATIONAL/ZEq/setoid.ma
helm/software/matita/contribs/RELATIONAL/datatypes/Bool.ma
helm/software/matita/contribs/RELATIONAL/datatypes/List.ma
helm/software/matita/contribs/RELATIONAL/datatypes/Nat.ma
helm/software/matita/contribs/RELATIONAL/datatypes/Zah.ma
helm/software/matita/contribs/RELATIONAL/depends [new file with mode: 0644]
helm/software/matita/contribs/RELATIONAL/makefile [deleted file]
helm/software/matita/contribs/RELATIONAL/preamble.ma
helm/software/matita/contribs/RELATIONAL/root [new file with mode: 0644]
helm/software/matita/contribs/prova.ma [deleted file]
helm/software/matita/dama/Makefile [new file with mode: 0644]
helm/software/matita/dama/Q_is_orded_divisble_group.ma [new file with mode: 0644]
helm/software/matita/dama/attic/fields.ma
helm/software/matita/dama/attic/integration_algebras.ma
helm/software/matita/dama/attic/ordered_fields_ch0.ma
helm/software/matita/dama/attic/reals.ma
helm/software/matita/dama/attic/rings.ma
helm/software/matita/dama/attic/vector_spaces.ma
helm/software/matita/dama/classical_pointfree/ordered_sets.ma
helm/software/matita/dama/classical_pointfree/ordered_sets2.ma
helm/software/matita/dama/classical_pointwise/sets.ma
helm/software/matita/dama/classical_pointwise/sigma_algebra.ma
helm/software/matita/dama/classical_pointwise/topology.ma
helm/software/matita/dama/constructive_connectives.ma
helm/software/matita/dama/constructive_higher_order_relations.ma
helm/software/matita/dama/constructive_pointfree/lebesgue.ma
helm/software/matita/dama/depends [new file with mode: 0644]
helm/software/matita/dama/divisible_group.ma
helm/software/matita/dama/excess.ma
helm/software/matita/dama/group.ma
helm/software/matita/dama/lattice.ma
helm/software/matita/dama/makefile [deleted file]
helm/software/matita/dama/metric_lattice.ma
helm/software/matita/dama/metric_space.ma
helm/software/matita/dama/ordered_divisible_group.ma
helm/software/matita/dama/ordered_group.ma
helm/software/matita/dama/premetric_lattice.ma
helm/software/matita/dama/prevalued_lattice.ma
helm/software/matita/dama/root [new file with mode: 0644]
helm/software/matita/dama/sandwich.ma
helm/software/matita/dama/sequence.ma
helm/software/matita/dep2dot.rb [deleted file]
helm/software/matita/gragrep.ml [deleted file]
helm/software/matita/gragrep.mli [deleted file]
helm/software/matita/help/C/figures/developments.png [deleted file]
helm/software/matita/help/C/sec_commands.xml
helm/software/matita/help/C/sec_gettingstarted.xml
helm/software/matita/legacy/Makefile [new file with mode: 0644]
helm/software/matita/legacy/coq.ma
helm/software/matita/legacy/depends [new file with mode: 0644]
helm/software/matita/legacy/makefile [deleted file]
helm/software/matita/legacy/root [new file with mode: 0644]
helm/software/matita/library/Makefile [new file with mode: 0644]
helm/software/matita/library/algebra/CoRN/Setoids.ma
helm/software/matita/library/depends [new file with mode: 0644]
helm/software/matita/library/library_notation.ma [deleted file]
helm/software/matita/library/list/list.ma
helm/software/matita/library/makefile [deleted file]
helm/software/matita/library/root [new file with mode: 0644]
helm/software/matita/library/technicalities/setoids.ma
helm/software/matita/matita.glade
helm/software/matita/matita.ma.templ
helm/software/matita/matita.ml
helm/software/matita/matitaEngine.ml
helm/software/matita/matitaEngine.mli
helm/software/matita/matitaExcPp.ml
helm/software/matita/matitaGui.ml
helm/software/matita/matitaGuiTypes.mli
helm/software/matita/matitaInit.ml
helm/software/matita/matitaMathView.ml
helm/software/matita/matitaMisc.ml
helm/software/matita/matitaScript.ml
helm/software/matita/matitaScript.mli
helm/software/matita/matitaTypes.ml
helm/software/matita/matitaTypes.mli
helm/software/matita/matitaWiki.ml
helm/software/matita/matitac.ml
helm/software/matita/matitacLib.ml
helm/software/matita/matitacLib.mli
helm/software/matita/matitaclean.ml
helm/software/matita/matitadep.ml
helm/software/matita/matitamake.ml [deleted file]
helm/software/matita/matitamake.mli [deleted file]
helm/software/matita/matitamakeLib.ml [deleted file]
helm/software/matita/matitamakeLib.mli [deleted file]
helm/software/matita/matitaprover.ml [deleted file]
helm/software/matita/matitaprover.mli [deleted file]
helm/software/matita/matitatop.ml [deleted file]
helm/software/matita/rottener.ml [deleted file]
helm/software/matita/rottenize_lib [deleted file]
helm/software/matita/template_makefile.in [deleted file]
helm/software/matita/template_makefile_devel.in [deleted file]
helm/software/matita/tests/Makefile [new file with mode: 0644]
helm/software/matita/tests/TPTP/Veloci/BOO001-1.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO003-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO003-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO004-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO004-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO005-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO005-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO006-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO006-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO009-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO009-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO010-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO010-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO011-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO011-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO012-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO012-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO013-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO013-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO016-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO017-2.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO018-4.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO034-1.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO069-1.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO071-1.p.ma
helm/software/matita/tests/TPTP/Veloci/BOO075-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL004-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL007-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL008-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL010-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL012-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL013-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL014-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL015-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL016-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL017-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL018-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL021-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL022-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL024-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL025-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL045-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL048-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL050-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL058-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL058-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL060-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL060-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL061-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL061-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL062-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL062-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL063-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL063-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL063-4.p.ma
helm/software/matita/tests/TPTP/Veloci/COL063-5.p.ma
helm/software/matita/tests/TPTP/Veloci/COL063-6.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-2.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-3.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-4.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-5.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-6.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-7.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-8.p.ma
helm/software/matita/tests/TPTP/Veloci/COL064-9.p.ma
helm/software/matita/tests/TPTP/Veloci/COL083-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL084-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL085-1.p.ma
helm/software/matita/tests/TPTP/Veloci/COL086-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP001-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP001-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP010-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP011-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP012-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP022-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP023-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP115-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP116-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP117-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP118-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP136-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP137-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP139-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP141-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP142-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP143-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP144-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP145-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP146-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP149-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP150-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP151-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP152-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP153-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP154-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP155-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP156-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP157-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP158-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP159-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP160-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP161-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP162-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP163-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP168-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP168-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP173-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP174-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP176-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP176-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP182-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP182-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP182-3.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP182-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP186-3.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP186-4.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP188-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP188-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP189-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP189-2.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP192-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP206-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP454-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP455-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP456-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP457-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP458-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP459-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP460-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP463-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP467-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP481-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP484-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP485-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP486-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP487-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP488-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP490-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP491-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP492-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP493-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP494-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP495-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP496-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP497-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP498-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP509-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP510-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP511-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP512-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP513-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP514-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP515-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP516-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP517-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP518-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP520-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP541-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP542-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP543-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP544-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP545-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP546-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP547-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP548-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP549-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP550-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP551-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP552-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP556-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP558-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP560-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP561-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP562-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP564-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP565-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP566-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP567-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP568-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP569-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP570-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP572-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP573-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP574-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP576-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP577-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP578-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP580-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP581-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP582-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP583-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP584-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP586-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP588-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP590-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP592-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP595-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP596-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP597-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP598-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP599-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP600-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP602-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP603-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP604-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP605-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP606-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP608-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP612-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP613-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP614-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP615-1.p.ma
helm/software/matita/tests/TPTP/Veloci/GRP616-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT008-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT033-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT034-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT039-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT039-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT040-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LAT045-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL110-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL112-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL113-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL114-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL115-2.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL132-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL133-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL134-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL135-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL139-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL140-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL141-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL153-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL154-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL155-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL156-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL157-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL158-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL161-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LCL164-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LDA001-1.p.ma
helm/software/matita/tests/TPTP/Veloci/LDA007-3.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG007-4.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG008-4.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG011-5.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG023-6.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG023-7.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG024-6.p.ma
helm/software/matita/tests/TPTP/Veloci/RNG024-7.p.ma
helm/software/matita/tests/TPTP/Veloci/ROB002-1.p.ma
helm/software/matita/tests/TPTP/Veloci/ROB009-1.p.ma
helm/software/matita/tests/TPTP/Veloci/ROB010-1.p.ma
helm/software/matita/tests/TPTP/Veloci/ROB013-1.p.ma
helm/software/matita/tests/TPTP/Veloci/ROB030-1.p.ma
helm/software/matita/tests/TPTP/Veloci/SYN083-1.p.ma
helm/software/matita/tests/absurd.ma
helm/software/matita/tests/apply.ma
helm/software/matita/tests/apply2.ma
helm/software/matita/tests/applys.ma
helm/software/matita/tests/assumption.ma
helm/software/matita/tests/bad_induction.ma
helm/software/matita/tests/bad_tests/auto.ma
helm/software/matita/tests/bad_tests/baseuri.ma
helm/software/matita/tests/bool.ma
helm/software/matita/tests/change.ma
helm/software/matita/tests/clear.ma
helm/software/matita/tests/clearbody.ma
helm/software/matita/tests/coercions.ma
helm/software/matita/tests/coercions_contravariant.ma
helm/software/matita/tests/coercions_dependent.ma
helm/software/matita/tests/coercions_dupelim.ma
helm/software/matita/tests/coercions_nonuniform.ma
helm/software/matita/tests/coercions_open.ma
helm/software/matita/tests/coercions_propagation.ma
helm/software/matita/tests/coercions_russell.ma
helm/software/matita/tests/comments.ma
helm/software/matita/tests/compose.ma
helm/software/matita/tests/constructor.ma
helm/software/matita/tests/continuationals.ma
helm/software/matita/tests/contradiction.ma
helm/software/matita/tests/cut.ma
helm/software/matita/tests/decl.ma
helm/software/matita/tests/decompose.ma
helm/software/matita/tests/demodulation_coq.ma
helm/software/matita/tests/demodulation_matita.ma
helm/software/matita/tests/dependent_injection.ma
helm/software/matita/tests/dependent_type_inference.ma
helm/software/matita/tests/depends [new file with mode: 0644]
helm/software/matita/tests/destruct.ma
helm/software/matita/tests/elim.ma
helm/software/matita/tests/fguidi.ma
helm/software/matita/tests/first.ma
helm/software/matita/tests/fix_betareduction.ma
helm/software/matita/tests/fold.ma
helm/software/matita/tests/generalize.ma
helm/software/matita/tests/hard_refine.ma
helm/software/matita/tests/injection.ma
helm/software/matita/tests/interactive/automatic_insertion.ma
helm/software/matita/tests/interactive/drop.ma
helm/software/matita/tests/interactive/grafite.ma
helm/software/matita/tests/interactive/test5.ma
helm/software/matita/tests/interactive/test6.ma
helm/software/matita/tests/interactive/test7.ma
helm/software/matita/tests/interactive/test_instance.ma
helm/software/matita/tests/inversion.ma
helm/software/matita/tests/inversion2.ma
helm/software/matita/tests/letrec.ma
helm/software/matita/tests/letrecand.ma
helm/software/matita/tests/makefile [deleted file]
helm/software/matita/tests/match_inference.ma
helm/software/matita/tests/metasenv_ordering.ma
helm/software/matita/tests/multiple_inheritance.ma
helm/software/matita/tests/mysql_escaping.ma
helm/software/matita/tests/naiveparamod.ma
helm/software/matita/tests/overred.ma
helm/software/matita/tests/paramodulation.ma
helm/software/matita/tests/paramodulation/BOO075-1.ma
helm/software/matita/tests/paramodulation/boolean_algebra.ma
helm/software/matita/tests/paramodulation/group.ma
helm/software/matita/tests/paramodulation/irratsqrt2.ma
helm/software/matita/tests/pullback.ma
helm/software/matita/tests/push_pop_status.ma [new file with mode: 0644]
helm/software/matita/tests/push_pop_status_aux1.ma [new file with mode: 0644]
helm/software/matita/tests/push_pop_status_aux2.ma [new file with mode: 0644]
helm/software/matita/tests/record.ma
helm/software/matita/tests/replace.ma
helm/software/matita/tests/rewrite.ma
helm/software/matita/tests/root [new file with mode: 0644]
helm/software/matita/tests/second.ma
helm/software/matita/tests/simpl.ma
helm/software/matita/tests/tacticals.ma
helm/software/matita/tests/test2.ma
helm/software/matita/tests/test3.ma
helm/software/matita/tests/test4.ma
helm/software/matita/tests/third.ma
helm/software/matita/tests/tinycals.ma
helm/software/matita/tests/unfold.ma

index 2f19a75239a319b733934251d99ec792170a3831..9e62f693582212ef20f5241590a34cf9e4c6696a 100644 (file)
@@ -57,6 +57,7 @@ CLEAN_ON_DIST =               \
        matita/TPTP/    \
        matita/dama/    \
        matita/contribs/        \
+       matita/library/assembly/        \
        matita/library_auto/    \
        $(NULL)
 EXTRA_DIST =                   \
index 681f3cd541312e8dff3e86e475cfe3e89aa0db7d..f6b1b68aa3958d50deb92c1ec97a4c82aaee7322 100644 (file)
@@ -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
index def5b0a1bb9a6834d24d60d61cce87bcbad2072a..4f366c9c271e970ee360911fee5accf66b5725a1 100644 (file)
@@ -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
index 7e1dc626f7885afe404fe224310b5c2a60a196e8..e402f4db214433ce174396929744ba8a4042d2cf 100644 (file)
@@ -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 () =
index bb742f1722481b36ca28b5676ea5e467c19ea6e4..b4e19dff80452402f04c92609563d4195c630a58 100644 (file)
  *)
 
 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
 
index ca41244617a50c99cb10483c7cbd24ff162aaba1..2ca28ce61aad63756e8713cb8f7cba790b6b6a2e 100644 (file)
@@ -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 
index ca41244617a50c99cb10483c7cbd24ff162aaba1..2ca28ce61aad63756e8713cb8f7cba790b6b6a2e 100644 (file)
@@ -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 
index 78135d9bef9abcf129b2c19a0d52ee3ace492aef..e3cc4fa0bd127807de06b53724fec19b31dee452 100644 (file)
@@ -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))
-
+*)
index 0ee424f18570d318b74d942d936573029d206eed..d68b6a8b4bfee412eab2ac206acb46aab90f55cd 100644 (file)
@@ -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 []
 
+
+
index 5ff710036cdabb312669f7fbc90d174730a7256e..77cda8a817d61b2589187c8cfdc30a0d3de3d53e 100644 (file)
@@ -50,3 +50,5 @@ val instantiate_level2:
   CicNotationEnv.t -> CicNotationPt.term ->
     CicNotationPt.term
 
+(* hack. seee cicNotation for explanation *)
+val reset: unit -> unit
index 24f0dd1967ab3f8711a5538f61058bcc13417fce..3ee270e4e00b42fd0b012a512b11a92feef48c82 100644 (file)
@@ -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 _ -> ()
+;;
index f951a6709817c862d1164a44b060efa8ae52b66a..73450ae11c62f7d860dcc9dface21a796767e132 100644 (file)
@@ -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
index e8e3171a08fa9290bd0d8405c63d0238843d7522..409c0921aeb3f41b1876511fb95d2a2100921527 100644 (file)
@@ -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
index 63580ad2e3bc607cb3f0aa91ad15bfb2b58fe6ef..d1a07a4ede269ef40ff4c1a00e6faf6a8b0c3b6a 100644 (file)
@@ -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 ->
index 067fe9b59dc3c5acd5afda051fff0e3bf405e028..d318d11a73cb504b788dd98aa45cf18d66f635ba 100644 (file)
@@ -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 ()
+;;
+
index 0a2595430462e88341e9cfeb3c458165fb695fcf..f66c0e85383c106ad161be035fcf0690f50ec0c3 100644 (file)
@@ -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
index 6e8be22bbe0367d149bdf148fbea77d8d9421395..71fd19f94b6d7289d1a7a47336d9ed05dab4914a 100644 (file)
@@ -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 
+  
index b26c0ca21fb6e13bf408dbaf6f06fd54fd6fba0e..ce988944bf7e2b574fd57bdf7cd8463ab5c575ba 100644 (file)
@@ -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
+
index 2dc8a7cab3c91b0c51d7f42b68ff98ab5ff40a2b..f097cc8d3af5c1df6e3c79bc97c0439558f01bb7 100644 (file)
@@ -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 
index 2dc8a7cab3c91b0c51d7f42b68ff98ab5ff40a2b..f097cc8d3af5c1df6e3c79bc97c0439558f01bb7 100644 (file)
@@ -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 
index eb33e49b80d7b5f453dbadb433851f7de3e96556..32ee44491020b96d3108199858b2a7fe0e8d3c2e 100644 (file)
 
 (* $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
index 6a8d2ae212bbfb17495fc0af3be6ce82cfe2c275..1b4a03a713815643b69ae4bb861acbb0697ab145 100644 (file)
@@ -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
index 53142e252bfe90a135405bfe32dd00c008d7b91d..ca3bc0b90592bb623e5d1199903afadc6c39573e 100644 (file)
@@ -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 
index 7a2e2dda877280596bbefae2bd39cbaa673eda98..798fa75f528ed734f5e85db3ae9330156582ca29 100644 (file)
@@ -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
index 50a373e49bf8b8389d0aad6836d2459c17f59a30..df18135ac56370767d77c3896855f2f3c62fbba8 100644 (file)
@@ -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)))
+
index f8754df0c4715f14c098e9072310e7d53be25a86..47f0af02bf455ea6ba3f919a16b679f4fcbd81be 100644 (file)
@@ -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
index 742532113894b8d6202cae4435b290886cc6f848..7e722bccf4344c7c9f097a23892ed03733fad40a 100644 (file)
@@ -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)
 
index b4ca6f0d73dad127382cd825b3abe07deb747c0d..c9df8ab487820802545c320d76d387ed5e21329f 100644 (file)
@@ -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
 
index 2d0f7813f78f1bb70bccb738b1ffa6c3a14f8d40..b397df31b974eadc715df01b8199f2f84d22cf51 100644 (file)
 (* $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
 
index d514c0273947084238fea63880031135b480f8eb..bea67a0b4bbf9a9f54d1b28fd310466eaa83fad3 100644 (file)
@@ -96,3 +96,7 @@ let set_active_notations ids =
   in
   TermAcicContent.set_active_interpretations interp_ids
 
+let reset () =
+  TermContentPres.reset ();
+  TermAcicContent.reset ()
+;;
index 944438df8621131c9f51fd88fd60e420bc3b2c21..81b01aa45625364cb33310838c832d9ca7572f4e 100644 (file)
@@ -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
index e99436e054860d2ef30e88e087bf4e7bed9bd692..fefbf93ecf773710f946be5e989d3e2e60d0b969 100644 (file)
@@ -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 
index 190aaf9b7ed952df67f019f3f11da1f30b47656e..d8ff04797645c5804394afb7282e346a3075bbc5 100644 (file)
@@ -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 
index a484846a95abe66621b0929f3c6fd8b96e587ab1..e3c921dd7dc21c752616f1b779e042e1af962232 100644 (file)
@@ -2,6 +2,7 @@ PACKAGE = library
 PREDICATES =
 
 INTERFACE_FILES = \
+       librarian.mli \
        cicElim.mli \
        cicRecord.mli \
        libraryMisc.mli \
index 0ca40eb1c2860cef5da6d5def71040cfb7422234..80222ad341f9d0ae8be79861a64735e03c46cbdc 100644 (file)
@@ -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
index e1afd61aa0eb2cd3272da19819b9eefbc2bc9c24..3071aecc4eb724064849f21da4fc8bcc8314d099 100644 (file)
@@ -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 (file)
index 0000000..124b1a1
--- /dev/null
@@ -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 (file)
index 0000000..0db8a83
--- /dev/null
@@ -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
index a1f2a0cfc08fd356437b20a71dd7eea3d5220d48..9a3b172454c00268bd0a4320030bee9711b76a6a 100644 (file)
@@ -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 ^ "/*");
index c36d84c90dd88de02938fdef9507906a55659edb..630b51be8a59c4352cf4fe92bbf5d716f6891d1f 100644 (file)
@@ -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
 =
index d8e432e75b9035888478ed3d1277dbe730344dcc..9dd3f5c3c55d687386f3387504eb3d828e185c28 100644 (file)
@@ -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
index 436766862b714ba78af312270b60b669ef0c35f3..d81ec21310b24edda459b1d7d47447783010219f 100644 (file)
@@ -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
       ]
index 8c97039fb2eabf789b8031f1746a34a366b91ad8..69f415ee14f8bfb4e122534f941e75df3e67d7b9 100644 (file)
@@ -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 :
index a20df9d4c53e35930fb7a5be5d1a38fbd1558cad..e0f59b499152ec09119016d78b69a5d0674a204f 100644 (file)
@@ -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 (file)
index df20a35..0000000
+++ /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 (file)
index c243d79..0000000
+++ /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 (file)
index 8830a83..0000000
+++ /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 (file)
index e69de29..0000000
diff --git a/helm/software/make/test/b.c b/helm/software/make/test/b.c
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/helm/software/make/test/c.c b/helm/software/make/test/c.c
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/helm/software/make/test/d.c b/helm/software/make/test/d.c
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/helm/software/make/test/e.c b/helm/software/make/test/e.c
deleted file mode 100644 (file)
index e69de29..0000000
index b0d8efc5bd06d91023276b9e9687c9f19acab763..97149bc33cf0a656cf11acf4cc1ac07da675ddd1 100644 (file)
@@ -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 
index 933d2bb51247aae2cb974edb2722ca8e192e6b08..8477d5640603280e9716d9a0982b7100611d959a 100644 (file)
@@ -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 
index 6595af73e5768fab4b52fe44e82b957ba82a4581..97d74fdc4b1662661f02d006ca9ca40f429f676b 100644 (file)
@@ -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 (executable)
index 87ece78..0000000
+++ /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 (executable)
index 32df4b0..0000000
+++ /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')
index ec01152c44e878cdd97fe5b3f5c8ada08b981d87..6f693a1387c3e953eb03f92358ff130a7532dec2 100644 (file)
@@ -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 (file)
index 0000000..7fd5e9c
--- /dev/null
@@ -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
index 4864a2c861c61b2215540489fdd61bc0e7d63232..a7dbfcbd6884603712acf5cbc16d768a321a76b8 100644 (file)
@@ -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".
 
index c7952ebd20beb6df6fa93426d1c0784f4e0d6255..0f735ac5fb193e018fae7c2c2a64c9fc7829dc5f 100644 (file)
@@ -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".
 
index ec3212d2515e7ddaa3ecf6db9cb844a7474ae6c1..240efefe0abf38d39326e05827e59bea1a2787a6 100644 (file)
@@ -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 (file)
index 0000000..9bb223d
--- /dev/null
@@ -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 
index e8a076513f82c7c32ee94ed0af4ed0543964f4e7..95d322b55a282bc2d8f40dd4f297e71fe3f6c64a 100644 (file)
@@ -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".
 
index 4a7946c6850d01ab72be52c39dcb8d2827d4f043..c23428942b1c7c19adcf316e7bad16661a8510be 100644 (file)
@@ -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 (file)
index 3198e94..0000000
+++ /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)
index 1ca1142d9acd0d380cbbb674dd4e3945a35c6408..71cbd156a2d15edc3c5cd000a3de1bb49bf38864 100644 (file)
@@ -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".
 
index 7338262f1127b22d854175ef9af05c5c67b2ce10..d40a3a8870699091b408d660b4895ab81fd750ce 100644 (file)
@@ -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".
 
index f5ad380c9d421adc85cbd0164c695836c0b61644..29ebdfeffd222d1c02041af8b02c08fb1ad6b434 100644 (file)
@@ -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 (file)
index 0000000..43a60f9
--- /dev/null
@@ -0,0 +1,2 @@
+baseuri=cic:/matita/LAMBDA-TYPES/Base-1
+include_paths= ../../../legacy 
index e19f961cc07e606a47e0c7f9f13070d611c4e820..fbcaab295267f8db119e9d9d1ce9759775d8c63a 100644 (file)
@@ -14,7 +14,7 @@
 
 (* This file was automatically generated: do not edit *********************)
 
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-1/spare".
+
 
 include "theory.ma".
 (*
index d89a2185843e2b3ff46ba81019a196bc593c3148..9aae1717a1234ad60cd3993d405e98b7563cb620 100644 (file)
@@ -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".
 
index 638fd2e490d082699031397c39ae1a215a2fcd6e..0f0b999adde761913cb214809a9a636a5af79c93 100644 (file)
@@ -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".
 
index 1c9b499bba0b102cde84aeb5c6cfbbc06f5e9a1a..6917ec13d330fe98aa58af2062556770e74f9089 100644 (file)
@@ -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 (file)
index 0000000..f67b795
--- /dev/null
@@ -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/defs.mma
deleted file mode 100644 (file)
index 12438b3..0000000
+++ /dev/null
@@ -1,23 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* 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/defs2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/defs2.mma
new file mode 100644 (file)
index 0000000..6eb9483
--- /dev/null
@@ -0,0 +1,20 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+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/props.mma
deleted file mode 100644 (file)
index d244663..0000000
+++ /dev/null
@@ -1,28 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/blt/props".
-
-include "blt/defs.ma".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/lt_blt.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/le_bge.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/blt_lt.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/bge_le.con".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/blt/props2.mma
new file mode 100644 (file)
index 0000000..1fd2047
--- /dev/null
@@ -0,0 +1,26 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "blt/defs2.ma".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/lt_blt.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/le_bge.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/blt_lt.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/blt/props/bge_le.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 (file)
index 4ac4a61..0000000
+++ /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/arith.mma
deleted file mode 100644 (file)
index ee4663a..0000000
+++ /dev/null
@@ -1,112 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* 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".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/simpl_plus_r.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_plus_r.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_permute_2_in_3.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_permute_2_in_3_assoc.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_O.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_Sx_SO.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/eq_nat_dec.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/neq_eq_e.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_false.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_Sx_x.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_n_pred.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_le.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_plus_minus_sym.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus_minus.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus_plus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_trans_plus_r.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_O.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_gen_S.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_plus_x_Sy.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/simpl_lt_plus_r.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_x_Sy.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_plus_minus.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_plus_minus_r.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_x_SO.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_x_pred_y.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_le_minus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_le_e.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_eq_e.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_eq_gt_e.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_gen_xS.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_lt_false.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_neq.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/arith0.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/O_minus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_minus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_plus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_S_minus.con".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_pred_y.con".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/arith2.mma
new file mode 100644 (file)
index 0000000..436b497
--- /dev/null
@@ -0,0 +1,110 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "preamble.ma".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/nat_dec.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/simpl_plus_r.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_plus_r.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_permute_2_in_3.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_permute_2_in_3_assoc.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_O.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_Sx_SO.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/eq_nat_dec.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/neq_eq_e.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_false.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_Sx_x.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_n_pred.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_le.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_plus_minus_sym.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus_minus.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus_plus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_minus.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_trans_plus_r.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_O.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_gen_S.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_plus_x_Sy.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/simpl_lt_plus_r.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_x_Sy.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_plus_minus.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_plus_minus_r.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_x_SO.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_x_pred_y.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_le_minus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_le_e.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_eq_e.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_eq_gt_e.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_gen_xS.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_lt_false.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_neq.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/arith0.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/O_minus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/minus_minus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/plus_plus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/le_S_minus.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/arith/lt_x_pred_y.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/tactics.mma
deleted file mode 100644 (file)
index 18de7f7..0000000
+++ /dev/null
@@ -1,27 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* 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".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/unintro.con".
-
-inline procedural 
-"cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/xinduction.con".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/ext/tactics2.mma
new file mode 100644 (file)
index 0000000..e6b7519
--- /dev/null
@@ -0,0 +1,25 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "preamble.ma".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/insert_eq.con".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/unintro.con".
+
+inline procedural 
+"cic:/matita/LAMBDA-TYPES/Base-1/ext/tactics/xinduction.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 (file)
index f20e608..0000000
+++ /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/defs.mma
deleted file mode 100644 (file)
index 3dc03da..0000000
+++ /dev/null
@@ -1,32 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/plist/defs".
-
-include "preamble.ma".
-
-
-(* object PList not inlined *)
-
-
-(* object PConsTail not inlined *)
-
-
-(* object Ss not inlined *)
-
-
-(* object papp not inlined *)
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/defs2.mma
new file mode 100644 (file)
index 0000000..4ae6d51
--- /dev/null
@@ -0,0 +1,30 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "preamble.ma".
+
+
+(* object PList not inlined *)
+
+
+(* object PConsTail not inlined *)
+
+
+(* object Ss not inlined *)
+
+
+(* object papp not inlined *)
+
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props.mma
deleted file mode 100644 (file)
index 29357a8..0000000
+++ /dev/null
@@ -1,22 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/plist/props".
-
-include "plist/defs.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/plist/props2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/plist/props2.mma
new file mode 100644 (file)
index 0000000..f9cec90
--- /dev/null
@@ -0,0 +1,20 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+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 (file)
index f04df20..0000000
+++ /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 (file)
index 0000000..229adbd
--- /dev/null
@@ -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/theory.mma
deleted file mode 100644 (file)
index 1adab3e..0000000
+++ /dev/null
@@ -1,28 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/theory".
-
-include "ext/tactics.ma".
-
-include "ext/arith.ma".
-
-include "types/props.ma".
-
-include "blt/props.ma".
-
-include "plist/props.ma".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/theory2.mma
new file mode 100644 (file)
index 0000000..d1a0ca8
--- /dev/null
@@ -0,0 +1,26 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "ext/tactics2.ma".
+
+include "ext/arith2.ma".
+
+include "types/props2.ma".
+
+include "blt/props2.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/defs.mma
deleted file mode 100644 (file)
index 000f283..0000000
+++ /dev/null
@@ -1,80 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/types/defs".
-
-include "preamble.ma".
-
-
-(* object and3 not inlined *)
-
-
-(* object and4 not inlined *)
-
-
-(* object or3 not inlined *)
-
-
-(* object or4 not inlined *)
-
-
-(* object ex3 not inlined *)
-
-
-(* object ex4 not inlined *)
-
-
-(* object ex_2 not inlined *)
-
-
-(* object ex2_2 not inlined *)
-
-
-(* object ex3_2 not inlined *)
-
-
-(* object ex4_2 not inlined *)
-
-
-(* object ex_3 not inlined *)
-
-
-(* object ex2_3 not inlined *)
-
-
-(* object ex3_3 not inlined *)
-
-
-(* object ex4_3 not inlined *)
-
-
-(* object ex3_4 not inlined *)
-
-
-(* object ex4_4 not inlined *)
-
-
-(* object ex4_5 not inlined *)
-
-
-(* object ex5_5 not inlined *)
-
-
-(* object ex6_6 not inlined *)
-
-
-(* object ex6_7 not inlined *)
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/defs2.mma
new file mode 100644 (file)
index 0000000..594edd2
--- /dev/null
@@ -0,0 +1,78 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "preamble.ma".
+
+
+(* object and3 not inlined *)
+
+
+(* object and4 not inlined *)
+
+
+(* object or3 not inlined *)
+
+
+(* object or4 not inlined *)
+
+
+(* object ex3 not inlined *)
+
+
+(* object ex4 not inlined *)
+
+
+(* object ex_2 not inlined *)
+
+
+(* object ex2_2 not inlined *)
+
+
+(* object ex3_2 not inlined *)
+
+
+(* object ex4_2 not inlined *)
+
+
+(* object ex_3 not inlined *)
+
+
+(* object ex2_3 not inlined *)
+
+
+(* object ex3_3 not inlined *)
+
+
+(* object ex4_3 not inlined *)
+
+
+(* object ex3_4 not inlined *)
+
+
+(* object ex4_4 not inlined *)
+
+
+(* object ex4_5 not inlined *)
+
+
+(* object ex5_5 not inlined *)
+
+
+(* object ex6_6 not inlined *)
+
+
+(* object ex6_7 not inlined *)
+
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props.mma
deleted file mode 100644 (file)
index d79bfc4..0000000
+++ /dev/null
@@ -1,22 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Base-2/types/props".
-
-include "types/defs.ma".
-
-inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/types/props/ex2_sym.con".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma b/helm/software/matita/contribs/LAMBDA-TYPES/Base-2/types/props2.mma
new file mode 100644 (file)
index 0000000..10b5024
--- /dev/null
@@ -0,0 +1,20 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+include "types/defs2.ma".
+
+inline procedural "cic:/matita/LAMBDA-TYPES/Base-1/types/props/ex2_sym.con".
+
index 1c592efd2ffdd9dc3648784d8903409f13100607..b1c263edc1e9db8e27d23e2327b1ff96449ed8c9 100644 (file)
@@ -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)
index 0022395ce0579f09ac538b9dc2b47aae10bfee47..ed683a8351426714c70fe95e0e922f24d833f3fd 100644 (file)
@@ -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".
 
index 30901423e2cb64a0a587cc36b586b778a5960af8..c983c78640e718505c63b63b0743a2045cd8a413 100644 (file)
@@ -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".
 
index d66873d06d1614ab7fd9605acb4aae3476330ff7..10d9d9d5456f03d2f256c3dff7264b300a1de252 100644 (file)
@@ -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 (file)
index 0000000..7fd5e9c
--- /dev/null
@@ -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
index 0d05ba97f50fd9f21be9e21675a7489abc0eaf02..18fe43977f0d83bdeebab07c4d3adbc2af3dc363 100644 (file)
@@ -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".
 
index 236063dcf1147c612314c5d31263d9916963a3b6..f98aaf41886e9f960c08db92f832c18461cc79f3 100644 (file)
@@ -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
index 1c661524e92f51ade8d99f53179f7d80f16f9d47..c9b9619f407fde650546eae49e78aa8e2073747a 100644 (file)
@@ -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".
 
index 0a1c35ea23290c295f1131f2e0418cbc4eedb162..9789157aa5485cb389dfcfbecfa06351405c0af4 100644 (file)
@@ -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".
 
index 16adef5c317c100b1d4781b4dea92c3a5d00ceae..7ea6fb43a3839a9cc01e1a49cf1d93816844fcd4 100644 (file)
@@ -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".
 
index 2580372750d211a97266de8d8e815a9379172ae6..e8da5937ced7eaebf1bc89dc1a85a7dad9c813c4 100644 (file)
@@ -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".
 
index 60264bca217d58e0bbefed4a487dbd7b2b5397bc..7b8320a9cc35bf7519ea70a156fed43662d4e939 100644 (file)
@@ -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".
 
index e3a36f11c5f5316f60e7d0e5956d503968662115..84bd49b7ee43eb578a55d6588418dd2b86a10a8c 100644 (file)
@@ -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".
 
index 2af721d15eee3290a56544e584347a793cc1a627..6e6662c266656a8dacab020cfe0f3bdfda6e7a67 100644 (file)
@@ -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".
 
index 410400d5f50c7980fe1f59eccac91f8f8470ccc9..38edb49c1088d663ef5982286a480ca1ada9466a 100644 (file)
@@ -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".
 
index fbdcd3848ca7d6c0786045e15e0b6a0c071b11b5..e2a3e07928a67bc5c944e94134d06157f84163c5 100644 (file)
@@ -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".
 
index 46e4c8c8616f4a5f3f14d37f3c51a617e0348499..cf2844c301ee860fc9224411b75b262cd3aeb736 100644 (file)
@@ -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".
 
index 7b60c2af4bb8558db707e183445fc9c609c1f082..eaedb44aa0da5687ff7d463dea93708e7403a329 100644 (file)
@@ -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".
 
index 6c9662aeb45e2dbdd3f07e98b3c3891531c36e8f..ec9fdb5954c81f024f486d30c2c49b21fe488b01 100644 (file)
@@ -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".
 
index 4592f394aa774e14ae8000af643b136b4acb6758..d826c0155a060225f4bb841980e85f4bb17ff672 100644 (file)
@@ -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".
 
index ae2233051f09fd24e233c40f9f221923d91ed4f4..eb22b192e740fee22ff2be05ef1fb084882a4b71 100644 (file)
@@ -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".
 
index d2c77132e80e51d61b3b56771af9fd5b6ea73cc7..b6f65337a856ffc601f262e1c0661941a6579b88 100644 (file)
@@ -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".
 
index c5390f97bf679ecff144ea3c7b7f6feed8ad8aee..75eb7959b3b211eb10ecc08a382cf7f6d9b8827b 100644 (file)
@@ -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".
 
index ae0f6a567474d325ac28c99307f1a84ce4a51ff7..263d95fd2a7f2b009a07aad4b5693263eb278a33 100644 (file)
@@ -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".
 
index 118dc7ccfb2f72f7fa5b8e72668f6b388b3e611e..4fffe08a37c38ea19a31c72aaf4898445557ecf2 100644 (file)
@@ -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".
 
index 2cfcaa87412536a575cf880ef833a91fc0d92322..142bf6ce751f1a3d811b7b9faae50bb5dfb273a4 100644 (file)
@@ -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".
 
index 4749583de34169306fa8edb969348f44b1acb924..ef2a4d4d94799e65dee2077c8b4edd0b9c6544f9 100644 (file)
@@ -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".
 
index a1880711dbe23e3d03bb444422ea7f3ad704ccb3..2d3a7b623f0feb653eb9b478847b8f643f846ef9 100644 (file)
@@ -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".
 
index 2885518ead037687b24ed63cabc95b84da77577d..85679b7fbd6eda1d8fa63d4e9597e28da52daf36 100644 (file)
@@ -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".
 
index 8773297ca2ccaa3c0fd573ab19419ef105bc3ddf..cd4c8167484611ae1764d3b30756150146b470ed 100644 (file)
@@ -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".
 
index f9b4334e10b90947351ceaf17dece7d86f7e9d06..946a9c4761909ac97e3a00d790f35c2d66badec7 100644 (file)
@@ -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".
 
index 81620ce9ee677b400328dc64a9ed7325a6ccfd4f..483834e82d872f832713c9d1cb30f5a925807128 100644 (file)
@@ -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".
 
index ff9d01c9ebf8cfed93fbcd5ed81cdcbccd48a745..6b8cf3462c71882bbf32ea8244ba6c6a0279ab76 100644 (file)
@@ -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".
 
index 036ca2882f24e9251e0946433362e02356096112..43f49000436ca5ccde06eecf0c44a78ab4be96a4 100644 (file)
@@ -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".
 
index 1b8612a2f81d1ae19cc2429fb9a1712957b7d847..a4726224958e0d43fc22375b0c895878ec947bbb 100644 (file)
@@ -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".
 
index 003b18a5e3bbb9b6bf4c47049981b8cbb50b6df4..01ed2fb11069557c4c8535f5182a408388540aaf 100644 (file)
@@ -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".
 
index 2b56bc7a0884f8554e9acb6f8721f393642156ce..0ba50cbbd98cb6f910bef8222ed53391a468d3f7 100644 (file)
@@ -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".
 
index d93e4d61824cbf76775a9ffe2539196bb532df03..5e9baff2cec513869e076b0ee9c4c930884a7813 100644 (file)
@@ -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".
 
index 62e10c0958b26ad3e1b8009da153ab7a1cc356e7..590a89f2ed62ddae59bf73970b75ce49aaad35ed 100644 (file)
@@ -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".
 
index d697f125707b5826f84049b6d902f1dcdcedb6c1..b705f618ecb0af94bfc943149816ad5fb0b38063 100644 (file)
@@ -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".
 
index 059c359aba55d7e931d382d4f5bb0589e97f5d91..1ddc85ae2e0837ad4d3b180c2ab13fbe214e955d 100644 (file)
@@ -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".
 
index 646247a793eb258038ac9b2208cd16c7746f33c6..c4a7269fbebf4558789f082c2a0ee4d8163a2959 100644 (file)
@@ -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".
 
index 6348a632b92579519ea6777971a7f860053a22dd..08943ec39fde7cb2d0b9a26527068043be015aed 100644 (file)
@@ -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".
 
index 301cba9357bfb4b8d12f039e3fecf15ac1a78d5b..748c7148442af77b4ea894381a4fe4f9a6e6d088 100644 (file)
@@ -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".
 
index 75651a172d5a51d6457d48bfb8990153d6b44719..181f3601e28f58b8e496df0d91edd155b5ef710b 100644 (file)
@@ -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".
 
index dd2a0397ca629af9ab4767c00ce2ac30dba29a13..6bfecf5a3fd68bbe131d24bc8677a520f313fad5 100644 (file)
@@ -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".
 
index d13d2b09fec450edfb37b9be96e72eabf6c50432..ccebb72e8098d568bbba11e13fe2cb70c03685b4 100644 (file)
@@ -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".
 
index fb9fdf5a563dd4736094401e7e9b0c074f8d4232..2fc335e58451a20551af1c50bc47682f79ca43c2 100644 (file)
@@ -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".
 
index 5d90ea5998f98418bee75be8e289e2f81757f0d4..df56d48aa7b594b5b4975a61f62e830c2ac23d03 100644 (file)
@@ -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".
 
index b1a0632080a04ebd721314473382ee79ab11168a..98f0941019eab738f1c2eab1e76a74f389d30f94 100644 (file)
@@ -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".
 
index 7980be5fce74f62c2c470b93fdf66470661e5ebf..1b55e2acb2cdcc82e30a2dcc4437a9f91bc25f4d 100644 (file)
@@ -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".
 
index d4ccb6ee512dbf20a85a5515ed690249ee4a6050..175c1ae27dce79042cc4c85f57afb408aaf1410f 100644 (file)
@@ -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".
 
index 24e20c4003e94e6070b536b5526d2f762e2ab1ac..692dbfd87a16a57371f30813bda3da721959d082 100644 (file)
@@ -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".
 
index a298dfc8c097685cf98bc3bb909227590da873a9..f2b0df4c95757c18e14f75fb25cf77049e424b93 100644 (file)
@@ -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".
 
index 96e86eea5eed8f065222d51b1fdd93ed52b42407..0f4e479e9d3666d7cdf81813979eb7cea7cc1e91 100644 (file)
@@ -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".
 
index a6af74625a928366c7ef937af3860265a3f78b3d..8ade743e9e605dde411416a6dd67c4ea69f15afc 100644 (file)
@@ -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".
 
index 9cafa826f22c0ae9a1014ba0e4d63777c6f31478..c9c7528e6cd713415e8fd48361240b72a14e4864 100644 (file)
@@ -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".
 
index 22581895b29dbe2561c4d9a59489fdbf030e15bf..69b533d26d526692aa3236cd427e14c73af89f15 100644 (file)
@@ -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".
 
index 3f90ff3ce22f208eb47ca11d06e403ea328f3cf5..22ce1208258772b51ba0eb0933bf06c97b4de3f5 100644 (file)
@@ -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".
 
index 7a7efe4ce2aad6abee96eb8554af40a203ebea23..567fcce7df71cc60c8bbb982163f6e4c193ea082 100644 (file)
@@ -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".
 
index 92e19a50396821a11ebf9c81b52cde7ec8c40dc3..f541ecb34d7826e47f5a96f1d76a67a5de8a1153 100644 (file)
@@ -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".
 
index a0f89e0fa16feb281cc9123f2f942063050e82c1..b8da01d6c71ff3c797af83c31d060f30b3fb291b 100644 (file)
@@ -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".
 
index d8a6ad246a78b8ff470fdb23d81bb13be6ca2744..3330b56b239aa3b1f49ea37488125f1d9a261aac 100644 (file)
@@ -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".
 
index 5d88520a97f92a9232ad30f2501d88ca1675bef6..115ddda340331d977e38da4423e18d9779b5f5ee 100644 (file)
@@ -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".
 
index 3fbcb516fe2e9c3221e4c392664fe24809181c06..23677feed32d7540a242d398c22a542e4d84aff7 100644 (file)
@@ -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/definitions.ma
deleted file mode 100644 (file)
index 6201547..0000000
+++ /dev/null
@@ -1,62 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/definitions".
-
-include "tlt/defs.ma".
-
-include "iso/defs.ma".
-
-include "clen/defs.ma".
-
-include "flt/defs.ma".
-
-include "cnt/defs.ma".
-
-include "cimp/defs.ma".
-
-include "subst1/defs.ma".
-
-include "csubst1/defs.ma".
-
-include "fsubst0/defs.ma".
-
-include "next_plus/defs.ma".
-
-include "tau1/defs.ma".
-
-include "llt/defs.ma".
-
-include "aprem/defs.ma".
-
-include "ex0/defs.ma".
-
-include "wcpr0/defs.ma".
-
-include "csuba/defs.ma".
-
-include "nf2/defs.ma".
-
-include "ex2/defs.ma".
-
-include "csubc/defs.ma".
-
-include "pc1/defs.ma".
-
-include "ex1/defs.ma".
-
-include "csubt/defs.ma".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/definitions3.ma
new file mode 100644 (file)
index 0000000..61d77ed
--- /dev/null
@@ -0,0 +1,62 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+
+
+include "tlt/defs.ma".
+
+include "iso/defs.ma".
+
+include "clen/defs.ma".
+
+include "flt/defs.ma".
+
+include "cnt/defs.ma".
+
+include "cimp/defs.ma".
+
+include "subst1/defs.ma".
+
+include "csubst1/defs.ma".
+
+include "fsubst0/defs.ma".
+
+include "next_plus/defs.ma".
+
+include "tau1/defs.ma".
+
+include "llt/defs.ma".
+
+include "aprem/defs.ma".
+
+include "ex0/defs.ma".
+
+include "wcpr0/defs.ma".
+
+include "csuba/defs.ma".
+
+include "nf2/defs.ma".
+
+include "ex2/defs.ma".
+
+include "csubc/defs.ma".
+
+include "pc1/defs.ma".
+
+include "ex1/defs.ma".
+
+include "csubt/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 (file)
index 0000000..23eb363
--- /dev/null
@@ -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 
index e0b46886f1b6e9faedbd4ef303c4154dd8a1abbe..eea831c6b63498c1ef22ecbf086dd29a16bc3468 100644 (file)
@@ -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".
 
index af9e245f3acca45b674289c15992b9472ab09175..bb9c1347ce49122d001cc8ba360cc1de7a8408c1 100644 (file)
@@ -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".
 
index 029720727666be2c444fd3999e29bf05204484e4..e4b21a1a7eee9eac73dc592cf1194fbb002fc0ee 100644 (file)
@@ -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".
 
index dea03ca7015ef583108327ebe32ed90da87cdf05..2a44cd4d557cc0a8b1700a5bb84980ea7482bffb 100644 (file)
@@ -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".
 
index f8ec287e328996e7e48b39effde7ac18a6bc4816..254873dfc8fe2beca7cdabb208e53a27c0116be1 100644 (file)
@@ -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".
 
index 5d1e9dc291bfcc6c19a2b76f2621ce269ec41b3e..1a84d0fe53767afab8416c82c9ad4a7eb8641672 100644 (file)
@@ -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".
 
index 078545c749eaa5803bd84afe0f22f605a2e7af95..a2ce931e4ebdfd65b6de9578afb6209ea093e7db 100644 (file)
@@ -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".
 
index 66350ed9c7b24b9af6226e687d126861725dceb3..d293ade399a1e95a2d79e9c6a60a83ff3400f0a8 100644 (file)
@@ -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".
 
index 3e16c05ed0ec907b432213ecd8e5c42c054f6acc..3963c2b0e204609e71e66d7d14e64f7ce036ab0a 100644 (file)
@@ -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".
 
index 218efc455bc6204b8745547311cb7a965724df76..cbba091bc33dab9cf9282ec7065dff40a96311a1 100644 (file)
@@ -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".
 
index 482249d5e06759cb477caeb032d122adde6f72ae..5e30cd91355c25ed99c15aceeca94007056f9295 100644 (file)
@@ -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".
 
index f35ee35798b3bcea98077313d59659ebccfd08d8..85b21716f47f866d5db0a39592bfcae8cec6b111 100644 (file)
@@ -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".
 
index 9143b89a2e4cb3db9dd3d11cf621fc69807dcc7f..7ce10924a54053185bc0062abc5168d0274b09c2 100644 (file)
@@ -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".
 
index a8d7daff31d25cf75e995a2015426bf4df4b2f32..f152ce60134e6e40c9420ea7e2a7ede08c80c4ec 100644 (file)
@@ -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".
 
index d3eccba434248b767317bed1a67e746545075b80..9d80d9cab96b63c2600ec663d4c666879e35e920 100644 (file)
@@ -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".
 
index 773e572787cf9c7e835a2d141c669821345c4edd..ae79197b89503e55a4b3ffe5b5a822be37771100 100644 (file)
@@ -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".
 
index 8b7c5525957887f59421ec91cc63b8d74f12c84d..f7b8731983ac7f68e4579bf92d0f13160916ce6a 100644 (file)
@@ -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".
 
index f22b7b333abc04f4fcd2d768aa57bc0f58a6adda..17082d90325256698b97234e1e9dd489b75ffe37 100644 (file)
@@ -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".
 
index 0d97227a182b551589d0bfbed764744f29349d4d..c7e9a4ffb3391b23d5e8f9c177d451f282dcaa1e 100644 (file)
@@ -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".
 
index c176ca62d04b7b7423a77e00ea01eb2cf24d0858..67607225f2589e4124e5c0745975590902709d97 100644 (file)
@@ -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".
 
index 81a47ff2e852a00db81f3c68198878c33639c48d..aa94616167569e30f6f7a63419e44d47b0f71a24 100644 (file)
@@ -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".
 
index 5381652272098b3973806d80e7ecc77d6d661bda..99bf27b3ffe35c5778d6562852575b196812493b 100644 (file)
@@ -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".
 
index 62218d746e2a0685593c74f4ca8c9f8c7d435ba2..6ab30e2b8babc184dc55ad6f4dad853a1b207eed 100644 (file)
@@ -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".
 
index a5228d9502a00b3d1c63e278af282447675157b4..0f49cdaac030a9824dcf39b2045a31d215ed3004 100644 (file)
@@ -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".
 
index fa327f922cee556b04fa0e2f2eef0be6cf05fb3e..46e832ff66150b667231be43a324be5fef941d34 100644 (file)
@@ -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".
 
index 5a66079414670dac6425c5de2aef7fcd92b9a2ce..fc801e76201037a6d49ccb2d26f6208a8b284372 100644 (file)
@@ -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".
 
index edc9758a98a53fe41bd8c8a2794acf47abc7b32f..0393ee1408627d26eea1a59271a7a9790041336e 100644 (file)
@@ -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".
 
index 25f9dfd074c944c466a5f7639c86be2eb7a4556f..73fff7f79f5ab1ec3872400850e5b55f982942c0 100644 (file)
@@ -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".
 
index d14a0e5353e17b547f29eadc94b2b4f45f8d87ee..83f68a21a7016d41596af057308267b20bd1a901 100644 (file)
@@ -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".
 
index 36c26579b5bc9ad1f918ab3cee0040ed94d009bf..649eb872be605ee2696ce4936472bd390eab1e4c 100644 (file)
@@ -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".
 
index 0ad16f9e7c681689f09156afbe372878275f8035..d879be152b236b2d3ca6620e84c1f2844a5ebfc7 100644 (file)
@@ -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".
 
index 9a03fcd170e48292d3c1165dc8f7edc02a576923..de61fc39f474a5d8a1d85eff9a0c02847651c13f 100644 (file)
@@ -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".
 
index 5a80f43e6c794d929d1c2420c6478cc0ccf6bf68..a68695a3384318dab185c6db13553cc9ead58c69 100644 (file)
@@ -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".
 
index 6a8cc0ac0b81898c4e9917415ec5021cc0ee86b5..3805df7db2fbaf40e248758257a92bccf8013fac 100644 (file)
@@ -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".
 
index 0e041d02d883d27e7b2a48a323ab5dc281ebd420..316ebe839332905fde327bb545fe18b9d07bf883 100644 (file)
@@ -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".
 
index 4042efeee7798ccf7a645a7f72608906c2874372..3764b6b2518085589b9793f2c43a2d592936bbc5 100644 (file)
@@ -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".
 
index bbdef6d1f9e5f1f034a4bac4a0254a29d57cd0ea..426af9e102c7ed1fbbe5405db21a1c4c6acc9b01 100644 (file)
@@ -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".
 
index db5d76536b0ccccdd0b267ee0150e91bd2a846a0..7b8ce0c794795d6ebdf42c2bd6086554561d282e 100644 (file)
@@ -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".
 
index 19ef144865d3288fb338b2209df9d56d03d3dded..ba4d1f3ba10f5b227a5b543c2182db2e5c252f71 100644 (file)
@@ -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".
 
index d344883006a28136227aea93fd658b23fd7399ce..22fcde7320e258822382c0d9a0a55922871a66b5 100644 (file)
@@ -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 (file)
index 8f20b32..0000000
+++ /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)
index 1764e86108ea4f0df1ed393ccda4fb29aed73b6e..f5922b8e7f98c335ccf43a706993c9a47af4bd02 100644 (file)
@@ -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".
 
index e0f2654acafbcec45e6b7ea4d7f7c0ab0405a974..57f461e504d163b5056f3d85511b149f362db618 100644 (file)
@@ -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".
 
index d67f672823638bcff2923b24f7b2643eb4d0020d..75db60a3796b34038bc0274998f8c3e774c92d08 100644 (file)
@@ -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".
 
index d7aa80992ee16d80b5bd7575fc6f26c3afc35ddb..25245ac1170c7ce5b2a56b309f62f12a48fabbfb 100644 (file)
@@ -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".
 
index 23868ee8bb503dc065e4f58af21daaad5488bce8..b219352e9c499097e10fe88856005bd34371a636 100644 (file)
@@ -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".
 
index 849e860904d603e79a610557eb7d561fde347984..531f5979b93cafbb37d0058364bb82fe01be767f 100644 (file)
@@ -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".
 
index 54b097c04226e9e880f8d073683ffc1d3845fe32..7d90db0fc9af1bc6c08ff7af596804a0ed890d91 100644 (file)
@@ -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".
 
index 33c44778da31ab61f7cf21b451ea455f99ed4fbe..9049b7518e9b2767809bbfdb93dfeccbc32f737f 100644 (file)
@@ -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".
 
index 2206469dc49c3084fd427d12cce229202edc0d89..b33e7c851995d5d21d3512aec756bcceaf53c428 100644 (file)
@@ -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".
 
index 499cd5fdc9a04be749bca7456ba8c192d74c4966..47c82fd63a0579bd5ed52f0ec4b55289b931d5e5 100644 (file)
@@ -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".
 
index c81142f5df78af549b9bb834acb2659779bddae3..20029263c0e1e48eae18ddab799a2c164810447f 100644 (file)
@@ -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".
 
index 0bd48d44c1003ad868ddeedb92d8477b5e759721..2792972297714dd8913eeed0dcab95bdf547abff 100644 (file)
@@ -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".
 
index 01f4fc13bfdc548f061827e411edace741478cb2..9877b5b847e89d5108b839a675b04fd095d0744b 100644 (file)
@@ -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".
 
index 91d5eaf8b7c3f0e2973622f5465d57bc9c102387..c475349cf02300e9f6790822767b546d7c439cb5 100644 (file)
@@ -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".
 
index 6ab7daf1cb08a7ecf887f2cdd3e38fdc6ca80d7f..e286c315db50f405435f393bae0c2f2a87764e4f 100644 (file)
@@ -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".
 
index cd70ecf452c6cbbbac68f1c027ce362bba10721b..9c94e0f44759615db3ce7f79e7b92ecb0aa56b13 100644 (file)
@@ -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".
 
index 3a6db77067cad833ba094d4eafc6c9fb40afdbba..a44249eea1c5f85e6f8603ad34506163bbee994d 100644 (file)
@@ -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".
 
index 41136207b68cab42aca00ca044d65b72dc30c8f4..7bd86cafc1f43a90780422429e5271a7e7ba2725 100644 (file)
@@ -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".
 
index 0893239e47c0083e5307ae69d4b47013ed3982bb..7d592cbbc2fda94bcf96850ccc183f9a6bd8e2bd 100644 (file)
@@ -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".
 
index 98a40de4e08787596a1c92cf580514b34fcd9943..f72ad7a2ba760990d2e8455a82ec2846624529ea 100644 (file)
@@ -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".
 
index 510b2d649a373afcf2c78b5f51dbf46f5c27572b..6a9dd24643f6c38ee46c351edd9bc6b7ed0b4d59 100644 (file)
@@ -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".
 
index 5ed59a431821a1ca976478abb2880780a0a41793..e1a302b8e572fac96b8de9c04799e71e8d43b6a4 100644 (file)
@@ -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".
 
index 26c4a21b658aa1dd7f8515b4e8984a40441de49f..429de32f7b9fe38ab7bed7422e6b48374ead1f07 100644 (file)
@@ -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".
 
index 4086f5bebeee415c958a2a1a3b4cd9737e11cea1..8f4ecf54989bf7f4137b5bc4ca55930b295839d7 100644 (file)
@@ -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".
 
index 5d1ef3b24d8e4d4ee8acd03feba0a40a61c4e9fe..1adb477491e9855058e4590912048b362902ece2 100644 (file)
@@ -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".
 
index 59e04cef8feba01a1ef3b7ddf0e1fe0d6b7486b6..00f623b6924b2ab00e5c3b6f3d8b0d3c6ec989e8 100644 (file)
@@ -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".
 
index 5e8396c47efaad2087caf3b8f37fd6c41aeb3f42..18496c8951612ecb908e8a4b636abe689bad384d 100644 (file)
@@ -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".
 
index 0aa55239f2ccf90e1b0463d13abed74569c4bcbb..f5722a3724b33549af42ea0c1e4bf82dd46cd0e0 100644 (file)
@@ -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".
 
index 85540bde737914cacfbbacab08789bb777608dd6..7a551d6b4911f0283b1947bb603ad58c7cdbe314 100644 (file)
@@ -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".
 
index 98a21a512f791d82b011ee93264ac6df247eea71..3aae64c4049e7bf41e27ea8eaa71482f2ceb5e8b 100644 (file)
@@ -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".
 
index 7840b3cd29bc14f37ccf5bdf746f553809c59df4..330d11f0580756ecb8ffc90cf3db34e90a05dccd 100644 (file)
@@ -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".
 
index 27275fa3a10fb54d5926a107b59231d87ac45cb2..e354ba5c41926595c727c34d811fa84d1d6557ba 100644 (file)
@@ -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".
 
index 77932c984ae530724ce254ec3c1ce80527aaa041..743e6870336df90699f7729b28953fe834741910 100644 (file)
@@ -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".
 
index 848d216fa6852af43ea0e0432d15a6c386eb7117..7333bbf05eeaad227da4836c83b8ac97be5a0b21 100644 (file)
@@ -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".
 
index 307d55398fdb6c616119bc3d1404990cb4004a8d..d060f68a0a1d8a471f23995a4cb509d723cd91dd 100644 (file)
@@ -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".
 
index 2cb35e582a7aeb3293883d6ec730fa9eee5642fd..2f8498c59635daf6b48e119c3cb12571b226ed13 100644 (file)
@@ -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".
 
index 27a0221d5011e83c49782c090c758985aae89817..051b6d50ef8a73ef806d0f1f5c6e0cd905da1f6e 100644 (file)
@@ -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".
 
index 3baff8a16cf46f37291f98d90ff9ab6ea30ad172..a53549dded9d3ccb6a7a013ca1a742ad7490a567 100644 (file)
@@ -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".
 
index 5e6137217aa44acc6c81dd68ca22565149bacb4d..32626a34cd006392cc0e48de45fb6c68b8a18e46 100644 (file)
@@ -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".
 
index 1f628e9b21dc84f931ee239c8aeb1a561a86e849..7ec0ba521881b330e671f9cd5554723a45a781d3 100644 (file)
@@ -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".
 
index 21344033ec89849e0c1f59ccd1a0c21ad1d0be85..df0a92d5b167ab226f5ee6506103ddc56cbc3a5c 100644 (file)
@@ -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".
 
index c29781a0e7f91301df05bd4de5f4ea1ab8bd28bb..c3511368c6f55a9d2b3c935456976922e9dfb0d5 100644 (file)
@@ -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".
 
index c07efa64dd4c27df6b42ba43d2fd822382ccb6bf..fa44c4bf3fde3d027394a3b981721798a22f5ecb 100644 (file)
@@ -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".
 
index 4894993fc6b24c34b4677e903a7d0e2fd7bc1eca..b6e5688be38179f70335e92aeab7233d4bd491d3 100644 (file)
@@ -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".
 
index dd20dae413f87945be9099d842b028e2ba6c0502..0d8c422ba5a904bf8668bd0b4cf59a3f548598a1 100644 (file)
@@ -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/preamble.ma
deleted file mode 100644 (file)
index f9dc333..0000000
+++ /dev/null
@@ -1,42 +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/LambdaDelta-1/preamble".
-
-include "../Base-1/theory.ma".
-
-alias id "and_ind" = "cic:/Coq/Init/Logic/and_ind.con".
-alias id "bool_ind" = "cic:/Coq/Init/Datatypes/bool_ind.con".
-alias id "ex" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1)".
-alias id "ex_ind" = "cic:/Coq/Init/Logic/ex_ind.con".
-alias id "ex_intro" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1/1)".
-alias id "f_equal2" = "cic:/Coq/Init/Logic/f_equal2.con".
-alias id "f_equal3" = "cic:/Coq/Init/Logic/f_equal3.con".
-alias id "le_antisym" = "cic:/Coq/Arith/Le/le_antisym.con".
-alias id "le_lt_trans" = "cic:/Coq/Arith/Lt/le_lt_trans.con".
-alias id "le_plus_trans" = "cic:/Coq/Arith/Plus/le_plus_trans.con".
-alias id "lt_le_trans" = "cic:/Coq/Arith/Lt/lt_le_trans.con".
-alias id "lt_n_Sn" = "cic:/Coq/Arith/Lt/lt_n_Sn.con".
-alias id "lt_S_n" = "cic:/Coq/Arith/Lt/lt_S_n.con".
-alias id "lt_trans" = "cic:/Coq/Arith/Lt/lt_trans.con".
-alias id "lt_wf_ind" = "cic:/Coq/Arith/Wf_nat/lt_wf_ind.con".
-alias id "minus_n_n" = "cic:/Coq/Arith/Minus/minus_n_n.con".
-alias id "minus_Sn_m" = "cic:/Coq/Arith/Minus/minus_Sn_m.con".
-alias id "plus_le_lt_compat" = "cic:/Coq/Arith/Plus/plus_le_lt_compat.con".
-alias id "plus_lt_compat" = "cic:/Coq/Arith/Plus/plus_lt_compat.con".
-alias id "plus_lt_compat_r" = "cic:/Coq/Arith/Plus/plus_lt_compat_r.con".
-alias id "plus_lt_le_compat" = "cic:/Coq/Arith/Plus/plus_lt_le_compat.con".
-alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con".
-alias id "plus_Snm_nSm" = "cic:/Coq/Arith/Plus/plus_Snm_nSm.con".
-alias id "S_pred" = "cic:/Coq/Arith/Lt/S_pred.con".
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/preamble3.ma
new file mode 100644 (file)
index 0000000..4bff571
--- /dev/null
@@ -0,0 +1,42 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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 "theory.ma".
+
+alias id "and_ind" = "cic:/Coq/Init/Logic/and_ind.con".
+alias id "bool_ind" = "cic:/Coq/Init/Datatypes/bool_ind.con".
+alias id "ex" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1)".
+alias id "ex_ind" = "cic:/Coq/Init/Logic/ex_ind.con".
+alias id "ex_intro" = "cic:/Coq/Init/Logic/ex.ind#xpointer(1/1/1)".
+alias id "f_equal2" = "cic:/Coq/Init/Logic/f_equal2.con".
+alias id "f_equal3" = "cic:/Coq/Init/Logic/f_equal3.con".
+alias id "le_antisym" = "cic:/Coq/Arith/Le/le_antisym.con".
+alias id "le_lt_trans" = "cic:/Coq/Arith/Lt/le_lt_trans.con".
+alias id "le_plus_trans" = "cic:/Coq/Arith/Plus/le_plus_trans.con".
+alias id "lt_le_trans" = "cic:/Coq/Arith/Lt/lt_le_trans.con".
+alias id "lt_n_Sn" = "cic:/Coq/Arith/Lt/lt_n_Sn.con".
+alias id "lt_S_n" = "cic:/Coq/Arith/Lt/lt_S_n.con".
+alias id "lt_trans" = "cic:/Coq/Arith/Lt/lt_trans.con".
+alias id "lt_wf_ind" = "cic:/Coq/Arith/Wf_nat/lt_wf_ind.con".
+alias id "minus_n_n" = "cic:/Coq/Arith/Minus/minus_n_n.con".
+alias id "minus_Sn_m" = "cic:/Coq/Arith/Minus/minus_Sn_m.con".
+alias id "plus_le_lt_compat" = "cic:/Coq/Arith/Plus/plus_le_lt_compat.con".
+alias id "plus_lt_compat" = "cic:/Coq/Arith/Plus/plus_lt_compat.con".
+alias id "plus_lt_compat_r" = "cic:/Coq/Arith/Plus/plus_lt_compat_r.con".
+alias id "plus_lt_le_compat" = "cic:/Coq/Arith/Plus/plus_lt_le_compat.con".
+alias id "plus_n_O" = "cic:/Coq/Init/Peano/plus_n_O.con".
+alias id "plus_Snm_nSm" = "cic:/Coq/Arith/Plus/plus_Snm_nSm.con".
+alias id "S_pred" = "cic:/Coq/Arith/Lt/S_pred.con".
index 005f3a107441f288dfb1bcf1af179407231ca505..08a744024fdcdec2647b081dbfa17b203c9af909 100644 (file)
@@ -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".
 
index 505d1e4507771e149ce550a533e506c012cc2161..f494453e705006a921c8edaa8753b2f275461cad 100644 (file)
@@ -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 (file)
index 0000000..cca0190
--- /dev/null
@@ -0,0 +1,2 @@
+baseuri=cic:/matita/LAMBDA-TYPES/LambdaDelta-1
+include_paths= ../Base-1
index 6cb9d340fd62bc87d8699b3cf457e66acc7f2a4b..8c499e16db8a7589a477308fa00e900029cd6998 100644 (file)
@@ -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".
 
index 7acdf612fa78c39a4cc73895346d730e05fdf45c..f77a611e5a3659a3311873f6dc95ab696322f278 100644 (file)
@@ -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".
 
index e7f13ac612e9158083ff81b81cbd9bb4e6f031c0..0f1ed1937c2cb16e295a449f7c531ae167aca97e 100644 (file)
@@ -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".
 
index fd161f395e12ab5efc91dee3ccb0bd0174f07aa1..ae5754fb991b9cbe67c5d42f53ed5b6e42b5bb33 100644 (file)
@@ -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".
 
index c1d3787b8cb2ac628abeac0e939a43c3cc5f293e..2bdf487cf1c8be9cf9e382f92adb6f8d1c68b6ed 100644 (file)
@@ -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".
 
index 0d38de3a8530cdadfe1c83bf234523b95d8c6ff8..92be591047f0b586c4414f013b3162bef6c06970 100644 (file)
@@ -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".
 
index 779e4a8cfbd5fad1e3a50e89598edeb9be928701..1283e6967486b6ca28b5a7bb3b0ae59d4fd73077 100644 (file)
@@ -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".
 
index d84d094a2fdfaacc083f393a8db21088b5a02b26..3428c0e638fb367be7d4d772e564116a88bb872e 100644 (file)
@@ -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".
 
index 7b5c1d1bbf9262c5d8b88e27b8285b3608158da6..fa21c378f8b33c87fe0c0e8d63b62f17cf91bdd4 100644 (file)
@@ -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".
 
index 8cdfff89e6ed437e334d194d521ecacce2931bb4..b47e2a185ce67e142bcdd65159ffbee70c8d830f 100644 (file)
@@ -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/spare.ma
deleted file mode 100644 (file)
index 70b9434..0000000
+++ /dev/null
@@ -1,118 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/spare".
-
-include "theory.ma".
-
-inductive sort: T \to Prop \def
-| sort_sort: \forall (n: nat).(sort (TSort n))
-| sort_abst: \forall (u: T).((sort u) \to (\forall (t: T).((sort t) \to (sort 
-(THead (Bind Abst) u t))))).
-
-theorem sort_nf2:
- \forall (t: T).((sort t) \to (\forall (c: C).(nf2 c t)))
-\def
- \lambda (t: T).(\lambda (H: (sort t)).(sort_ind (\lambda (t0: T).(\forall 
-(c: C).(nf2 c t0))) (\lambda (n: nat).(\lambda (c: C).(nf2_sort c n))) 
-(\lambda (u: T).(\lambda (_: (sort u)).(\lambda (H1: ((\forall (c: C).(nf2 c 
-u)))).(\lambda (t0: T).(\lambda (_: (sort t0)).(\lambda (H3: ((\forall (c: 
-C).(nf2 c t0)))).(\lambda (c: C).(let H_y \def (H3 (CHead c (Bind Abst) u)) 
-in (nf2_abst_shift c u (H1 c) t0 H_y))))))))) t H)).
-
-theorem sort_pc3:
- \forall (t1: T).((sort t1) \to (\forall (t2: T).((sort t2) \to (\forall (c: 
-C).((pc3 c t1 t2) \to (eq T t1 t2))))))
-\def
- \lambda (t1: T).(\lambda (H: (sort t1)).(sort_ind (\lambda (t: T).(\forall 
-(t2: T).((sort t2) \to (\forall (c: C).((pc3 c t t2) \to (eq T t t2)))))) 
-(\lambda (n: nat).(\lambda (t2: T).(\lambda (H0: (sort t2)).(sort_ind 
-(\lambda (t: T).(\forall (c: C).((pc3 c (TSort n) t) \to (eq T (TSort n) 
-t)))) (\lambda (n0: nat).(\lambda (c: C).(\lambda (H1: (pc3 c (TSort n) 
-(TSort n0))).(eq_ind nat n (\lambda (n1: nat).(eq T (TSort n) (TSort n1))) 
-(refl_equal T (TSort n)) n0 (pc3_gen_sort c n n0 H1))))) (\lambda (u: 
-T).(\lambda (_: (sort u)).(\lambda (_: ((\forall (c: C).((pc3 c (TSort n) u) 
-\to (eq T (TSort n) u))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda 
-(_: ((\forall (c: C).((pc3 c (TSort n) t) \to (eq T (TSort n) t))))).(\lambda 
-(c: C).(\lambda (H5: (pc3 c (TSort n) (THead (Bind Abst) u 
-t))).(pc3_gen_sort_abst c u t n H5 (eq T (TSort n) (THead (Bind Abst) u 
-t))))))))))) t2 H0)))) (\lambda (u: T).(\lambda (_: (sort u)).(\lambda (H1: 
-((\forall (t2: T).((sort t2) \to (\forall (c: C).((pc3 c u t2) \to (eq T u 
-t2))))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda (H3: ((\forall (t2: 
-T).((sort t2) \to (\forall (c: C).((pc3 c t t2) \to (eq T t 
-t2))))))).(\lambda (t2: T).(\lambda (H4: (sort t2)).(sort_ind (\lambda (t0: 
-T).(\forall (c: C).((pc3 c (THead (Bind Abst) u t) t0) \to (eq T (THead (Bind 
-Abst) u t) t0)))) (\lambda (n: nat).(\lambda (c: C).(\lambda (H5: (pc3 c 
-(THead (Bind Abst) u t) (TSort n))).(pc3_gen_sort_abst c u t n (pc3_s c 
-(TSort n) (THead (Bind Abst) u t) H5) (eq T (THead (Bind Abst) u t) (TSort 
-n)))))) (\lambda (u0: T).(\lambda (H5: (sort u0)).(\lambda (_: ((\forall (c: 
-C).((pc3 c (THead (Bind Abst) u t) u0) \to (eq T (THead (Bind Abst) u t) 
-u0))))).(\lambda (t0: T).(\lambda (H7: (sort t0)).(\lambda (_: ((\forall (c: 
-C).((pc3 c (THead (Bind Abst) u t) t0) \to (eq T (THead (Bind Abst) u t) 
-t0))))).(\lambda (c: C).(\lambda (H9: (pc3 c (THead (Bind Abst) u t) (THead 
-(Bind Abst) u0 t0))).(and_ind (pc3 c u u0) (\forall (b: B).(\forall (u1: 
-T).(pc3 (CHead c (Bind b) u1) t t0))) (eq T (THead (Bind Abst) u t) (THead 
-(Bind Abst) u0 t0)) (\lambda (H10: (pc3 c u u0)).(\lambda (H11: ((\forall (b: 
-B).(\forall (u1: T).(pc3 (CHead c (Bind b) u1) t t0))))).(let H_y \def (H11 
-Abbr u) in (let H_y0 \def (H1 u0 H5 c H10) in (let H_y1 \def (H3 t0 H7 (CHead 
-c (Bind Abbr) u) H_y) in (let H12 \def (eq_ind_r T t0 (\lambda (t3: T).(pc3 
-(CHead c (Bind Abbr) u) t t3)) H_y t H_y1) in (let H13 \def (eq_ind_r T t0 
-(\lambda (t3: T).(sort t3)) H7 t H_y1) in (eq_ind T t (\lambda (t3: T).(eq T 
-(THead (Bind Abst) u t) (THead (Bind Abst) u0 t3))) (let H14 \def (eq_ind_r T 
-u0 (\lambda (t3: T).(pc3 c u t3)) H10 u H_y0) in (let H15 \def (eq_ind_r T u0 
-(\lambda (t3: T).(sort t3)) H5 u H_y0) in (eq_ind T u (\lambda (t3: T).(eq T 
-(THead (Bind Abst) u t) (THead (Bind Abst) t3 t))) (refl_equal T (THead (Bind 
-Abst) u t)) u0 H_y0))) t0 H_y1)))))))) (pc3_gen_abst c u u0 t t0 H9)))))))))) 
-t2 H4))))))))) t1 H)).
-
-theorem sort_correct:
- \forall (g: G).(\forall (t1: T).((sort t1) \to (\forall (c: C).(ex3 T 
-(\lambda (t2: T).(tau0 g c t1 t2)) (\lambda (t2: T).(ty3 g c t1 t2)) (\lambda 
-(t2: T).(sort t2))))))
-\def
- \lambda (g: G).(\lambda (t1: T).(\lambda (H: (sort t1)).(sort_ind (\lambda 
-(t: T).(\forall (c: C).(ex3 T (\lambda (t2: T).(tau0 g c t t2)) (\lambda (t2: 
-T).(ty3 g c t t2)) (\lambda (t2: T).(sort t2))))) (\lambda (n: nat).(\lambda 
-(c: C).(ex3_intro T (\lambda (t2: T).(tau0 g c (TSort n) t2)) (\lambda (t2: 
-T).(ty3 g c (TSort n) t2)) (\lambda (t2: T).(sort t2)) (TSort (next g n)) 
-(tau0_sort g c n) (ty3_sort g c n) (sort_sort (next g n))))) (\lambda (u: 
-T).(\lambda (H0: (sort u)).(\lambda (H1: ((\forall (c: C).(ex3 T (\lambda 
-(t2: T).(tau0 g c u t2)) (\lambda (t2: T).(ty3 g c u t2)) (\lambda (t2: 
-T).(sort t2)))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda (H3: 
-((\forall (c: C).(ex3 T (\lambda (t2: T).(tau0 g c t t2)) (\lambda (t2: 
-T).(ty3 g c t t2)) (\lambda (t2: T).(sort t2)))))).(\lambda (c: C).(let H_x 
-\def (H1 c) in (let H4 \def H_x in (ex3_ind T (\lambda (t2: T).(tau0 g c u 
-t2)) (\lambda (t2: T).(ty3 g c u t2)) (\lambda (t2: T).(sort t2)) (ex3 T 
-(\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(ty3 
-g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) (\lambda (x0: 
-T).(\lambda (_: (tau0 g c u x0)).(\lambda (H6: (ty3 g c u x0)).(\lambda (_: 
-(sort x0)).(let H_x0 \def (H3 (CHead c (Bind Abst) u)) in (let H8 \def H_x0 
-in (ex3_ind T (\lambda (t2: T).(tau0 g (CHead c (Bind Abst) u) t t2)) 
-(\lambda (t2: T).(ty3 g (CHead c (Bind Abst) u) t t2)) (\lambda (t2: T).(sort 
-t2)) (ex3 T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda 
-(t2: T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) 
-(\lambda (x1: T).(\lambda (H9: (tau0 g (CHead c (Bind Abst) u) t 
-x1)).(\lambda (H10: (ty3 g (CHead c (Bind Abst) u) t x1)).(\lambda (H11: 
-(sort x1)).(ex_ind T (\lambda (t0: T).(ty3 g (CHead c (Bind Abst) u) x1 t0)) 
-(ex3 T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: 
-T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) 
-(\lambda (x: T).(\lambda (H12: (ty3 g (CHead c (Bind Abst) u) x1 
-x)).(ex3_intro T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) 
-(\lambda (t2: T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort 
-t2)) (THead (Bind Abst) u x1) (tau0_bind g Abst c u t x1 H9) (ty3_bind g c u 
-x0 H6 Abst t x1 H10 x H12) (sort_abst u H0 x1 H11)))) (ty3_correct g (CHead c 
-(Bind Abst) u) t x1 H10)))))) H8))))))) H4)))))))))) t1 H))).
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/spare3.ma
new file mode 100644 (file)
index 0000000..8916650
--- /dev/null
@@ -0,0 +1,118 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+
+
+include "theory.ma".
+
+inductive sort: T \to Prop \def
+| sort_sort: \forall (n: nat).(sort (TSort n))
+| sort_abst: \forall (u: T).((sort u) \to (\forall (t: T).((sort t) \to (sort 
+(THead (Bind Abst) u t))))).
+
+theorem sort_nf2:
+ \forall (t: T).((sort t) \to (\forall (c: C).(nf2 c t)))
+\def
+ \lambda (t: T).(\lambda (H: (sort t)).(sort_ind (\lambda (t0: T).(\forall 
+(c: C).(nf2 c t0))) (\lambda (n: nat).(\lambda (c: C).(nf2_sort c n))) 
+(\lambda (u: T).(\lambda (_: (sort u)).(\lambda (H1: ((\forall (c: C).(nf2 c 
+u)))).(\lambda (t0: T).(\lambda (_: (sort t0)).(\lambda (H3: ((\forall (c: 
+C).(nf2 c t0)))).(\lambda (c: C).(let H_y \def (H3 (CHead c (Bind Abst) u)) 
+in (nf2_abst_shift c u (H1 c) t0 H_y))))))))) t H)).
+
+theorem sort_pc3:
+ \forall (t1: T).((sort t1) \to (\forall (t2: T).((sort t2) \to (\forall (c: 
+C).((pc3 c t1 t2) \to (eq T t1 t2))))))
+\def
+ \lambda (t1: T).(\lambda (H: (sort t1)).(sort_ind (\lambda (t: T).(\forall 
+(t2: T).((sort t2) \to (\forall (c: C).((pc3 c t t2) \to (eq T t t2)))))) 
+(\lambda (n: nat).(\lambda (t2: T).(\lambda (H0: (sort t2)).(sort_ind 
+(\lambda (t: T).(\forall (c: C).((pc3 c (TSort n) t) \to (eq T (TSort n) 
+t)))) (\lambda (n0: nat).(\lambda (c: C).(\lambda (H1: (pc3 c (TSort n) 
+(TSort n0))).(eq_ind nat n (\lambda (n1: nat).(eq T (TSort n) (TSort n1))) 
+(refl_equal T (TSort n)) n0 (pc3_gen_sort c n n0 H1))))) (\lambda (u: 
+T).(\lambda (_: (sort u)).(\lambda (_: ((\forall (c: C).((pc3 c (TSort n) u) 
+\to (eq T (TSort n) u))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda 
+(_: ((\forall (c: C).((pc3 c (TSort n) t) \to (eq T (TSort n) t))))).(\lambda 
+(c: C).(\lambda (H5: (pc3 c (TSort n) (THead (Bind Abst) u 
+t))).(pc3_gen_sort_abst c u t n H5 (eq T (TSort n) (THead (Bind Abst) u 
+t))))))))))) t2 H0)))) (\lambda (u: T).(\lambda (_: (sort u)).(\lambda (H1: 
+((\forall (t2: T).((sort t2) \to (\forall (c: C).((pc3 c u t2) \to (eq T u 
+t2))))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda (H3: ((\forall (t2: 
+T).((sort t2) \to (\forall (c: C).((pc3 c t t2) \to (eq T t 
+t2))))))).(\lambda (t2: T).(\lambda (H4: (sort t2)).(sort_ind (\lambda (t0: 
+T).(\forall (c: C).((pc3 c (THead (Bind Abst) u t) t0) \to (eq T (THead (Bind 
+Abst) u t) t0)))) (\lambda (n: nat).(\lambda (c: C).(\lambda (H5: (pc3 c 
+(THead (Bind Abst) u t) (TSort n))).(pc3_gen_sort_abst c u t n (pc3_s c 
+(TSort n) (THead (Bind Abst) u t) H5) (eq T (THead (Bind Abst) u t) (TSort 
+n)))))) (\lambda (u0: T).(\lambda (H5: (sort u0)).(\lambda (_: ((\forall (c: 
+C).((pc3 c (THead (Bind Abst) u t) u0) \to (eq T (THead (Bind Abst) u t) 
+u0))))).(\lambda (t0: T).(\lambda (H7: (sort t0)).(\lambda (_: ((\forall (c: 
+C).((pc3 c (THead (Bind Abst) u t) t0) \to (eq T (THead (Bind Abst) u t) 
+t0))))).(\lambda (c: C).(\lambda (H9: (pc3 c (THead (Bind Abst) u t) (THead 
+(Bind Abst) u0 t0))).(and_ind (pc3 c u u0) (\forall (b: B).(\forall (u1: 
+T).(pc3 (CHead c (Bind b) u1) t t0))) (eq T (THead (Bind Abst) u t) (THead 
+(Bind Abst) u0 t0)) (\lambda (H10: (pc3 c u u0)).(\lambda (H11: ((\forall (b: 
+B).(\forall (u1: T).(pc3 (CHead c (Bind b) u1) t t0))))).(let H_y \def (H11 
+Abbr u) in (let H_y0 \def (H1 u0 H5 c H10) in (let H_y1 \def (H3 t0 H7 (CHead 
+c (Bind Abbr) u) H_y) in (let H12 \def (eq_ind_r T t0 (\lambda (t3: T).(pc3 
+(CHead c (Bind Abbr) u) t t3)) H_y t H_y1) in (let H13 \def (eq_ind_r T t0 
+(\lambda (t3: T).(sort t3)) H7 t H_y1) in (eq_ind T t (\lambda (t3: T).(eq T 
+(THead (Bind Abst) u t) (THead (Bind Abst) u0 t3))) (let H14 \def (eq_ind_r T 
+u0 (\lambda (t3: T).(pc3 c u t3)) H10 u H_y0) in (let H15 \def (eq_ind_r T u0 
+(\lambda (t3: T).(sort t3)) H5 u H_y0) in (eq_ind T u (\lambda (t3: T).(eq T 
+(THead (Bind Abst) u t) (THead (Bind Abst) t3 t))) (refl_equal T (THead (Bind 
+Abst) u t)) u0 H_y0))) t0 H_y1)))))))) (pc3_gen_abst c u u0 t t0 H9)))))))))) 
+t2 H4))))))))) t1 H)).
+
+theorem sort_correct:
+ \forall (g: G).(\forall (t1: T).((sort t1) \to (\forall (c: C).(ex3 T 
+(\lambda (t2: T).(tau0 g c t1 t2)) (\lambda (t2: T).(ty3 g c t1 t2)) (\lambda 
+(t2: T).(sort t2))))))
+\def
+ \lambda (g: G).(\lambda (t1: T).(\lambda (H: (sort t1)).(sort_ind (\lambda 
+(t: T).(\forall (c: C).(ex3 T (\lambda (t2: T).(tau0 g c t t2)) (\lambda (t2: 
+T).(ty3 g c t t2)) (\lambda (t2: T).(sort t2))))) (\lambda (n: nat).(\lambda 
+(c: C).(ex3_intro T (\lambda (t2: T).(tau0 g c (TSort n) t2)) (\lambda (t2: 
+T).(ty3 g c (TSort n) t2)) (\lambda (t2: T).(sort t2)) (TSort (next g n)) 
+(tau0_sort g c n) (ty3_sort g c n) (sort_sort (next g n))))) (\lambda (u: 
+T).(\lambda (H0: (sort u)).(\lambda (H1: ((\forall (c: C).(ex3 T (\lambda 
+(t2: T).(tau0 g c u t2)) (\lambda (t2: T).(ty3 g c u t2)) (\lambda (t2: 
+T).(sort t2)))))).(\lambda (t: T).(\lambda (_: (sort t)).(\lambda (H3: 
+((\forall (c: C).(ex3 T (\lambda (t2: T).(tau0 g c t t2)) (\lambda (t2: 
+T).(ty3 g c t t2)) (\lambda (t2: T).(sort t2)))))).(\lambda (c: C).(let H_x 
+\def (H1 c) in (let H4 \def H_x in (ex3_ind T (\lambda (t2: T).(tau0 g c u 
+t2)) (\lambda (t2: T).(ty3 g c u t2)) (\lambda (t2: T).(sort t2)) (ex3 T 
+(\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(ty3 
+g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) (\lambda (x0: 
+T).(\lambda (_: (tau0 g c u x0)).(\lambda (H6: (ty3 g c u x0)).(\lambda (_: 
+(sort x0)).(let H_x0 \def (H3 (CHead c (Bind Abst) u)) in (let H8 \def H_x0 
+in (ex3_ind T (\lambda (t2: T).(tau0 g (CHead c (Bind Abst) u) t t2)) 
+(\lambda (t2: T).(ty3 g (CHead c (Bind Abst) u) t t2)) (\lambda (t2: T).(sort 
+t2)) (ex3 T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda 
+(t2: T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) 
+(\lambda (x1: T).(\lambda (H9: (tau0 g (CHead c (Bind Abst) u) t 
+x1)).(\lambda (H10: (ty3 g (CHead c (Bind Abst) u) t x1)).(\lambda (H11: 
+(sort x1)).(ex_ind T (\lambda (t0: T).(ty3 g (CHead c (Bind Abst) u) x1 t0)) 
+(ex3 T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: 
+T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort t2))) 
+(\lambda (x: T).(\lambda (H12: (ty3 g (CHead c (Bind Abst) u) x1 
+x)).(ex3_intro T (\lambda (t2: T).(tau0 g c (THead (Bind Abst) u t) t2)) 
+(\lambda (t2: T).(ty3 g c (THead (Bind Abst) u t) t2)) (\lambda (t2: T).(sort 
+t2)) (THead (Bind Abst) u x1) (tau0_bind g Abst c u t x1 H9) (ty3_bind g c u 
+x0 H6 Abst t x1 H10 x H12) (sort_abst u H0 x1 H11)))) (ty3_correct g (CHead c 
+(Bind Abst) u) t x1 H10)))))) H8))))))) H4)))))))))) t1 H))).
+
index cfa2bbe3ffd2dca7b41024d499f02fa57d172e8e..2f299659b71a6bc8f4a4b6148dc29b5e74a948d7 100644 (file)
@@ -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".
 
index c675bc6abafd647bccd0fe28650f1960392c430b..c2e4e21618b5654f15b3bd597295e258dcd89313 100644 (file)
@@ -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".
 
index e16f362b08915b5875770bb1f7ea14eea06ca380..c710b9670729f84f602ecbb06d0aa827d76ca118 100644 (file)
@@ -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".
 
index 7b147c20e6a9d129d8e3d192c78e03b450fc9933..fc02e10ceda0ba81c9afa9d7b807f6ad49d4a17f 100644 (file)
@@ -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".
 
index 9b9c0bb542f3ff207e44ffd31228f6641b0bb17d..89253ee4ed19d04a56c057a079dc5856fdcc9206 100644 (file)
@@ -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".
 
index fd0ba2f0cb9cc041190467f15843f715f0c8af50..4d2195d148078b884b8653f5243db2d4fcb0b9dc 100644 (file)
@@ -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".
 
index 304adc590d4cc876976d23d8bf0e0512a4df8783..56a33fe6c27c4113702fe4a201089da187bb4fcc 100644 (file)
@@ -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".
 
index 3170860979030c1e9ae5e04353a1eaafc574b974..2db6e6c65de685cc926d539159a2f96d39f369d3 100644 (file)
@@ -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".
 
index a933775b75a7746ae28797a18549a09a03208840..ef21270ffa712c91abdf092b1e8cc6812daa6639 100644 (file)
@@ -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".
 
index dc20f3ff3607efca80b116d34575919e14e27a11..514dd8f99dae6478e0b9773a6ab5157e531d8ab7 100644 (file)
@@ -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".
 
index 0a1853deddb8aacd592bf21266977a3e5932baa5..8fac9e2d568661acfc39ef2551a957574091a0b6 100644 (file)
@@ -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".
 
index 9baf6cb96971bc84ebdfeb23bf57448a9b3a8620..c3e134c1098644d32923715f3acc4ec596770a81 100644 (file)
@@ -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".
 
index 845ea8933207f8d388779c8c6b5a8fd165443fae..3a5824df6e84b3644783f79ba38ed4707efee50b 100644 (file)
@@ -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".
 
index 09a531fbca73c0a706ef7451a15f2a716949cf3b..ced0a2668d9a6ae628bf4373380379740206194d 100644 (file)
@@ -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".
 
index 30ee3158c1bfcd962c928f15fa3a5d8b74e4652f..d74e3bfa642fa31fc7a38fdc5dbe3ab63260e849 100644 (file)
@@ -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/theory.ma
deleted file mode 100644 (file)
index daf2a25..0000000
+++ /dev/null
@@ -1,38 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* This file was automatically generated: do not edit *********************)
-
-set "baseuri" "cic:/matita/LAMBDA-TYPES/LambdaDelta-1/theory".
-
-include "subst0/tlt.ma".
-
-include "tau1/cnt.ma".
-
-include "ex0/props.ma".
-
-include "wcpr0/fwd.ma".
-
-include "pr3/wcpr0.ma".
-
-include "ex2/props.ma".
-
-include "ex1/props.ma".
-
-include "ty3/tau0.ma".
-
-include "ty3/nf2.ma".
-
-include "ty3/dec.ma".
-
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/theory3.ma
new file mode 100644 (file)
index 0000000..b0d9774
--- /dev/null
@@ -0,0 +1,38 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* This file was automatically generated: do not edit *********************)
+
+
+
+include "subst0/tlt.ma".
+
+include "tau1/cnt.ma".
+
+include "ex0/props.ma".
+
+include "wcpr0/fwd.ma".
+
+include "pr3/wcpr0.ma".
+
+include "ex2/props.ma".
+
+include "ex1/props.ma".
+
+include "ty3/tau0.ma".
+
+include "ty3/nf2.ma".
+
+include "ty3/dec.ma".
+
index ad412abf32d19bfa0c8e66c126d5417c3f89b1d7..144bb25e176ade8636456e63d2e174df57f14000 100644 (file)
@@ -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".
 
index 9f37ad2b444048d420f3e5fb2b9316f35033a4fa..6ee6bf5d803c7cd7e6504cbf1c8881f0f46d4683 100644 (file)
@@ -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".
 
index f5acb3e27c4f042dabca7c705c196e483e12b6e2..63c0ce597810cf2d1e4ec10fccad00936d9d2ca8 100644 (file)
@@ -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".
 
index b75bc8053977638378247a5dbe58124059a920bb..2e3cfc998700b4f7cc7295c9c705c2eacea170e7 100644 (file)
@@ -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".
 
index ba58219daf848bd27a5623238e935fc1bb7cc5a4..5dba1793eab88af4d1e295b9c61a050f90a0d9ec 100644 (file)
@@ -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".
 
index 2f758d80cfa219f8a25053b0f52971369996ceb0..0e221591c485dd0cb6fac0cffee44d383c0902d0 100644 (file)
@@ -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".
 
index 4ad1efbd43e32267a46dd19626d41a78ced65c1a..9357365d7e4b1c44335d3b5335f6707d4e33cde3 100644 (file)
@@ -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".
 
index eff4d8e7bb54a26c1cd7211fa4dee68d1c0c8b0f..a91d36ccd7daccddb8281a84ede98e18362f0daf 100644 (file)
@@ -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".
 
index 1370b3d793a5210686da4da8f43ddf8aa14a0417..9fa96ff7f83f8504b09fb9ce0b7925742b0292dd 100644 (file)
@@ -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".
 
index 5267f5c6a462411cb9a51c09a0577214122fa713..bc861903cbd776335a13e464f569cbb09660652a 100644 (file)
@@ -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".
 
index 358626faa13583186ab818789eb2a23ff22cd0d0..300238885d63e03f53e3ed9ceaf9c73d7e6520fc 100644 (file)
@@ -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".
 
index d0f9999d4de4324433fd72301675e522383f745c..dc9fde8e6f35b9dd5d182912e19462a41d24236c 100644 (file)
@@ -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".
 
index 4693788ce6bd9edaa585ed974ebcb4ea6e596533..fd73008bb1d63e7bc2f070e89d0070e748567a55 100644 (file)
@@ -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".
 
index 9809bc5efbc05ae26aa7e1cd5b9e9d532d5e877e..7fbddf8ebfd72f55b0badcc4430a216a18cb22f1 100644 (file)
@@ -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".
 
index 60e08dbe125c378b34ab3148b6b6f7468c0f9faf..44d68dd1b370f6728b82aff7f090d031ecb3740f 100644 (file)
@@ -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".
 
index a470e0d0cec44e9a6fc1923bc97efd596c0ada74..2055522bf926a9bbcd8d3470b68e1bd3ffe37dfc 100644 (file)
@@ -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".
 
index dff8bb8ccc2e9625a7b909a9d24c2e5866905dc1..28aca266a46c5b1334e9ebc7dc47ce01e0c24ffb 100644 (file)
@@ -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".
 
index 359d385443a3eed661d489555edfaff8b6325dc2..adde06ff87616f9c7b03a85272e60db8647108ff 100644 (file)
@@ -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".
 
index f52805131efee209f30c1c59a42782812eda8dd4..1f5e14c44d5cef8d0ee771efda255d9157d2fb28 100644 (file)
@@ -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".
 
index b8a4e2a85972574989bfc7f90922e3e0b11c0e43..fb71d39767073de0b032a3de013fd8de7ae27499 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/defs".
+
 
 (* LIFT RELATION
    - Usage: invoke with positive polarity
index 86e8031b41d947562fdac57d32022d38680d896d..d26bdb0e704b2dbb19f4ea00e1fe006ec99d8d77 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/fun".
+
 
 include "Lift/inv.ma".
 
index 95630e43e4cd8ae73dc2223d04e1c36a4cc86539..bbd8d744e7238a0d6ffd8e532080cf5bd50ae34c 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/Lift/inv".
+
 
 include "Lift/defs.ma".
 
index 9df9cbd63712b48b5e4a5639bf46eee7ad2676f2..8e50c477b320e55e3a41b6f66512ce513c84ea35 100644 (file)
@@ -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 (file)
index 0000000..7fd5e9c
--- /dev/null
@@ -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
index f5c63fd0b78a4d329d58e10de16df799dd528d8d..d63ffcf2eba2ce0371cf56dfcca6c1eab23cc263 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LAMBDA-TYPES/Unified-Sub/datatypes/Context".
+
 
 (* FLAT CONTEXTS
    - Naming policy:
index a7f5e7f075f1edff55fb372cf1e90aa9309cc3ae..e1f090d1ad56dec5fa9c8775874f4b55cac77524 100644 (file)
@@ -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 (file)
index 0000000..82206df
--- /dev/null
@@ -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 (file)
index d7a63e5..0000000
+++ /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/preamble.ma
deleted file mode 100644 (file)
index d889c39..0000000
+++ /dev/null
@@ -1,34 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* 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".
-
-axiom f_equal_3: \forall (A,B,C,D:Set).
-                 \forall (f:A \to B \to C \to D). 
-                 \forall (x1,x2:A).
-                 \forall (y1,y2:B).
-                 \forall (z1,z2:C). 
-                 x1 = x2 \to y1 = y2 \to z1 = z2 \to 
-                 f x1 y1 z1 = f x2 y2 z2.  
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma b/helm/software/matita/contribs/LAMBDA-TYPES/Unified-Sub/preamble4.ma
new file mode 100644 (file)
index 0000000..1449c15
--- /dev/null
@@ -0,0 +1,34 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Project started Tue Aug 22, 2006 ***************************************)
+
+
+
+(* PREAMBLE
+*)
+
+include "logic/equality.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). 
+                 \forall (x1,x2:A).
+                 \forall (y1,y2:B).
+                 \forall (z1,z2:C). 
+                 x1 = x2 \to y1 = y2 \to z1 = z2 \to 
+                 f x1 y1 z1 = f x2 y2 z2.  
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 (file)
index 0000000..e3402e0
--- /dev/null
@@ -0,0 +1,2 @@
+baseuri=cic:/matita/LAMBDA-TYPES/Unified-Sub
+include_paths= ../../RELATIONAL/
index 5b3ba49b73d05e932e7b8ef26bb0492184e982da..03065ada0ccc7a8bfd6fa3cf148969561896de9e 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/CLE/defs".
+
 
 (* ORDER RELATION BETWEEN POSITIONS AND CONTEXTS
 *)
index 821fd99c2170038c991861b5f664e32a67d48235..c3109a5f67c2792b77c8a408f8985f41cf615d54 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Insert/defs".
+
 
 (* INSERT RELATION FOR CONTEXTS
 *)
index 7c7aba28a8eaa4e0ca9c44ae1becf26b7343e662..d06a7e29cfdb975221a1c72402abfe7dc6360de3 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Insert/fun".
+
 
 include "CLE/defs.ma".
 include "Insert/inv.ma".
index 9053183f969ab3f25f78849be9adb553d916111a..df5ca04f32d6a2534207bea61361f96245dfb9b4 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Insert/inv".
+
 
 (*
 *)
index 17148e27e38b71b83add4bbacb080d71be5238c8..3289e68a7ad98e6b60aad4e1fe5149c20e49d716 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Insert/props".
+
 
 (*
 *)
index f770bcf8d90d200a9e3c0f7fe07ae8d0e7be3fb6..86d588e3eaabf35095b3e2839761e9f3c4eb2374 100644 (file)
@@ -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 (file)
index 0000000..c925bdd
--- /dev/null
@@ -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
index 1bf18389f3c5ba30915965fbd52aa9e565250829..15560f19c1417607fab0cf3b30d4ca9159a9f573 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/NTrack/defs".
+
 
 (* NORMAL PROOF TREE TRACKS
 *)
index f272bd5181cabf71a8bad948c362964a3bdece41..68e7d7b1ff39a0f70e91cf1f5555a846e409c257 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/NTrack/inv".
+
 
 include "NTrack/defs.ma".
 (*
index 11868b6ef65f29863125f95f6fbae27f9d90f09a..d136c47ba48f6da1827f017f1ae0769c417ea733 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/NTrack/order".
+
 
 include "Track/order.ma".
 include "NTrack/props.ma".
index bdd23748faf16e6dae4294381bafbd8a8b07388e..3fdd5de618fa0f1aadcdfaa115abf5671a29621b 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/NTrack/props".
+
 
 include "Insert/props.ma".
 include "Track/defs.ma".
index 1ffe5b20b5dc8259ccebeaffcf2094de31c7f71b..ec6b296799cb1aa052d7567e26a508b276ed6ab2 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/PEq/defs".
+
 
 (* EQUALITY PREDICATE FOR PROOFS IN CONTEXT
 *)
index 4f11e8c561cfd1e844641a6741bbf5801e40f2ab..77fe6d5771f812793dbaad6d1194cba72febd459 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/PNF/defs".
+
 
 (* NORMAL FORM PREDICATE FOR PROOFS IN CONTEXT
    For cut elimination
index 85a4c3bf9af0512e4ef7599cf0cdaeda1b00ac9b..bee77f1ede68af5d01e99ce4463eedaa7235c2ab 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/PRed/defs".
+
 
 (* SINGLE STEP PARALLEL REDUCTION
    For cut elimination 
index 3e7d727edc3c1a6c17fd0ff3909057a0830eb824..c48cfb0789611314d5965a2a5894e7962dcf7491 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/PRed/wlt".
+
 
 (**)
 
index 25cf7c0b5fa2bfbc37d9e8d1e8b6df6cf1d1b240..e3779f8376676bcd3a1a6542cb06246d9ec3c9db 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Track/defs".
+
 
 (* PROOF TREE TRACKS
 *)
index d38d3f120ca6fea326884866dc2fd7c326f1e68d..51935b4e003accf4c4ef5f964849c61ae6d016ac 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Track/inv".
+
 
 include "Track/defs.ma".
 
index 2c90f33037b2dbb2f3ef1e95854f2bd3ad1395b7..934632cd45f1907280dd3679332a380981e64252 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Track/order".
+
 
 include "Insert/fun.ma".
 include "Track/defs.ma".
index cce6c7800e88d1d24e5c8cff4d12f5d80580317b..7cf152b9473790ae6d2b5449b94daa71af69fdb5 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Track/pred".
+
 
 (**)
 
index 5a844a60adfc098697dd1eea7bf7bd34ee2c9588..8d1b7abdce1b3a5d439b032c0dddc54481e44b6b 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/WLT/defs".
+
 
 (* ORDER RELATION BETWEEN PROOFS IN CONTEXT
 *)
index 5dfcdde5cb1967b492ff83cec1758992f7b430da..7e6439363ec44a6d51a15dad91c5bbea80341915 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Weight/defs".
+
 
 (* PROOF WEIGHT
    For cut elimination and confluence
index e5dba4aafa30651ce17480d0a3e8c141154db757..60c38f70c8bb73742f796553ad2123ee0bd8eed5 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Context".
+
 
 (* FLAT CONTEXTS
    - Naming policy:
index ec6441dd18cbd5428ac444c680e21f7962262a7b..5080b260097bc4a10a8778bce86d25f9aa485ed9 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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
index fa2c29ffa6106304b749f1b4a2f5ead00c00dcf2..1f56cd9760399f137938b0769b043069c7eb8270 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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         *)
index 09d8269912c6c9fb824c137e8f1efccc20421977..cc06ccb5d5f99ce6d63291c07c24b94bcbbd7d42 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/datatypes_defs/Sequent".
+
 
 (* SEQUENTS
    - Naming policy:
index f7c44a81fd8ea9bdb0a6a5efc144a8777ea00c9a..335a10bf3ce1f03887f547143bd3280f8ae25f63 100644 (file)
@@ -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 (file)
index 0000000..452f04c
--- /dev/null
@@ -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 (file)
index e5ac91f..0000000
+++ /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/preamble.ma
deleted file mode 100644 (file)
index b1e50f8..0000000
+++ /dev/null
@@ -1,22 +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                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Project started Sat Apr 7, 2007 ****************************************)
-
-set "baseuri" "cic:/matita/LOGIC/preamble".
-
-(* PREAMBLE
-*)
-
-include "../RELATIONAL/NLE/defs.ma".
diff --git a/helm/software/matita/contribs/LOGIC/preamble0.ma b/helm/software/matita/contribs/LOGIC/preamble0.ma
new file mode 100644 (file)
index 0000000..8aa350f
--- /dev/null
@@ -0,0 +1,22 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||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                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Project started Sat Apr 7, 2007 ****************************************)
+
+
+
+(* PREAMBLE
+*)
+
+include "NLE/defs.ma".
diff --git a/helm/software/matita/contribs/LOGIC/root b/helm/software/matita/contribs/LOGIC/root
new file mode 100644 (file)
index 0000000..33cc9a7
--- /dev/null
@@ -0,0 +1,2 @@
+baseuri=cic:/matita/LOGIC
+include_paths= ../RELATIONAL
index 9c104f361e6c6aac6d6eeac493e31f334f5327ba..7e4aa704618b486ce35be012f765efc1cb463626 100644 (file)
@@ -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 (file)
index 0000000..c925bdd
--- /dev/null
@@ -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
index 18fc87b107ddc038b0b997322d0a9a5501283239..535b717aa21326eab8fa99d72316df68ff92c780 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NLE/defs".
+
 
 include "NPlus/defs.ma".
 
index 013cd67f1d936476f690528b58d934ea24d82e30..af2fa812bd058a3c9582c7122fd6a1e8161b4573 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NLE/inv".
+
 
 include "NLE/defs.ma".
 
index d90adb92627ddcc8bdb08c939b30d8a802bb3421..85dac01a9d92e62cfaf0becd52797ef3878875df 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NLE/nplus".
+
 
 include "NLE/defs.ma".
 
index cc3cc3030a44cdf3b4065ada67e42480791ce13f..6918bbc0f95ad6610a93b4e8896382c9712b385d 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NLE/order".
+
 
 include "NLE/inv.ma".
 
index 576a079ae3cb6ae70e44aa60b1fdad08f5222423..1eb0455fe94ca8d5da93f32be17d397275e71cc7 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NLE/props".
+
 
 include "NLE/order.ma".
 
index 8d8b304c3afce2eb1d9aa75c68b0c59a3cdae2e7..34f4e3491eba32b2d3620690eda0ebf2e4a8d300 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlus/defs".
+
 
 include "datatypes/Nat.ma".
 
index 03dd7d0efd17551928787b915277bf7294adf7bc..271a7c6e475949614872175a546473b7fefbcebd 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlus/fun".
+
 
 include "NPlus/inv.ma".
 
index b6ac60873ae2788f95fa9569a754f9949319b913..e3ec16898e0766f2a041eab6fcaed38a525bb4c2 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlus/inv".
+
 
 include "NPlus/defs.ma".
 
index a521c9a1dfef29b49f0176f484f0bf4e9eac3383..7fc7988780c1602ed606c7ed159f365070abec56 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlus/monoid".
+
 
 include "NPlus/fun.ma".
 
index 86d0231658bb79eeff322fe445371cc21beba156..cac07f91a523315ec6d0fe53976ab3abe00188a6 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlusList/defs".
+
 
 include "datatypes/List.ma".
 include "NPlus/defs.ma".
index f7fc4305e4a8ce2457230bcb96d56e21669e4e5f..4b70088a2fc54490727ec53677c9d5576dc4a0e3 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/NPlusList/props".
+
 
 include "NPlusList/defs.ma".
 (*
index 6d270cab31bd6ff42c26c216260386b7b5ccccea..91beaef0e237d5fd721e90fed5b4b7149ea2fd55 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/ZEq/defs".
+
 
 include "datatypes/Zah.ma".
 include "NPlus/defs.ma".
index 37ca8f6199ae6ef81a83f1832ef06a1c1c8c7057..587470bfc70f9af0374199523a390485589f7f4d 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/ZEq/setoid".
+
 
 include "NPlus/fun.ma".
 include "ZEq/defs.ma".
index 58345281b538793a30aa6b7e7a1789ca941bf671..970d6694c997582627e311474a887931d71f8e45 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/datatypes/Bool".
+
 
 include "preamble.ma".
 
index 313362e5d90c55f5c604107e6714f416364178a5..b8abed54d847e7dd12ac3f5b79fcbd2c9e5f0bd3 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/datatypes/List".
+
 
 include "preamble.ma".
 
index 75a3c58d368083e3ebac90a786b29bc093b6fe38..ed45a35feb2d3ce46481002f614f42a42d7cd7c2 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/RELATIONAL/datatypes/Nat".
+
 
 include "preamble.ma".
 
index 87f61d7d1762d97471a0d73867d84ea60746fe78..45ce72c56284db122ba587c05ef978228b87fd22 100644 (file)
@@ -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 (file)
index 0000000..9d79219
--- /dev/null
@@ -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 (file)
index e5ac91f..0000000
+++ /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)
index d52da97017d54775de591a7d91acb3ecebac11c4..e030ad1ad550c32dace1830a720f3f75b1ba17aa 100644 (file)
@@ -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 (file)
index 0000000..eadc56b
--- /dev/null
@@ -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 (file)
index a0cab98..0000000
+++ /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 (file)
index 0000000..2eefa0c
--- /dev/null
@@ -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 (file)
index 0000000..762554d
--- /dev/null
@@ -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
index 194a39110230a87fc7cd00726bbfb75db932db58..824fdfa9ed59b294c50a584440c0e0833b46744a 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/fields/".
+
 
 include "attic/rings.ma".
 
index 50bf063a4edbb02381ba278c8d870fb4d001856a..1b775fa78659906f83967747adc838645257d2d9 100644 (file)
@@ -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.
index 5be3c9da49eaea573feb1723c19d33f9635f1ca3..898148d6c4013b093e58ae42a11677538d620ead 100644 (file)
@@ -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;
index eaa6a2437495d122251fb3e28892b01450fe5b28..872cfea50c41efa9c414ee89d19a408d20ba322d 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/reals/".
+
 
 include "attic/ordered_fields_ch0.ma".
 
index 2ea188847b81ab9c368ef18186e76831a29af8c9..d4db003dc7a57b71fe97257d7c278f060994e73d 100644 (file)
@@ -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;
index 1e29bee24a90b1cfc6bd552b5d05182009a2a0fc..5002b022c7b4be2a7288f2a0250d67fafbc1d4ea 100644 (file)
@@ -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;
index 5d9c2da67132640b6d46720aaf9e8f34f5fd7488..2630da77c6474b93a99281982f1edc229ff27ae8 100644 (file)
@@ -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.
index d85a02cf4a633f03f1a05bad598de77a58e034c7..7e74cbba2a0b038d878a49d605b269dfd4a64157 100644 (file)
@@ -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.
index ec6a1c77456c32f3355291ab730bb4c16afbd705..f03c3e7f21d87e85952614efb8d8b6f35c14a6d4 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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).
index 21db34e389e4b68df5c33c4a4c5e2fd631128db0..580fe964550e14566a55bf2d4b18f27aae60e03e 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/sigma_algebra/".
+
 
 include "classical_pointwise/topology.ma".
 
index c5ba9bbd68a722156161c81c10c957d2c56ea253..72c9dbb4db43bdc9bf7ae299dcff59b570c527af 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/topology/".
+
 
 include "classical_pointwise/sets.ma".
 
index 8518d7ede45f0a68a07586f79ef1bccf4b219625..78e2ec571639f54103b6df1632df9c9022c7d577 100644 (file)
@@ -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
index 789c7c9c50df894f8c4cb5270278f7009d6afa49..8d195396cc455efc20ec7c0875b7e4264d2e6d5e 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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
+  
index 766412819804a70350192e34473d7136202025fb..c7e5d7c5d58d36573c0e068287839fcb033397e4 100644 (file)
@@ -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 (file)
index 0000000..a047fc9
--- /dev/null
@@ -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 
index 6830ef4e1751fbf8ebffb24dcb2a1a0a896f3e7a..4f54545c8fbd74c6817037fdba164b6580f9615f 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/divisible_group/".
+
 
 include "nat/orders.ma".
 include "group.ma".
index d8cf097668382310eb8eda47d9c382a72c04d0aa..6db7e22e6b9363514e6738c265e4e93a30a6c52c 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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;
index 0e2668c2d71c58923390538a8753fff9868158df..9da386ef7bfefbb1797e86bcec43cddfb0c067c7 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/group/".
+
 
 include "excess.ma".
 
index 768c86df1c2af47785bf08b8a762524e72be9426..787ee3e8e267b18c129d28f0e4abd400c045ae96 100644 (file)
@@ -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 (file)
index ce86d13..0000000
+++ /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)
-
index 0bfc3db678179c3ceedaab49b34ff762961f6f75..36742163bc541dab30cb60408921d7e16f9b8977 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/metric_lattice/".
+
 
 include "metric_space.ma".
 include "lattice.ma".
index e2112d65b6511a7cb6d7c5af984455741c4c4f75..d36e90a68d2b9eaff7aa1e24371722e5821efe48 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/metric_space/".
+
 
 include "ordered_divisible_group.ma".
 
index a6c13e189a6e92a266af24106d023e1167f85773..a9671d934b082c1bcc3300601108af6c9fce5aee 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/ordered_divisible_group/".
+
 
 include "nat/orders.ma".
 include "nat/times.ma".
index 2129aa5c709ea0d33533e06e6ccee229365f2582..9a066a80e9a4d62c345515aa0ff948591547b1c3 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/ordered_group/".
+
 
 include "group.ma".
 
index d985ec24fcb5d2c70460d27f205f33edee927739..bfba3710afb881c65bfae772f9977346500ace86 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/premetric_lattice/".
+
 
 include "metric_space.ma".
 
index 5f1a062e09dc8ddb6a9792ccf7a5e86594a06dad..53b2b0a1b9b62a8664c2c9407c17ddfd0000e9d9 100644 (file)
@@ -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 (file)
index 0000000..c57405b
--- /dev/null
@@ -0,0 +1 @@
+baseuri=cic:/matita/
index 21499ee7230304e0f1188d36dace724e839fb6df..037d3d7dcb416c063b79d5136410ae0b3c900c33 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/sandwich/".
+
 
 include "nat/plus.ma".
 include "nat/orders.ma".
index 9990f8c7d6728caf9f54980beec358af4d49e357..7536901ba7178fd45d32f82e3e6a1a9e129c547c 100644 (file)
@@ -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 (executable)
index 813b2af..0000000
+++ /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 (file)
index d44c08d..0000000
+++ /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 (file)
index f762adb..0000000
+++ /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 (file)
index f724589..0000000
Binary files a/helm/software/matita/help/C/figures/developments.png and /dev/null differ
index 5e55de9994648e7768358c6751f7eb2b96dbb589..4fe77d7b78a8dc3e4871322b5d6a5c736ce11ccb 100644 (file)
             On the contrary, theorem and definitions declared in a file can be
            immediately used without including it.</para>
           <para>The file <command>s</command> is automatically compiled
-           if it is not compiled yet and if it is handled by a
-           <link linkend="developments">development</link>.
+         if it is not compiled yet.
           </para>
          </listitem>
        </varlistentry>
      </variablelist>
    </para>
  </sect1>
- <sect1 id="command_set">
-   <title>set</title>
-   <para><userinput>set &quot;baseuri&quot; &quot;s&quot;</userinput></para>
-   <para>
-     <variablelist>
-       <varlistentry>
-         <term>Synopsis:</term>
-         <listitem>
-           <para><emphasis role="bold">set</emphasis> &qstring; &qstring;</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term>Action:</term>
-         <listitem>
-           <para>Sets to <command>s</command> the baseuri of all the
-            theorems and definitions stated in the current file.
-            The baseuri should be <command>a/b/c/foo</command>
-            if the file is named <command>foo</command> and it is in
-            the subtree <command>a/b/c</command> of the current
-            <link linkend="developments">development</link>.
-            This requirement is not enforced, but it could be in the future.
-           </para>
-           <para>Currently, <command>baseuri</command> is the only
-            property that can be set even if the parser accepts
-            arbitrary property names.</para>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-   </para>
- </sect1>
  <sect1 id="command_whelp">
    <title>whelp</title>
    <para><userinput>whelp locate &quot;s&quot;</userinput></para>
index 0066449b0294618bff6953768c8d80f40c519350..b0c0a863e55e1a8c9a69602730f360fa48d3bf30 100644 (file)
   </sect1>
   <sect1 id="authoring">
    <title>Authoring</title>
-   <sect2 id="developments">
-   <title>How to use developments</title>
+   <sect2 id="compilation">
+   <title>How to compile a script</title>
    <para>
-     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
+       &quot;cic:/matita/path&quot; and are given once for all for a set
+       of scripts using the &quot;root&quot; file. 
    </para>
    <para>
-     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.
-   </para>
-   <para>
-     The &quot;Developments...&quot; item the File menu (or pressing
-     Ctrl+D) opens the Developments window.
-   </para>
-   <figure><title>The Developments window</title>
-     <mediaobject>
-       <imageobject>
-         <imagedata fileref="figures/developments.png" /> 
-       </imageobject>
-       <textobject><phrase>Screenshot of the Developments window.</phrase></textobject>
-     </mediaobject>
-   </figure>
-   <para> 
-    <variablelist><title>Developments window buttons</title>
-      <varlistentry><term><filename>New</filename></term>
-        <listitem>
-          <para>
-            To create a new Development the user needs to specify a name<footnote>
-              <para>
-                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.
-              </para>
-            </footnote>
-            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 &quot;makefile&quot;
-            file is placed in the specified root directory. That makefile
-            supports the following targets:
-            <variablelist>
-              <varlistentry><term><filename>all</filename></term>
-                <listitem>
-                  <para>
-                    Build the whole development.
-                  </para>
-                </listitem>
-              </varlistentry>
-              <varlistentry><term><filename>clean</filename></term>
-                <listitem>
-                  <para>
-                    Cleans the whole development.
-                  </para>
-                </listitem>
-              </varlistentry>
-              <varlistentry><term><filename>cleanall</filename></term>
-                <listitem>
-                  <para>
-                    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.
-                  </para>
-                </listitem>
-              </varlistentry>
-              <varlistentry><term><filename>scriptname.mo</filename></term>
-                <listitem>
-                  <para>
-                    Compiles &quot;scriptname.ma&quot;
-                  </para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term><filename>Delete</filename></term>
-        <listitem>
-          <para>
-            Decompiles the whole development and removes it.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term><filename>Build</filename></term>
-        <listitem>
-          <para>
-            Compiles all the scripts in the development.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term><filename>Clean</filename></term>
-        <listitem>
-          <para>
-            Decompiles the whole development.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term><filename>Publish</filename></term>
-        <listitem>
-          <para>
-            All the user developments live in the &quot;user&quot; 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 &quot;library&quot; 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 &quot;distributed
-            library&quot; space (making your development public).
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term><filename>Close</filename></term>
-        <listitem>
-          <para>
-            Closes the Developments window
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    </para>
+       A &quot;root&quot; 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 &quot;list&quot; separated from files
+       in &quot;sort&quot; (for example the former directory may contain
+       functions and proofs about lists, while latter sorting algorithms
+       for lists):
+<programlisting><![CDATA[
+  list/
+    list.ma (* depending just on the standard library *)
+    utils/
+      swap.ma (* including list.ma *)
+  sort/
+    qsort.ma (* including utils/swap.ma *)
+]]></programlisting>
+       To be able to compile properly the contents of &quot;list&quot;
+       a file called root has to be placed in it. The file should be like
+       the following snippet.
+<programlisting><![CDATA[
+  baseuri=cic:/matita/mydatastructures
+]]></programlisting>
+       This file tells &appname; that objects generated by 
+       &quot;list.ma&quot; have to be placed in 
+       &quot;cic:/matita/mydatastructures/list&quot; while 
+       objects generated by 
+       &quot;swap.ma&quot; have to be placed in 
+       &quot;cic:/matita/mydatastructures/utils/swap&quot;.
+  </para>
+  <para>
+       Once you created the root file, you must generate a depend file.
+       Enter the &quot;list&quot; directory (the root of yuor file set)
+       and type &quot;matitadep&quot;. 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 &quot;matitac&quot;.
+  </para>
+  <para>
+         To compile the &quot;sort&quot; directory, create a root file
+         in &quot;sort/&quot; like the following one and then run 
+         &quot;matitadep&quot;.
+<programlisting><![CDATA[
+  baseuri=cic:/matita/myalgorithms
+  include_paths=../list
+]]></programlisting>
+       The include_paths field can declare a list of paths separated by space.
+       Please omit any &quot;/&quot; from the end of base URIs or paths.
+  </para>
  </sect2>
    <sect2 id="authoringinterface">
     <title>The authoring interface</title>
diff --git a/helm/software/matita/legacy/Makefile b/helm/software/matita/legacy/Makefile
new file mode 100644 (file)
index 0000000..cce033f
--- /dev/null
@@ -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
index 4ea9919f1741299c1c1d55722af07c2a30bf0770..649b866d8ea4bdb28de2382cd2792b50f03e7c6c 100644 (file)
@@ -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 (file)
index 0000000..c35efdd
--- /dev/null
@@ -0,0 +1 @@
+coq.ma 
diff --git a/helm/software/matita/legacy/makefile b/helm/software/matita/legacy/makefile
deleted file mode 100644 (file)
index a1dd3ca..0000000
+++ /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 (file)
index 0000000..302ea9e
--- /dev/null
@@ -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 (file)
index 0000000..cce033f
--- /dev/null
@@ -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
index a48d1a522b2c01f14d03dca94cb26b3fe0c4ecb0..982d61caf19297e62b99abb2ed35c1c98af465f3 100644 (file)
@@ -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 (file)
index 0000000..0e50884
--- /dev/null
@@ -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 (file)
index f86396f..0000000
+++ /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 }.
-
index f832d502002f3c9a59855a13acea0ac966fa69bc..ba4f61bc4b4e0aae11ef59f0ce74d40655c7cdc9 100644 (file)
@@ -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 (file)
index ec9f8cb..0000000
+++ /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 (file)
index 0000000..e6f78ad
--- /dev/null
@@ -0,0 +1 @@
+baseuri=cic:/matita
index b945931c14dab117679f714a0a3c3d7e3aa1cd72..d9fd301fcf2e9f075596c455a20e72db2a2d4c6b 100644 (file)
@@ -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 *)
 
index 72ba3db8c62fcfb806e7c1bd0c601aa5930d7397..0eaaaa7800e8a8e2bcb5aba2bfcf4258b05813b9 100644 (file)
                                 </child>
                               </widget>
                             </child>
+                           <!--
                             <child>
                               <widget class="GtkImageMenuItem" id="developmentsMenuItem">
                                 <property name="visible">True</property>
                                 </child>
                               </widget>
                             </child>
+                           -->
                             <child>
                               <widget class="GtkSeparatorMenuItem" id="separator2">
                                 <property name="visible">True</property>
       </widget>
     </child>
   </widget>
-  <widget class="GtkWindow" id="NewDevelWin">
-    <property name="title" translatable="yes">Create development</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
-    <child>
-      <widget class="GtkVBox" id="vbox10">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkTable" id="table2">
-            <property name="visible">True</property>
-            <property name="border_width">3</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">3</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <widget class="GtkButton" id="chooseRootButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">...</property>
-                <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="rootEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="nameEntry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label21">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Root directory</property>
-              </widget>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label20">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Name</property>
-              </widget>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHSeparator" id="hseparator1">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">2</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox21">
-            <property name="visible">True</property>
-            <property name="border_width">3</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkVBox" id="vbox11">
-                <property name="visible">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="addButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-add</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="cancelButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="DevelListWin">
-    <property name="title" translatable="yes">Developments</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <child>
-      <widget class="GtkVBox" id="vbox12">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow10">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="shadow_type">GTK_SHADOW_IN</property>
-            <child>
-              <widget class="GtkTreeView" id="developmentsTreeview">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-        <child>
-          <widget class="GtkHSeparator" id="hseparator2">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">2</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="buttonsHbox">
-            <property name="visible">True</property>
-            <property name="border_width">3</property>
-            <property name="spacing">4</property>
-            <child>
-              <widget class="GtkVBox" id="vbox13">
-                <property name="visible">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="newButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-new</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="deleteButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-delete</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="buildButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment14">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox23">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image358">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label22">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Build</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="cleanButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment15">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox24">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image359">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-clear</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label23">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_lean</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="publishButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment16">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox25">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image907">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-convert</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label24">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Publish</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="graphButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment17">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox26">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image908">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-zoom-fit</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label27">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Graph</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="closeButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">7</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
   <widget class="GtkDialog" id="DisambiguationErrors">
     <property name="width_request">450</property>
     <property name="height_request">400</property>
index ec1bc8006a9858f84ffd6261d313959383c269cb..5ec5164b8f07d8908068a4236807663d46130345 100644 (file)
@@ -12,5 +12,3 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/test/".
-
index 60b112d982cca6bf9e6c75ae77d935d6f3114195..c559358c575934b67883baad1e9bd4286881fd32 100644 (file)
@@ -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: *)
index 133893f0d1e8cf77155f33de2b3d1fa6a0f4db47..5f8a1b7a7e6cc74d9d074a5f3d1d8aacf0d95762 100644 (file)
@@ -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 []
 ;;
index 83b549ec4ee0b864177fb607ee6bbf452c5171a8..bb4537d8db899fb34b71b89983aa7969bbc3c02e 100644 (file)
@@ -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 ->
index 8888b8dfed312db253a8d2c31b3b11a58b963d7d..24981af6bc6e754b4595b9b04614a26b478ea050 100644 (file)
@@ -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\" \"<uri>\".' 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
index 99b623b0f00c037d768b7b8d8033b99ba65d788b..3ba6499a93acab767646871f0559dcd6ff848576 100644 (file)
@@ -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:"\e\\[0;3.m([^\e]+)\e\\[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.\n<i>Should I generate it?</i>"
-           (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 :> <check_widgets: unit -> 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;
index 67d431040df41af64635e4f4e501c9e57d9cd114..c9ef8612315169df35390dba041f1118da76566f 100644 (file)
@@ -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
index 8f3071334e7496c9b0bf9fd276353e859e6026b5..cf96c5ba1261e45a29c0396bd1c1c6778d326016 100644 (file)
@@ -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, "<path::uri> forces the baseuri of path";
         "-I", Arg.String (add_l includes),
           ("<path> 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,
+          "<filename> Dump with expanded macros to <filename>";
+        "-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
index 23f57820df80601337c8ba86ff5b958a0f428383..ff79f54ed05ee8d59a7bcfde9a1bff29538eef76 100644 (file)
@@ -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
index bb745f7030f968817f544fa4a49d1828eba4795e..2112952610869c0495575a7f1bb5a75948cd5d6c 100644 (file)
@@ -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)
+*)
               
index 8ec2a4948bcc7c6bc19608d03f59a1089aa0468f..828002a8bca0a522c484a0b38fd63d2328179e59 100644 (file)
@@ -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 <b>" ^ name ^ "</b>.\n\n" ^
-      "<i>Should I compile it and Its dependencies?</i>"
-    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 <b>not</b> handled by a development.\n" ^
-     "All dependencies are automatically solved for a development.\n\n" ^
-     "<i>Do you want to set up a development?</i>"
-    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
index b0a02268378c133670eee9a42a8c069b09cf55fc..3d9e8fba78c1b463f5812a381b11bcbdd87fc559 100644 (file)
@@ -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
 
index 23d0d832f238947adef0cb875c86b65ddd750af4..0c8952e89777016f954536df2f416895c5d0a6fc 100644 (file)
@@ -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 ->
index c71c99dcc9adc1eea9ad23a780eca3113baa3ce7..67655c921e449e68106976f7bbda2dea8b556e0f 100644 (file)
@@ -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 ]
index 3c5607bd7df9ff1bf458d61f5f0dac65a3aea604..87e9a44178a47a18b5bad6f9e9b3961e0825e71f 100644 (file)
@@ -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 
index 179a0ba8e8e508e413f22958cef5c20cc1039fbc..5d0ed9a3512528c8a45886606efd1131dd45677e 100644 (file)
 
 (* $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 = "<filename> Dump source with expanded macros to <filename>" 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 ()
 
index 316d0f9f675ef9d78a168c03b33734b9d609fb23..ec5618684426cf9607b7e94fc31a3f8eb00f50db 100644 (file)
@@ -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 "\e[0;32mOK\e[0m" else "\e[0;31mFAIL\e[0m" 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 "\e[0;32mOK\e[0m","Ok" else "\e[0;31mFAIL\e[0m","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) 
+
index 5e8a2635b25be2d49d1bfca470b2eff015b6b486..03ea56beb14a536f82747be7362ba0c348cf3c97 100644 (file)
  * 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
+
index cf8bf42f4467f0628e93dad1d2d9b625a87112ec..d9f603652e334cd63e266cc56f7beba1a26f015c 100644 (file)
@@ -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
index 473445fffc60c5c6fff5825631558b467277296f..fe7cab92075ee99c3dd74bfe57d71934e4cbbb99 100644 (file)
@@ -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,
-      "<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"];
+    "<file> 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 (file)
index ad43687..0000000
+++ /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 (file)
index 47ea2fe..0000000
+++ /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 (file)
index 499d0ea..0000000
+++ /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 "\e\\[[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 (file)
index 8f6fda2..0000000
+++ /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 (file)
index 7a6503a..0000000
+++ /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 (file)
index e0b9cbf..0000000
+++ /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 (file)
index 0aba1e9..0000000
+++ /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 (file)
index dfb6403..0000000
+++ /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 (executable)
index da46675..0000000
+++ /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 (file)
index ac3e144..0000000
+++ /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 (file)
index 98b7c1f..0000000
+++ /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 (file)
index 0000000..0630091
--- /dev/null
@@ -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
index 87ee6a7c5ef2ec24cb645fb041c847f6ba3a2241..3cb2beeda60a55ed1559d1c1439069db083b745e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO001-1".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO001-1.p *)
 (* -------------------------------------------------------------------------- *)
index a964a96adafa1f96ee0a4adcba20b3136be26dc1..f41c21a1fd784178970c290dfd1e5ba2e6134e34 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO003-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO003-2.p *)
 (* -------------------------------------------------------------------------- *)
index efeca0198000e510f66a447b80eaee7c31276f8a..a3761dfa7ad2bcd6f0429a383e12af6ca70457df 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO003-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO003-4.p *)
 (* -------------------------------------------------------------------------- *)
index ff3cd85f9d981971f26e7d68178e17bbe7ce4311..abd4fa54fa98783aaf708fcc6e52803b6cc98600 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO004-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO004-2.p *)
 (* -------------------------------------------------------------------------- *)
index 1821077fe184515ce80097268c01852af15c3997..d4cc8aa8c72fe77dd2481369b190277310d36cfd 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO004-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO004-4.p *)
 (* -------------------------------------------------------------------------- *)
index 5e3def47cfab7661db321691943a212667bffa58..4ba359aeb76e58bfb7a49679e283fc6ca2a76374 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO005-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO005-2.p *)
 (* -------------------------------------------------------------------------- *)
index 9bd9ce8a9ea36ef6ad0959b3fc5a1c24ddccc980..06363d0c0e3cd147322e862b6500f6b5986f28cb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO005-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO005-4.p *)
 (* -------------------------------------------------------------------------- *)
index 77ea2d76bf3aae0b2f38c98b1f4f687fccaeaffa..3091ecaeb70b60711e5a2d3810cbf32d3089f947 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO006-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO006-2.p *)
 (* -------------------------------------------------------------------------- *)
index c05bd84fce1db9248bde947189231ba9b1366ecf..9eeab88a0eda352f2930d4be760d9df548c348f4 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO006-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO006-4.p *)
 (* -------------------------------------------------------------------------- *)
index ce93dc23b18d06fbf2cebd42df1a05f2271bbb84..ac47a73756d68d812afd1a51cb5d5d8aaf5f4c37 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO009-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO009-2.p *)
 (* -------------------------------------------------------------------------- *)
index 67631beb7b8adababcce56bd99799faf58ee4ad7..00794316ae4648b3412e1fefeaa2e334707280ab 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO009-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO009-4.p *)
 (* -------------------------------------------------------------------------- *)
index 9517fa3ed9c30748c84ac61fc51d7add1fa82c88..5863f860b9b10cbdcd6ed35239e4c6d2b573e19e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO010-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO010-2.p *)
 (* -------------------------------------------------------------------------- *)
index 6cd030d5a40a5716a2bf33110dfaf523f8533868..0a392b22199260e790db8cc6c2e30ca78ef78974 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO010-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO010-4.p *)
 (* -------------------------------------------------------------------------- *)
index 33f8f9a87e65a036bde1c02b2debe76f3235d276..e9cbcd9298425104e5018720c27d21b3f5848a81 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO011-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO011-2.p *)
 (* -------------------------------------------------------------------------- *)
index 5855e8aee83b790f485be6c605cfdbdcffed394e..c61c06d4260fad1e4117261f9d56e68be3df407c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO011-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO011-4.p *)
 (* -------------------------------------------------------------------------- *)
index 3572d87508f60ec9b8043bf4b973bd21f9119bf9..40d9d9b53e34e1d99d7a23844a089e1edee8b662 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO012-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO012-2.p *)
 (* -------------------------------------------------------------------------- *)
index fb67030b9686885d6b0533b556e6933d5255871c..4c3ad768cc43e634b569cbe0324b8472fdf5971b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO012-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO012-4.p *)
 (* -------------------------------------------------------------------------- *)
index 0f538a7dabb347d71ff388b91b745c6b211687dd..5dd357b063ca06e77724a6cac27915caf5aea639 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO013-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO013-2.p *)
 (* -------------------------------------------------------------------------- *)
index f4b986a977bf27e2c12992dbcb535e9083a4b459..2a948d54cf7db4c5af667b4b0ffd3ca4eeb2a8f9 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO013-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO013-4.p *)
 (* -------------------------------------------------------------------------- *)
index ee7c9969c873245f72bb58c1f843409aac6f3457..f096eb8ae0f54326d0c4e6c0f5a078c54eb06651 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO016-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO016-2.p *)
 (* -------------------------------------------------------------------------- *)
index 5691fcfb0e701304e5510afdb98f9faf3c7a49e6..95dfd1ba178f27384861f3d1ad3ea9a1388c2c00 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO017-2".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO017-2.p *)
 (* -------------------------------------------------------------------------- *)
index 32fe9a4601e650f82e53318d84db21588d55d64d..3c867cf28331eeb2f294099084be8bc25625d634 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO018-4".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO018-4.p *)
 (* -------------------------------------------------------------------------- *)
index adab6c4ae56121395d0ef5776f5c9951563e0c45..d4c19b5fb84532adb0dc01dda5538f7b0200b396 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO034-1".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO034-1.p *)
 (* -------------------------------------------------------------------------- *)
index 38bbe0e44cd21a4d8a6edf0b49886c23d69294b1..44559bdea226a22972adee6f25715fef83009f3f 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO069-1".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO069-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1cddbb9ae11151e5971edbc7606e224d2dafd874..b84cf7df2064bbc1dbb77e2ec9ee7318325fce69 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO071-1".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO071-1.p *)
 (* -------------------------------------------------------------------------- *)
index 971fa231a4d82f9e285b9ef01f86becdfe7b8756..ae56431c73e8d31196da7187147a680ef01bd10c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/BOO075-1".
+
 include "logic/equality.ma".
 (* Inclusion of: BOO075-1.p *)
 (* -------------------------------------------------------------------------- *)
index f9a7712ee0a9bd2a06afe715a21fd2f564a84359..e982e35131fb7d2d7be89e45868826215e97976c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL004-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL004-3.p *)
 (* -------------------------------------------------------------------------- *)
index 655b2a2ce202c5c6c8a28adaf58f36e41f8440db..b5c637281cd29ef436ca2e42b85c23c7ac8a9e99 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL007-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL007-1.p *)
 (* -------------------------------------------------------------------------- *)
index a3ff086db56d6f3a43af4d0c754a4df861fb7241..0e9db587e981829c8000e3ea4fa1c2b85283a11a 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL008-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL008-1.p *)
 (* -------------------------------------------------------------------------- *)
index 45bd7de31dc775858c2adf269029ad2ce7c40b67..4215524427f51aff9383d0fba04474a09633ea87 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL010-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL010-1.p *)
 (* -------------------------------------------------------------------------- *)
index 866be51782a686d776ec4fb3743e05c29a7ff5d2..58b5de1f3a7c7335ad5c3589de7b593e721cb096 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL012-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL012-1.p *)
 (* -------------------------------------------------------------------------- *)
index 07d594e3c3598aa7295aad7ef04815ec5dd31690..d6290447fdf4086254d06ea8133204a8a0f6412c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL013-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL013-1.p *)
 (* -------------------------------------------------------------------------- *)
index 6e618736a5958586c7e32e456745ccde432ef3e7..5f92c04badcd3d4231849a2a8c842ca0684293a9 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL014-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL014-1.p *)
 (* -------------------------------------------------------------------------- *)
index fcff6921ce034768a05eadb158d3486f0a8bea4e..2d77c6c6f4a41f2b9589824e6d57b954c1a97a88 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL015-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL015-1.p *)
 (* -------------------------------------------------------------------------- *)
index 37a3765cb2935d41e6a40f9965e6196ca8b1b8a7..4da683f9a8b327676d4d466733b5d9c3f091c711 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL016-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL016-1.p *)
 (* -------------------------------------------------------------------------- *)
index 36d03e6e531cf3b62b749368759053f36bf1ffca..62f30c7a0a5ad963e6cac43e493e363cbc307479 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL017-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL017-1.p *)
 (* -------------------------------------------------------------------------- *)
index e218bae4a2edc136e613a9a8f655bfda3ddeafab..325fde8ce98707358dcc5dea9c9c3b2daeb63d22 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL018-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL018-1.p *)
 (* -------------------------------------------------------------------------- *)
index e8f9c357920943a0bd5197fc9de00a488294b1c2..4b809bd6e7240499886ffb094cbba38623fbfd7e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL021-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL021-1.p *)
 (* -------------------------------------------------------------------------- *)
index a311f146f36dbd105659d7ab164cae39f93102e4..183ea8551b670df247f4d5dede0ceb924c070297 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL022-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL022-1.p *)
 (* -------------------------------------------------------------------------- *)
index c38e405742d7f15c4668094f68ced50c58871164..a779158bae512b34e0d03fb672eb02542a618dc1 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL024-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL024-1.p *)
 (* -------------------------------------------------------------------------- *)
index a7fa25856d4959da026e9cfeef27cf7ddddc8723..46b622eb56b4585434069a5ac184670225092d60 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL025-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL025-1.p *)
 (* -------------------------------------------------------------------------- *)
index df48469b03da74f4c752d0c52109fbe372040793..5863d6ffdbe999e9ce0a7bd74b7592b8905d22c8 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL045-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL045-1.p *)
 (* -------------------------------------------------------------------------- *)
index a0435b2c2b3da254f5b71bb9e31870739b4dfc88..deb4006f57f300931d3c21ebbd8a6e18c3e25074 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL048-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL048-1.p *)
 (* -------------------------------------------------------------------------- *)
index 10f25dc2a4ba8ee28476bcea15139bb6fc5eeaed..e8383c1b14ad4d2546880c330afe8cfd46f90687 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL050-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL050-1.p *)
 (* -------------------------------------------------------------------------- *)
index 5b216a3d2bf2cfc9cbd58678218c157cf03a2378..b109ddc682c0d15b9cf7b9377158312d4d9a0fba 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL058-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL058-2.p *)
 (* -------------------------------------------------------------------------- *)
index 2235cb57dae2bb5718682d40a44d6f19b8f4c2c3..b5ed2f6ad3626b26efe8fb9a11d3f58ba4ec3801 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL058-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL058-3.p *)
 (* -------------------------------------------------------------------------- *)
index da151819a1935324df6ec9df466dc6164bc2fd99..3dcfb651eb96e38f2a24f5a7ea3d4230a8420c66 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL060-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL060-2.p *)
 (* -------------------------------------------------------------------------- *)
index d1ff7bc9b7c9b83290cf9c83478d6fc2e977c5f2..202a4686471b472de68e428b20270f47bf5cf21c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL060-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL060-3.p *)
 (* -------------------------------------------------------------------------- *)
index 81adc265def07253753357e7cf017873f453673a..e85df51f3b6bf060d5af312b8dc7268d4f6a47d8 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL061-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL061-2.p *)
 (* -------------------------------------------------------------------------- *)
index 0359b3ce91059c0da7f51b22998a1eceb9f10354..aa80c3f368f69e9575025485d9e6c81cd465c078 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL061-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL061-3.p *)
 (* -------------------------------------------------------------------------- *)
index 383a285e879718c742c3a41343966d24d091631d..48ff2a90397dae7fd2ef68999941a7f02de1dc65 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL062-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL062-2.p *)
 (* -------------------------------------------------------------------------- *)
index 8b65e0c4f1d3ab22591133206e225c3abe33bb63..b335f6908892d66ee23318a06ad02247be62c9fc 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL062-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL062-3.p *)
 (* -------------------------------------------------------------------------- *)
index 02f91ef49277a892a6d161db188b2151efd4b9a0..2050c35cdb528f91273345057fdb9abcc833114c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL063-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL063-2.p *)
 (* -------------------------------------------------------------------------- *)
index 70205ee89d75bf3182d67a7f968e67853f2bc3df..8e5671ae3856d4ebd1e20bb36c2a29aaa06d1fd3 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL063-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL063-3.p *)
 (* -------------------------------------------------------------------------- *)
index 38bb353180ec54a418bbfcae1a73e27b9e8552aa..bf6fdb5b79dabd9d4948fcb3ed9ecd89600248f6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL063-4".
+
 include "logic/equality.ma".
 (* Inclusion of: COL063-4.p *)
 (* -------------------------------------------------------------------------- *)
index 4c98273b5327d01dfac4b2e5bb460e622e84a5f5..35d1a0c48d9097f201da8fcf4f07885ab1f30854 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL063-5".
+
 include "logic/equality.ma".
 (* Inclusion of: COL063-5.p *)
 (* -------------------------------------------------------------------------- *)
index 19fbd39faf6c9c64b9d83e8f29d0e368fc8a6db7..608ba68ab4bb83c4c25afe0fbebea4e2a4a23129 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL063-6".
+
 include "logic/equality.ma".
 (* Inclusion of: COL063-6.p *)
 (* -------------------------------------------------------------------------- *)
index 4e6d8af15cca289e896f987c6a34da475c678c74..5bdab285a3a7c2e9fbb9be6368d7306bdb891b63 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-2".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-2.p *)
 (* -------------------------------------------------------------------------- *)
index 5644d38c109d592dd72135809714647b7d22f047..8980403219e774400b1e5ed4c5b94b10c4f88a23 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-3".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-3.p *)
 (* -------------------------------------------------------------------------- *)
index 34fbe93490b1a5902b886e529680b8fd4797425c..d964987e11f84df9d582345b85a598ebafabe6f6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-4".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-4.p *)
 (* -------------------------------------------------------------------------- *)
index 4148875880cdf54501d5131e14630aadefad5374..9ea160cdbaf18ed08c2a9902d152306183ce73f7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-5".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-5.p *)
 (* -------------------------------------------------------------------------- *)
index 4d054e0352b6950eb4252087be548f217149bca4..b2e7fad833a51d1378ddf440bd94672edd58adce 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-6".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-6.p *)
 (* -------------------------------------------------------------------------- *)
index 1c3ddc2f26c1e969c1053872ad34bf49f737b9b2..a1a903e8081e0008fc94ae5f89a9e4d17da7e989 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-7".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-7.p *)
 (* -------------------------------------------------------------------------- *)
index 120a6d0477845a8577589916b4879d68cb0a5cdf..1a72e84829e8907978d01c7dbf1ca96c39042c96 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-8".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-8.p *)
 (* -------------------------------------------------------------------------- *)
index 07591bb4c27a16c7a7ca707364f2c1494ad1c86d..521947e4d5ca3e60494ed23bba0a01f475d93f3a 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL064-9".
+
 include "logic/equality.ma".
 (* Inclusion of: COL064-9.p *)
 (* -------------------------------------------------------------------------- *)
index 89d99176182dd9d1d7815561698cba2965e51c44..5580a76cc09056c3bc1c4491ab9ea00384edb820 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL083-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL083-1.p *)
 (* -------------------------------------------------------------------------- *)
index 4d2d057bc7863ea7f064192b3e98432b42df4ea3..8813fc43b2b9ed53d46bd6fa9aaa7440e03dbb09 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL084-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL084-1.p *)
 (* -------------------------------------------------------------------------- *)
index 7fd4279ce760250ef928c3dcec3eee4cb21953fe..0e0cac71b431e0b608854d3471e655acfb890dcf 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL085-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL085-1.p *)
 (* -------------------------------------------------------------------------- *)
index e4527c48bfdcc66c929401ec121aeac6856688be..2fce42e46672f59602beb106c222798215d1817c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/COL086-1".
+
 include "logic/equality.ma".
 (* Inclusion of: COL086-1.p *)
 (* -------------------------------------------------------------------------- *)
index d4e79c748543b1299cf6ec9c91d062bc1bea4ca8..07a012a4a143b45fef45fee861dc8f1a3141b426 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP001-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP001-2.p *)
 (* -------------------------------------------------------------------------- *)
index 544eaf116a2bcfe37e4017c1dc442cc9af28359a..01683bfdf3dd82dd62de47bf5270296a60398ff8 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP001-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP001-4.p *)
 (* -------------------------------------------------------------------------- *)
index b6a3f51c1deec912d6532d04a49156b4f80018c8..a7a94c741833c75eb5791aec096eb19a72c50f7b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP010-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP010-4.p *)
 (* -------------------------------------------------------------------------- *)
index 6391656ba4683abb198a3ca885037fe771df953f..a935ade1c04848d2057d4dd9afca3de735356068 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP011-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP011-4.p *)
 (* -------------------------------------------------------------------------- *)
index ed5338825ad7f9a8f5cc222bcfe6cf493b6f135e..067a3f7dea51041a05b37437ee1701ad02b23033 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP012-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP012-4.p *)
 (* -------------------------------------------------------------------------- *)
index db2519fe64e19162d7ded84ca116bac3b26826eb..a87fe3a579f2ca501bb9610af8812976b4f18862 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP022-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP022-2.p *)
 (* -------------------------------------------------------------------------- *)
index 4ad3522010521e1bd40386bd6d51321b57ff972b..c1a22f39a6ef4b36e59f5baf4aff0779c5f3f1a6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP023-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP023-2.p *)
 (* -------------------------------------------------------------------------- *)
index 6c605ee94c2e2b384301ad8b16f8c049aef2320e..e6fed36faf91f7b3de7f91cf96640f1214434081 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP115-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP115-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3cc4b571918bd4ea178c6212fe2f75e6a63e995d..25e483f3bec0ddaedbbad83494fb6b339df1baab 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP116-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP116-1.p *)
 (* -------------------------------------------------------------------------- *)
index 8768d0eabb13162282b643a2a94dcf4b37a54aed..31fcdf4bbd894cdc55eeeb2541c73f59f13b086b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP117-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP117-1.p *)
 (* -------------------------------------------------------------------------- *)
index 4d01353ea3a9103e520263b39a9bf946c14e460c..aeb184a1e12bc65f7fd524285afe15b7613b4e38 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP118-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP118-1.p *)
 (* -------------------------------------------------------------------------- *)
index e108ae55b755b1a5fda985385231ea3fbb49f5fc..091644967cb90af54ce1915070539e3e82fad112 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP136-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP136-1.p *)
 (* -------------------------------------------------------------------------- *)
index 322702cc5216844838e87c8367a2cb7611eb5683..6d1b6b2a0009d6b09e4d2bef6d707ddd66cd9da9 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP137-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP137-1.p *)
 (* -------------------------------------------------------------------------- *)
index cf868c306d297e7d0c57d8cefdb0f4c0314a21f3..1752d858097a835b0852c0dd5008a80ee5b6724b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP139-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP139-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3706a25d796c92b5102fe3f8c06334436f4c9287..84e880f7a8dad9ff254ac662bfd293324e0fad58 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP141-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP141-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1f13705e185b2d4838e9f5b5dd8846dd056b9be4..a8dfa8d6f9cd4bf1b00407f6133cf77e008e5b18 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP142-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP142-1.p *)
 (* -------------------------------------------------------------------------- *)
index be00186aee85756b397f45f8fc51330599ecf5f4..c32dac6b77738ef93ba1078d45d8eb38e5dae05b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP143-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP143-1.p *)
 (* -------------------------------------------------------------------------- *)
index be20f19019120fe0c45622ffc286f3150f7461b9..1ffa96eeba76493611f262319ea6006596c3a6fd 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP144-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP144-1.p *)
 (* -------------------------------------------------------------------------- *)
index 032cdfd55a72b4cab42112b2ad330e1a3a1f197d..fb0233e2521b7e3219bf78c0ad4671e95a891a86 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP145-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP145-1.p *)
 (* -------------------------------------------------------------------------- *)
index 6bacee188e163215fa197cd134ba07952073a37f..ee91a7e4537f628e6b9174f190df64ae9d503980 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP146-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP146-1.p *)
 (* -------------------------------------------------------------------------- *)
index e6c7d4ff67303fc64ff0ba1197c844ea0e6525d7..bcc3de3bec6c152c21ca9528535199bfdec23ef0 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP149-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP149-1.p *)
 (* -------------------------------------------------------------------------- *)
index f612ede8ecea250a5a046439e2e07ddf1ec552cc..569788972b77aa4ab4ed00c25563b29d1cda00d5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP150-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP150-1.p *)
 (* -------------------------------------------------------------------------- *)
index 240c266b2221ea80ddafcca0637ead9e2a4d63eb..d08424625e39151c8ff526d26c30d13ef983efbb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP151-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP151-1.p *)
 (* -------------------------------------------------------------------------- *)
index d9078e5fb2c45b9bd51a7c9ba950d3f732d4d2be..f795a64127a3466ee7a539271205ad6c3ca9ed02 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP152-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP152-1.p *)
 (* -------------------------------------------------------------------------- *)
index 7dc86aa7ef45f03952077c29a9350287f826dfa2..e6abb39971c39cc8150f2140fbc1cb1189475bce 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP153-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP153-1.p *)
 (* -------------------------------------------------------------------------- *)
index 51832886c01a94fedbb84000d643215f1d64feeb..501deedf7220f996621f50b0dd12be1c9301bdea 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP154-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP154-1.p *)
 (* -------------------------------------------------------------------------- *)
index 7a940e531e0b4830578f4b57c41ed0e8a2187c12..42503caae304d7715437a6f20c2c77d3d7c368af 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP155-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP155-1.p *)
 (* -------------------------------------------------------------------------- *)
index 544290f56f99f5d2fd7e23f93ad2c08805e7472c..fcb186c2ab77a567d463527c83b09c50d45203ca 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP156-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP156-1.p *)
 (* -------------------------------------------------------------------------- *)
index 63868e1bf54c2b7bbc1c8ef6dec177ba1b1fd913..3f1fe89113555c82e59493079a636506149ea6df 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP157-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP157-1.p *)
 (* -------------------------------------------------------------------------- *)
index 710c30a1b619c1dc7aefd655108eb5d1ad35ab7b..f156eaec45e7e7372c8493f3704d2131636335e0 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP158-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP158-1.p *)
 (* -------------------------------------------------------------------------- *)
index ca0b0ffdf36264ac04fe98419d0d6f5bc11874dc..752911c3d1a14a10f4f4473d4ff3950081326666 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP159-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP159-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1d49bcea17f00ae46601a1b3bc2dffdb3c10a26c..2a98c44ae12c23a0bf8b3f8863d2fe5314d34c7b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP160-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP160-1.p *)
 (* -------------------------------------------------------------------------- *)
index ff4878fbc9ddd3a175a556be941530ffca6b7383..b96a0d70a9dbf0fc0add2afff66e854769f127ea 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP161-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP161-1.p *)
 (* -------------------------------------------------------------------------- *)
index 4d4fa4e5e67bac00c78391d701399c8cc75294dd..b5b33a25a0c1aee822cf3785be16a52778044fb2 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP162-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP162-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3065332b9a173a348f5946c5e60ca75fbb83a3a9..e9dfaebaf8ba1c2f9b6529973a7c4f6a7ee84cab 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP163-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP163-1.p *)
 (* -------------------------------------------------------------------------- *)
index 9052578510279c771967a803f93517ef822fc1c0..59bd4a63577fbe9172937663ccc5100bae50ea13 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP168-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP168-1.p *)
 (* -------------------------------------------------------------------------- *)
index 8e669727089db0d0de8e931beda29ce0b0f5388d..d575e436647d183b3a6d4906b227f26e5a03617f 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP168-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP168-2.p *)
 (* -------------------------------------------------------------------------- *)
index d6b61595c16180b60187f126328baae9bf82f82a..9f5b22b10cb15af3f24f529af5643e55fd8d6b4e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP173-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP173-1.p *)
 (* -------------------------------------------------------------------------- *)
index bd8fecc10099b19cd7c48b4b514b436fb7570dae..b08649ba6e9d07462cb783f10220ceb703a260f4 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP174-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP174-1.p *)
 (* -------------------------------------------------------------------------- *)
index fe03f9f02a9c9ce2d66cb2be40d8392674467d52..28e992d2d923c7b3a1e0972232c594e6483f08b6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP176-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP176-1.p *)
 (* -------------------------------------------------------------------------- *)
index 153ac5806b3ea6ff522145b249f182a247ec4d8c..73db9743a2d4ac5b71f0d5999853963c15645670 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP176-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP176-2.p *)
 (* -------------------------------------------------------------------------- *)
index b2166c28f7ec699a3c981248894bf3a5d016a9bb..68c61f9f4631a7a2a98bc69c52c961a1ff119a37 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP182-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP182-1.p *)
 (* -------------------------------------------------------------------------- *)
index f8955ab0ed8eb1ea590a8cbbd0b1e023f90f6783..ba9ab8705e56cc7c975aa9d7d29f00d4ff593daf 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP182-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP182-2.p *)
 (* -------------------------------------------------------------------------- *)
index fa4e6ce2362269c8ae5ae489cd28f40518763452..744ad2e04324da85eef35fde02db5d37eb531b68 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP182-3".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP182-3.p *)
 (* -------------------------------------------------------------------------- *)
index 95fb312fbd1bc32ddb321496d2689c46b83b642c..7c11b0fa4011e56415b80f0bf34dea3e7cc5917d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP182-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP182-4.p *)
 (* -------------------------------------------------------------------------- *)
index a39543178e52f3f798206eff2060ee645271f086..a2fd0a9eb58829a1c8e946b097da13b765ed0824 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP186-3".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP186-3.p *)
 (* -------------------------------------------------------------------------- *)
index be8354b19c5f6d98d2ef70d87ed4da712f22ecb7..421da6945e206d775fb43969edfc90ff0a2606fe 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP186-4".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP186-4.p *)
 (* -------------------------------------------------------------------------- *)
index da64fdee3b95e9de834eccfe21d9259b71aa1759..7ca52046bf098839764d087e29b41242e64672c1 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP188-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP188-1.p *)
 (* -------------------------------------------------------------------------- *)
index 771056e01d80958199a32c127fc61cad40930a65..c9dc85905d1a45a7644c1881665d3247826ad26d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP188-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP188-2.p *)
 (* -------------------------------------------------------------------------- *)
index 183e7b77225b36a7433eb57b62b642b405fbbb63..4978c31d25f5fdcb36c3d97419edaed0df1435a5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP189-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP189-1.p *)
 (* -------------------------------------------------------------------------- *)
index 0b47a1614590c289368f6be62251c33d44cc0f11..b36fa01a9040746c9d31f807ceb348d8f1d2df12 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP189-2".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP189-2.p *)
 (* -------------------------------------------------------------------------- *)
index 01ca783b00cf42812abe7e2d005c87a56513fab7..f7b77e36392c65fbba2b1f104664a6b3a45ba993 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP192-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP192-1.p *)
 (* -------------------------------------------------------------------------- *)
index 9c5b5bcce5b2d75149dc2864538aa563ce69558e..08544742ab13904400d1b6c228af87f4240174be 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP206-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP206-1.p *)
 (* -------------------------------------------------------------------------- *)
index 257fdd49afea48e40342432a9caa6b346af425a0..d0d0b9ce062b6722fe1a4eec7a8e486d843eeed7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP454-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP454-1.p *)
 (* -------------------------------------------------------------------------- *)
index deaa9a2f0dca1d3454b614ea00c6a402049e6cbc..5a981ed5af9171162275ddc729de7cdac9ba6321 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP455-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP455-1.p *)
 (* -------------------------------------------------------------------------- *)
index 228a4f3a6df602cc5bf6886f55a919ffb7124139..c9787c2c566273059ff139fd75302d3be4732640 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP456-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP456-1.p *)
 (* -------------------------------------------------------------------------- *)
index acd2050d2a904e0bb1ec279043393579f75e0da9..1bb70c15800d1c0c26a9754f72616d81185df774 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP457-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP457-1.p *)
 (* -------------------------------------------------------------------------- *)
index 44091f50eed3ca30e865be7d43f24db7a8a1a99b..f3a52a241a4bcf9e28e313a89b705c8f4029c269 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP458-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP458-1.p *)
 (* -------------------------------------------------------------------------- *)
index 303f737416b430251ab9ae9c62f4d1f1bfff405c..7c717aac6f019cdb9e24225712cbaa764d6ebc3b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP459-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP459-1.p *)
 (* -------------------------------------------------------------------------- *)
index 698ac8a23e83c0ab3ddcaa94ce3e3513234c99e5..c97120d432e71eb0ff7e73de612784b938091253 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP460-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP460-1.p *)
 (* -------------------------------------------------------------------------- *)
index fcd04c0c57f32f71d6eba042a08aa0026aa762c3..31e1308672a7bca50491a58659cb0aa5319e4635 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP463-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP463-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1107f4b9821c70df3cfc1f4e2c43e9234e9efac0..8b295b557bc4d4f6e5ee16cc20de04844faaf2bf 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP467-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP467-1.p *)
 (* -------------------------------------------------------------------------- *)
index bf063d591b0396bf2759c4cc470b96d74307884b..af2dbb515aecac525983484da794f0a0b5a384fd 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP481-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP481-1.p *)
 (* -------------------------------------------------------------------------- *)
index e8588f917fd2476c2f02a1304940af81c50659eb..ae8efa8b6c48649eb282eb13ae041e96216e0322 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP484-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP484-1.p *)
 (* -------------------------------------------------------------------------- *)
index 2a015e13e298a00889d878f730c17fba098a27de..77afd17a3126e6eb43cb9482a2fad4db288f29f5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP485-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP485-1.p *)
 (* -------------------------------------------------------------------------- *)
index ccdaf0ea94de86cedcc01a86050e9c18130fe794..1517c62d87c9e40fd213facb3a5bd3f0965d88f2 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP486-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP486-1.p *)
 (* -------------------------------------------------------------------------- *)
index a26acef170d163a15bde9d45c70c6905375b25a5..83a1864cf09029af790f58c3c6b3aca423c90b8d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP487-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP487-1.p *)
 (* -------------------------------------------------------------------------- *)
index ff1c3c177464a9522acc317abb734706ba1b3774..b588912d99e5099567bd7b6d939c281209adf2b5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP488-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP488-1.p *)
 (* -------------------------------------------------------------------------- *)
index 78e958798bcd81f7298b2db5da3168d632752c32..32e96c0950aff4b747ee6fb3f916f94796e8d66c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP490-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP490-1.p *)
 (* -------------------------------------------------------------------------- *)
index 221fdb592eb4915c7bb53c554120ba8433bb2ffd..a3bfcd3693b168b30d9f6d614a735c99e179bacc 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP491-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP491-1.p *)
 (* -------------------------------------------------------------------------- *)
index e9f198d2d6d4f3eb77957792ee221df21963a84c..c353c8dd418ae2eaf624bfd1c2e163d823beac7e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP492-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP492-1.p *)
 (* -------------------------------------------------------------------------- *)
index fc0bf16ce2f5d46dece2a4f25a239aceb99f19ae..b3b6e1113e8f7deca3df6c244bff1a5a1ea51556 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP493-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP493-1.p *)
 (* -------------------------------------------------------------------------- *)
index ea863067aee96b4afa6c764073cb37c10f09f1d0..d731521ca1c0956dc4500f6f98af0ee58df86e68 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP494-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP494-1.p *)
 (* -------------------------------------------------------------------------- *)
index 2250284122c6da5065e6d62d43e4189f4d7b5ee9..376a7fb3e6f224283060821b37852ff1678cff4c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP495-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP495-1.p *)
 (* -------------------------------------------------------------------------- *)
index efe2d3a9408f613b1e55159953373cbe4db7e013..6116704e9b55c2abc79701d7a35f017e6aafb1c6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP496-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP496-1.p *)
 (* -------------------------------------------------------------------------- *)
index c2f5d7be94bafb159056709557ee608e3a31173b..2f36dfcea3771c986deb276ff36de6d0b619ac92 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP497-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP497-1.p *)
 (* -------------------------------------------------------------------------- *)
index c5875b0b29331be67d93c5f8baffd5bb0abdada8..a838cf6154991f44ee3acc45b1e7ec2e9b7d71f6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP498-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP498-1.p *)
 (* -------------------------------------------------------------------------- *)
index 25618b46a93eee44c35802aaf1019502d0e9774d..633a5eb8927aa6d96d47e775fd4d21bf76e10d16 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP509-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP509-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1003a40145a3c13e004017df92427466aab58aa5..2c054d9fa41524b4068d6a4cafe244f01504ff66 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP510-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP510-1.p *)
 (* -------------------------------------------------------------------------- *)
index ff8c9f4c0e4579edf934b262551040a209ac4f82..9a25b0d9bbea97e944a5b34bcb78fb3ccb4c0a21 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP511-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP511-1.p *)
 (* -------------------------------------------------------------------------- *)
index 19a8c4a941df0b21e2ad301577b899b84a9908ff..fa17d99227bcd62bcfaafa1ba6d88afb11f09004 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP512-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP512-1.p *)
 (* -------------------------------------------------------------------------- *)
index 03409c949d3f0c7e59647313f1237fc59ab4c5c3..c5f734d0142eaf8cb84eac73cf8bcc443abce2cb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP513-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP513-1.p *)
 (* -------------------------------------------------------------------------- *)
index 90593b6c873ffc34e92e343cbc7ae5286900f9f9..7fde9848423150b5cabfebab8c3457640f2e68ce 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP514-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP514-1.p *)
 (* -------------------------------------------------------------------------- *)
index 7b526ef973e5f3b81aa1207cfd24b68ddc017c99..4896312349535c3024cd54b71601039323c16074 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP515-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP515-1.p *)
 (* -------------------------------------------------------------------------- *)
index af15eb7eefb9a3580a611f512e5f8e87946d2ee8..15a873c6596f92d2790bffee995870d9f7da7ceb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP516-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP516-1.p *)
 (* -------------------------------------------------------------------------- *)
index a488717cd115d90f574f0c9571f4123d68808be7..e4a0a13d6b8e3377206ac15edb184d24afee7960 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP517-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP517-1.p *)
 (* -------------------------------------------------------------------------- *)
index a953ab61084cd3d27549f791cc31461e6b56097e..7c5ef76cc7c5688cb737cc379484ce9eb0215fbf 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP518-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP518-1.p *)
 (* -------------------------------------------------------------------------- *)
index ea992df719e8a4763676fd3cb90236defc73c3cb..3c5f1a9b50028a79dc694fdbc164ed951fc62c94 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP520-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP520-1.p *)
 (* -------------------------------------------------------------------------- *)
index a8f428a0d9511f1474422cb83b43314b5a2c8354..7f92331931f8e244048d0dadada79eadfc2114b0 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP541-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP541-1.p *)
 (* -------------------------------------------------------------------------- *)
index 848748d87b74bbbfb74fcfb72b1d91b686d913d1..d144c114bd6dc4d83d4b859a746ad89a0517e854 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP542-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP542-1.p *)
 (* -------------------------------------------------------------------------- *)
index cfc5bab5801013f8e5e872195828b7fd7e77852b..5fe948ea6f5de17c4350f3d6a750af17eee557f3 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP543-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP543-1.p *)
 (* -------------------------------------------------------------------------- *)
index 96fb69f734cd6a8a91562390aeda9fc3952f096a..ffaeb374f72e7fa9cf672eb085ca85a4a1f88fad 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP544-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP544-1.p *)
 (* -------------------------------------------------------------------------- *)
index 302fb8916d903b539b31b37d4a4a7c72c74a5aef..523a17259ec79c77617986565ad9ba4b4b7f30ed 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP545-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP545-1.p *)
 (* -------------------------------------------------------------------------- *)
index 2488a948412589b6e143b5f5415fe10db8cbcbbf..b4de2a1690c504fa48cb3ec768b4e9109b9921ba 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP546-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP546-1.p *)
 (* -------------------------------------------------------------------------- *)
index 24ede0fe7ff0438330fc15f6bb5fdc3824b2fa6a..bba8f9f0759f0b0a10f5cabdd400abd96160014d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP547-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP547-1.p *)
 (* -------------------------------------------------------------------------- *)
index a065d3f1b804dad10c9fc141d2cc2e595883354d..be679cf9b0b212f88ec40d5e1a05562546a03994 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP548-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP548-1.p *)
 (* -------------------------------------------------------------------------- *)
index 0bf4dbf1cc3b0a4c6528821dfd4b3d8381c6a3b4..55c6e1f1aa897d2e24e7571ad14226bf2d47f0a7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP549-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP549-1.p *)
 (* -------------------------------------------------------------------------- *)
index a7482f9b5dc12d238c4ed05e63c22ec51c3c8e43..340171a78980e7740c4ab6b65f13ff0cdb5b7858 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP550-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP550-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3144369c251d78fe74ecf6206dc16b3332e65bde..d67a994eaccd6955b92fbef47869d2d8be777737 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP551-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP551-1.p *)
 (* -------------------------------------------------------------------------- *)
index 9a776c962096f2e71e1a87a672eac5f5ee6823af..e3b3324c8e1a3000bd0e7fd9e8289472b0e9b9a6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP552-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP552-1.p *)
 (* -------------------------------------------------------------------------- *)
index f314261a2e57971470b3a3abed43e34c58ddee08..4817e4e1bbf7d170d6661e7c26a088e6090b7db5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP556-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP556-1.p *)
 (* -------------------------------------------------------------------------- *)
index 35670d9cbe46058c770f9c94fce902aab717fe7c..da6a12f629af713ad248d3591b181d8fd0f4d805 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP558-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP558-1.p *)
 (* -------------------------------------------------------------------------- *)
index 113f49edf4d29691493d17424f3050bc7b9ec931..aa3fb64195d583308c190f104c7f2c00b6fb8e68 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP560-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP560-1.p *)
 (* -------------------------------------------------------------------------- *)
index dc788b10944eabd593f86534bc8ab78e425ad950..2ea4db80e358c318b29fbe21f143709d86cf2dc4 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP561-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP561-1.p *)
 (* -------------------------------------------------------------------------- *)
index 99ea92789459bb44be50b2801b88e1e099094b6c..b3160a042e18562f02e176595a5de725dd998523 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP562-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP562-1.p *)
 (* -------------------------------------------------------------------------- *)
index 63b1c2d979032cfb069de5286cbec86e4d215efc..b6071cc6696f303ebb25ff2b02f88fc57f79f8e2 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP564-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP564-1.p *)
 (* -------------------------------------------------------------------------- *)
index ad4f9357093493aed2771b7e7c8b68dc1091eca2..57f5b453d044f3260051c8e9ecc68b927c85f82d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP565-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP565-1.p *)
 (* -------------------------------------------------------------------------- *)
index 71a827e476ab6a9b677133ff0ca3864e91dad451..1307c5f23db301a6205e4d4f2cf5e280840b4985 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP566-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP566-1.p *)
 (* -------------------------------------------------------------------------- *)
index 6fbd3492bfad64bc897c05da603f9ef59b8b204e..2ec8690a4d3040b9dace75c4e9efe4fae310af82 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP567-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP567-1.p *)
 (* -------------------------------------------------------------------------- *)
index 884ed5e5c4d679473bb789666568f2ef6610feb6..1d63a33f3fd7e87057b09497f6a7532f8b658b5c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP568-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP568-1.p *)
 (* -------------------------------------------------------------------------- *)
index 931c933ba26b1d422801c70355af5a5efc01684d..58f139e4c3059fccc2b9330d49f0432e850aa9fd 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP569-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP569-1.p *)
 (* -------------------------------------------------------------------------- *)
index d6bdbbfc691d194fadace23645d5b05293e1f00a..a25f401295880d583bdbc639ecc72a73233f944b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP570-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP570-1.p *)
 (* -------------------------------------------------------------------------- *)
index c3e517cefbd197c7de2b835b68d62a8b8ed3456d..9467a1d9b28fc1b8485e7ef96349bf3d551bbbfa 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP572-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP572-1.p *)
 (* -------------------------------------------------------------------------- *)
index 8076345ccdf59c505c32f647c0880c3930d1e532..c45c0e87e636a66a1536348aa8c80b750630602d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP573-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP573-1.p *)
 (* -------------------------------------------------------------------------- *)
index e6f9dfceca70205e76128215aed3e8580b529d2b..d2f51431fbdcb6c51ce39a53cb90e2c14c6c13ee 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP574-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP574-1.p *)
 (* -------------------------------------------------------------------------- *)
index aed52d2deff691f0607d00d2915d021b1dc76159..9851667be50ec326c4a626c35ace00aa459785e1 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP576-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP576-1.p *)
 (* -------------------------------------------------------------------------- *)
index ad7c58b9ef74944a31ab478371cea224260a27fe..16f1de1b681ced458a4e9bd2bc9666ad240bebc2 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP577-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP577-1.p *)
 (* -------------------------------------------------------------------------- *)
index 7c9843da7b16ecf70fd8713d613d854abb7a450d..f1b196450c16d0c6503fe4cdfb62b54404c64d8b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP578-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP578-1.p *)
 (* -------------------------------------------------------------------------- *)
index 4d729b9959fb46660f288775f6f43a662d2a0df6..6bcb954fd9f42adca2e2196aa0b66b6f8344f12c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP580-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP580-1.p *)
 (* -------------------------------------------------------------------------- *)
index d826e2af1d83f281ec55d064b05c905322c47c83..fa1906dedcd9fbdba5f34b806f71c8996ef6283b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP581-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP581-1.p *)
 (* -------------------------------------------------------------------------- *)
index 4c09bb39cf6e736cb075a3919a9fbdf68462b97b..c20b7e4e8894c8cdbcc8b18db2e81183944df6ed 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP582-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP582-1.p *)
 (* -------------------------------------------------------------------------- *)
index fa95c336a80f5b7c8359466f7996cc76e15ffd44..ed4130734dcecd1d12e16699e1f4acb00d5594a3 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP583-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP583-1.p *)
 (* -------------------------------------------------------------------------- *)
index db36e336b84676a2c20f50f2df4c85507b010763..84d08821abc701bfd8de61cf9591bd6232a7a78b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP584-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP584-1.p *)
 (* -------------------------------------------------------------------------- *)
index f38467e27043c6de739f3f8b0b6ff33f01eb35a8..0cf2ec1db497193cee18132e51e0ea2dd8bb02fb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP586-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP586-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1d13edfbe9160694d7a313671f7bd03b1a1f441b..66272595027cd580ec7381bff9ac1ce008bf2cbf 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP588-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP588-1.p *)
 (* -------------------------------------------------------------------------- *)
index f678b3d830363e730aa907d7703383bd02b8f595..5d587a0e15c8c47e8b3c4007d1d5951da771a5ad 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP590-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP590-1.p *)
 (* -------------------------------------------------------------------------- *)
index 5612e2720278d31c1067edca23297ce56bb0d68b..96c9444ca8247319fc9bddf9f590fb3beaef01f0 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP592-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP592-1.p *)
 (* -------------------------------------------------------------------------- *)
index e97f64cd3e8809e2334229d7412393a6f8d164ba..7491debbf722a35249400474a60d081f1302f38b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP595-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP595-1.p *)
 (* -------------------------------------------------------------------------- *)
index 1d8e313ac925873c7918ce4072cd55faa30043d9..c12dfe9ac24c003bc107868653c0643add9659eb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP596-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP596-1.p *)
 (* -------------------------------------------------------------------------- *)
index 5923b8e70ab913172f115a1c5278c5f2109bf964..df6892318beb31d56add62d36321adb81565a203 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP597-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP597-1.p *)
 (* -------------------------------------------------------------------------- *)
index 133ed30f63d014e2506518f9171b866fe6044706..2f416fbb06b7f801dc71eeaae70fbf93c0e84473 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP598-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP598-1.p *)
 (* -------------------------------------------------------------------------- *)
index 31716a7106216f2c8acf5dfe9e7dedeb983576a6..e55bfc443c56b8f8520d61809ebb9e22e059db03 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP599-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP599-1.p *)
 (* -------------------------------------------------------------------------- *)
index 07535f9bbcd2a39dcf436062bfa61112c43e6d54..f17fdf2cceff4a33a29e54a5aa7e3a2cbda27b6e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP600-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP600-1.p *)
 (* -------------------------------------------------------------------------- *)
index 620ddb94e4a3414d163c91e8a3ec1903525f524b..bcb8a0053fe3d130213d122e20cd61cd30483ea7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP602-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP602-1.p *)
 (* -------------------------------------------------------------------------- *)
index 6d7b92f84fdcd3006a45fc79e40a580bc0e79569..82144c1f8c59def6c56767db89684322e2c9d19f 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP603-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP603-1.p *)
 (* -------------------------------------------------------------------------- *)
index 9e228851ded02b766e412afcd9f76365a4a86c03..811970fd5b0342595e3722dea271d4890deeeeb4 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP604-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP604-1.p *)
 (* -------------------------------------------------------------------------- *)
index 89084a07beb71b2d8f6a82ff483416ff8f2d1565..5725d6a19adc936bc72b62c2c765c6b0f61bda6d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP605-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP605-1.p *)
 (* -------------------------------------------------------------------------- *)
index 09742e1ac609235fd574974ac9695594a6fc9b47..567592450a04b5579c56a28551b68e87966c3c50 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP606-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP606-1.p *)
 (* -------------------------------------------------------------------------- *)
index de594533178c473b3ae58007c71d1a950f988525..43fd1ed20dea65c12c50544b91d2fdbbde634772 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP608-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP608-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3dec2670853abe8263e087c22437f310afac68a7..c7aa5405be62527240be97ca1333a3848552c996 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP612-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP612-1.p *)
 (* -------------------------------------------------------------------------- *)
index 206e1edcbaf6acdbffcb3f01d5d5a5ffb9ece516..2557b85af614061a7d81a45173c73578e9af4aba 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP613-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP613-1.p *)
 (* -------------------------------------------------------------------------- *)
index 203d3f2166065fc83e3599b2fc4847f529713dc7..27cf8fec1899e6946394f3a1a153e897c7c109a6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP614-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP614-1.p *)
 (* -------------------------------------------------------------------------- *)
index 2fe6234f6b42ec75543d5ffc39ab93851e77d9a6..7be06ff728049da373bd7e5fa8cc35ddc5f8244f 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP615-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP615-1.p *)
 (* -------------------------------------------------------------------------- *)
index 6649a53d8d965d20d3d044dd6cb63539d0a7d694..762df99250e505150184ac064ed69495b239d111 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/GRP616-1".
+
 include "logic/equality.ma".
 (* Inclusion of: GRP616-1.p *)
 (* -------------------------------------------------------------------------- *)
index a8ee942e6d1af2b1b2947ee650ddf37fe703fef3..de65d6e9c7412563711af522f36c77912b4e67e5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT008-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT008-1.p *)
 (* -------------------------------------------------------------------------- *)
index e1897a41435396c3dc46fea518aed9f8a05c190a..9d53a1f55fc2d2b3ba561e5eaf90562dc22b5e60 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT033-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT033-1.p *)
 (* -------------------------------------------------------------------------- *)
index 37ce834ab1c68f10e6b376950ca2316ee86dc2ab..2ae473b10853e9de10811fa2395845a3f6ea87b5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT034-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT034-1.p *)
 (* -------------------------------------------------------------------------- *)
index 8ad8654fc717ce6f87aaea8e44c164b1b5042a56..7165bc391749b2bd45d4b7d14c6ce63b66918cc0 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT039-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT039-1.p *)
 (* -------------------------------------------------------------------------- *)
index de4e55ffae76ac530f2700d507b73d564554e794..7000124f6b17887ec8901ece8948168c47ab4123 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT039-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT039-2.p *)
 (* -------------------------------------------------------------------------- *)
index a4ff6eff60d4c37686ae5dcc796bcae6dba6096c..a9b80b2a2b6ddaddd9b6f9a5161076c91720d07f 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT040-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT040-1.p *)
 (* -------------------------------------------------------------------------- *)
index 0b58207dbdd38c934b5e6b627038a5ee7464c225..802ed388b74bffa3f249168817423040591dd500 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LAT045-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LAT045-1.p *)
 (* -------------------------------------------------------------------------- *)
index 442ce5958c2081068327a6446c9877dfa17983d1..0467eb2a8ba178845f02e0d2bd149fe79779dc32 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL110-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL110-2.p *)
 (* -------------------------------------------------------------------------- *)
index 473cf328cb21ad039b995f0ccf7119b65c5a7e2d..bc5a0af03a09cf1d4ccb7191f329ef9111cd7563 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL112-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL112-2.p *)
 (* -------------------------------------------------------------------------- *)
index c310916a76c01a240e2261ded209bedcc557c9ef..6a19126a78f730b5286a0277a7aab9288205faec 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL113-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL113-2.p *)
 (* -------------------------------------------------------------------------- *)
index 46cc017276996c1b9cd2b4c57a7892fad4b19e72..98042d05f5091ffdac34492dc5a75cef1b7bdacb 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL114-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL114-2.p *)
 (* -------------------------------------------------------------------------- *)
index 158fef7e81822d0f5b779201eab45cb8653a6bcf..2bce680beea85a227e9547d1ca41ae50aa371fea 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL115-2".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL115-2.p *)
 (* -------------------------------------------------------------------------- *)
index 330e40369e7e31182e1b7a6a9cd379db8d414fd8..9705e8af44a727272854a2cf6d8264767294913e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL132-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL132-1.p *)
 (* -------------------------------------------------------------------------- *)
index acd9538be093d461513d0b2582ef01a6e1c63214..39de88054e6bf33f27c792580ebdac775c7308b5 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL133-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL133-1.p *)
 (* -------------------------------------------------------------------------- *)
index d400f7cff02b6c466533df438e58934ff1fb2069..de33216543cfea0410a37c6d7f3a9687867c439b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL134-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL134-1.p *)
 (* -------------------------------------------------------------------------- *)
index 9a982d8afe4fc54e1e2f452ca1bc1eb05ee66b51..9c7fbd5f81f0bc5f7ee1319f1951a54f4261d30c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL135-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL135-1.p *)
 (* -------------------------------------------------------------------------- *)
index 21a30112899b2d43fafc28b03649276bdbca5356..88914ef32f34fd4fa7daddc4106d900d9fd0e030 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL139-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL139-1.p *)
 (* -------------------------------------------------------------------------- *)
index c5148d2a89c539074778a5a8632bca4e4ca37873..e701562f9832852b73c58b9dadbface9b7dd812d 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL140-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL140-1.p *)
 (* -------------------------------------------------------------------------- *)
index 5f816e92692e4158fdad565b0c2e72c7dd3683dc..fb49a57606f620d686e70de152e76bb0948c15f7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL141-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL141-1.p *)
 (* -------------------------------------------------------------------------- *)
index 827b9921411e81145ae4d7eee46bffc9fc4b700b..f23d00e59947b159ca919537273b945d182ac5f6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL153-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL153-1.p *)
 (* -------------------------------------------------------------------------- *)
index 169be886a6b28dcf6ee7bc9cc8538fe415dc07c4..1d4c41b30fb612cbc9acd5ed05c558693e687858 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL154-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL154-1.p *)
 (* -------------------------------------------------------------------------- *)
index d5cb7fb5e1252102536e08ab0f66745abd66d520..cf915a8a1c521d7e41d2a3f364cce9c22425e109 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL155-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL155-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3d5df92b67cef1e9eea39b1efe8d2aa5ce069447..9390e4be58591fa4f072551a1d9560b62bfaed5a 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL156-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL156-1.p *)
 (* -------------------------------------------------------------------------- *)
index 97ea2cad985cddad03cfedfe12d927e4c6f52090..18c64d538e2919a33c745e76e9febfa63fcb22a3 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL157-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL157-1.p *)
 (* -------------------------------------------------------------------------- *)
index 32a4518b7e05c8abadb83365f416460805680dd0..e6e04fac47bad580f39d37795d34eae90afc393b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL158-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL158-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3961b05d89597cfd271325a27ca06d9c049c7914..090b2a7a5766166635ab1bd95d9cf6c2d5cbcc50 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL161-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL161-1.p *)
 (* -------------------------------------------------------------------------- *)
index 8850280e9b06540dc304dbba6ff021d0e6c01314..e5bc4b5135858837b5fdb10b127f325c342a57a4 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LCL164-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LCL164-1.p *)
 (* -------------------------------------------------------------------------- *)
index 48e8b32cc07b0704ee70962c19370bddac7cec6e..1963dca3905433c9cd72ae2b41d26f40907f7372 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LDA001-1".
+
 include "logic/equality.ma".
 (* Inclusion of: LDA001-1.p *)
 (* -------------------------------------------------------------------------- *)
index 534a5a9fd88d169f3c2549d89a988ae0ef305bfa..1aeda095a45cd1470bd8a1019bd9e8cc018496d1 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/LDA007-3".
+
 include "logic/equality.ma".
 (* Inclusion of: LDA007-3.p *)
 (* -------------------------------------------------------------------------- *)
index a9cdabd1d2617b6e04d8e369b5b6f85fba76e45f..97fc8aecba9f4e22bb5cc8d9c5288867f6133046 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG007-4".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG007-4.p *)
 (* -------------------------------------------------------------------------- *)
index c56142d6257e588d20ba4b26b60f03522e065677..8652ab6d5fd954d68d9e7212bc5c222d35c93408 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG008-4".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG008-4.p *)
 (* -------------------------------------------------------------------------- *)
index f7df33340e49c9e2a9b72db69418c0a23df17cef..edd9c711098e1227610454f4deb3ab154ec1c574 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG011-5".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG011-5.p *)
 (* -------------------------------------------------------------------------- *)
index e69e4034585476e887b5407aa1870645cd782adc..aa8f019d759d157b04045fd4d59f6697b9d3063c 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG023-6".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG023-6.p *)
 (* -------------------------------------------------------------------------- *)
index 49260d096d2d01d06db105dee28f5daec6ce5f0a..63ae3d9a9a5b6672ec0f8f06a3124974fc029081 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG023-7".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG023-7.p *)
 (* -------------------------------------------------------------------------- *)
index bdb4c04a72f82210e7264a222dd3cd67dedca1ab..f4282d6009e4f2ed0e32d71cd71c1aff6bf8c8cd 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG024-6".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG024-6.p *)
 (* -------------------------------------------------------------------------- *)
index afb63d9f627e4ea20f3db5ea18d59c6824bd7ede..b4d302383c9fd536f6127d9b17ca8c07cdcc87ae 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/RNG024-7".
+
 include "logic/equality.ma".
 (* Inclusion of: RNG024-7.p *)
 (* -------------------------------------------------------------------------- *)
index 81aabc975393cee85a486878c2f035db7e49a3f8..aca76f33da3fd03659274927be255b3697c788ae 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/ROB002-1".
+
 include "logic/equality.ma".
 (* Inclusion of: ROB002-1.p *)
 (* -------------------------------------------------------------------------- *)
index e3e2ad2b4e29a60c126aad7ef985a6fc476f034d..4dadbbb6a5cdeb9fa62d6b6a1a02e9842cb77af3 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/ROB009-1".
+
 include "logic/equality.ma".
 (* Inclusion of: ROB009-1.p *)
 (* -------------------------------------------------------------------------- *)
index 76f06f1af98ae95a3015d3a204ad43a70bdf448c..ec3632d113795763b04300eec20454a6983b34b6 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/ROB010-1".
+
 include "logic/equality.ma".
 (* Inclusion of: ROB010-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3039f34122ad81f71fca31fe75c9d30e1bb5d8d6..44e1bf65c210aa0ba709dd43753c1cde3032a6b7 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/ROB013-1".
+
 include "logic/equality.ma".
 (* Inclusion of: ROB013-1.p *)
 (* -------------------------------------------------------------------------- *)
index 72fe9de94fff2f735ccd78dd5441b69944c8508d..d7fc2ebc373ba28892cea4aeec60a953d9492e79 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/ROB030-1".
+
 include "logic/equality.ma".
 (* Inclusion of: ROB030-1.p *)
 (* ------------------------------------------------------------------------------ *)
index c8ac354f034b32c6907a9cce4f4a8ffb24d7b222..85efba55e51166040418148378c102c46b1b545e 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/TPTP/SYN083-1".
+
 include "logic/equality.ma".
 (* Inclusion of: SYN083-1.p *)
 (* -------------------------------------------------------------------------- *)
index 3a9719e413f0624f44fe7e3307ce676427e28cc2..9499b63e223e8c3d42ba4e1f0d6499af85247ea9 100644 (file)
@@ -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".
index a77c99ca1324dab64649c3d379f2b5186ed85133..7295a73b5fd7d0c0a9bdc930bf0f9ffc2b4f1cc0 100644 (file)
@@ -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)".
index db87636d7f89bbcb581e1db99e5365e3b9dbbd3a..1d0198fcba642de1cb0b4687090092e1b98946cb 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/apply2".
+
 
 include "nat/nat.ma".
 
index a265946132ef64cfbbcc5a04c143e3b079105d75..fa0d3699851cb60dba3441584e464c0a884e7c8f 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/applys".
+
 
 include "nat/div_and_mod.ma".
 include "nat/factorial.ma".
index 4b7859e6b28bbab212dd86345fa7c84b036e361a..9128f20c622f0586d2a945ed446c2641c94d0cd4 100644 (file)
@@ -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".
index b009e18d15d04aea4302428a440804967931a580..172aa8e117a87efc75d3c7a8ab3be7348d701ec2 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/nat/bad_induction".
+
 
 include "nat/nat.ma".
 
index 2972bfa62344f14744c98ef5bd2534b4577c51a6..35a2496e6f03736bb130782c6daedd347f1c48c7 100755 (executable)
@@ -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)".
index 0e06223fa4404751ca250c35eb15e269eb11931c..127de8565864c622d7b73d02ae37b0af2e5222d9 100644 (file)
@@ -12,5 +12,5 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/baseuri/".
-set "baseuri" "cic:/matita/tests/baseuri/".
+
+
index fe39c310fad9c62b8d1cd99954a54e6c129ab6b9..3318b74cdc88a33e80a61997c1c9f3e0dee9194e 100644 (file)
@@ -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)".
index 214d0fbe3de190900c48d55c59e095eedda29206..fca6c846dd533b921599b33835a8392af6479df0 100644 (file)
@@ -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".
index 617965258d92dd7f464435181c493422bfd230a2..25c1b64f2c713d531ed4f394908912812374f0a5 100644 (file)
@@ -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)".
index 3c95a8a1f1d7e92e378c7425a25a97bd1528081f..bac472d6746fa351cc4fea614131f73333aad303 100644 (file)
@@ -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".
index ca8c4abab583ff93c6bf583a4a5dc329c7f7847c..e9026af335ee5b894de07384e81952f3e00d509e 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/coercions/".
+
 
 include "nat/compare.ma".
 include "nat/times.ma".
index 64f85ea7521ee4875cf40c401ca6218a720791bb..153c295c59642d016149aa25ff0806523e3b8fae 100644 (file)
@@ -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).
index b89abbf219fe5618ee3f351b55b62352a2a40305..3b6602bbb30c2a5dbaab74d9bdf91e2ae4d8c319 100644 (file)
@@ -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].
index bfe2b34380578973edefcac4ed29517ba65555bc..5c1c0c9f83d495e7f7801c397c3245862fbbd0fb 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/test/".
+
 
 include "nat/nat.ma".
 
index 0cf156537a5c529c8268f9b87c5919775d39c75a..f21d82911cfaa9f03adc95bef258b2c0ea950253 100644 (file)
@@ -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
+*)
index d0d8caedbfe0d415d79c496c2b3b3e2e8492a932..69723aa89686913a6496ceceb8ef42020e732102 100644 (file)
@@ -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.
index 63c48e66b9d42267b3d3455cc855565b80527095..7e3536b07071fc38d9192c0d138e8df71454b7ad 100644 (file)
@@ -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.
index 36217ad9dbfba62e8299b06789df498f38d47456..203faece5d6db7e13ef284842fe397502e6a0bb3 100644 (file)
@@ -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 *) 
index cb54a90d3aeb7db62afd76140478a4f5aa1d11e5..dfb6312031b9415d838da3f0e79378b9f1149028 100644 (file)
@@ -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
index 5d6035777a82e69a250ee46633687b1a9106490d..02316c6e0ff509facd938343a318f2b375765633 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/tests/compose/LCL002-1".
+
 include "logic/equality.ma".
 
 theorem an_1:
index f33044f12ba740937aede424c89a9b4b19a1cbd6..8e785ba82f488129b0599fc3a9f6198df738cf68 100644 (file)
@@ -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".
 
index a9d85ce2544d98b10c544c0de10cc5a052cc612b..ad9d73c4b38f4cdaf973086e759fb8dd76f8d3f3 100644 (file)
@@ -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)".
index ed1ef6b3c035e1f5173093223b57225a34939585..a8d8bc3b1340e5996b6569ae38bb19afb516788a 100644 (file)
@@ -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".
index 24d17f13d1d1193d711f0a18bf98e761c4262374..1de0ead4a80b3bd380624b95fd03f4bc0ecf885f 100644 (file)
@@ -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".
 
index 40f8d3700b0e907d8d30bc8dd78369f7c3558862..5308f9350fa3762f8c496719266481289b274e97 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/decl".
+
 
 include "nat/times.ma".
 include "nat/orders.ma".
index 2ba58c158c3adf50edd95475d6330272d3cb87b3..39d04755e617802559a13e9018ace01ffedd012c 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/decompose".
+
 
 include "logic/connectives.ma".
 
index cb7a830eb7c6eb9e6f96a5bc362742d375664528..037f192603cbae474f94fd82fb93e822d72bc909 100644 (file)
@@ -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".
index 0f4827e462239248826e77bcaba84fdf61f7c504..d1201a6c4490822e0ead098a58d0878fe092d838 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/demodulation_matita/".
+
 
 include "nat/minus.ma".
 
index e217a76526ec78472d40ee2d66120ea0d8093cd0..c58da98a9e7a3cf656868b568eed0e3e1a038b42 100644 (file)
@@ -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)".
index 11a42acac47cbdf0a4053255b96e6149fd8b35d5..d52faff1799d11a60d5d44b8b6775a5428c09d73 100644 (file)
@@ -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 (file)
index 0000000..200a408
--- /dev/null
@@ -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 
index 55275c4807bfca6320d31eb3f135fb1173ee257e..5a61101ca9f45791ef6c1be11aec133ee5089832 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/discriminate".
+
 
 include "logic/equality.ma".
 include "nat/nat.ma".
index e038c5da2a03e5294fc568ed6829f9cbece7aed3..42dc195cb1f99c8a15d5bc7a34c8b270c3723851 100644 (file)
@@ -12,8 +12,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/elim".
-include "../legacy/coq.ma".
+
+include "coq.ma".
 
 inductive stupidtype: Set \def
   | Base : stupidtype
index a95e954c134375d95c4ec25539908f854c95673f..b6bc3d907e456a833d27db157951a4f7c906d73f 100644 (file)
 (*                                                                        *)
 (**************************************************************************)
 
-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)".
index 4fca7b1999664dc66b24e92e1184cc08b681ebe2..bbd1e11c1e3d8da0df1c4be693ea470aefc1c145 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/first/".
+
 
 inductive nat : Set \def
   | O : nat
index 65c916f17183adcf9067832e93ba456ae788218e..cf85e58a82fc1895487511df958ef675cacdb757 100644 (file)
@@ -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".
index cd507c7de845a90a990977f3a42bf897fd64b431..f2161518539676eeec6288e43772b7dbf9535829 100644 (file)
@@ -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".
index a3aacd3bf426f392f0064912c992a70391aaec4e..077eb32653bbbfaeb6237c9bb063ae38220be6eb 100644 (file)
@@ -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".
index 059a27be3f46810a5f3ee09304078bc533657989..88adc389bb0e595f82b20c06d8af4a5841718e0a 100644 (file)
@@ -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 *)
 (* -------------------------------------------------------------------------- *)
index 2cc7110ff2102a1e1fe04cc9c2a92f9c8adf0a93..b805df687a70ac8fa5e71eeb7bc3713269b2b372 100644 (file)
@@ -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)".
index 56212bdc5d5bc04c981a3f2a27fc502264d9b9bf..c2a5c2c54b42c2a4405f5e426b167e2e9629cd41 100644 (file)
@@ -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
index b8718cdb821d008a487bb5dbe1e81e6f7408c9af..eefcd378bb2eac000f2ef2cdd523587c8a620642 100644 (file)
@@ -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".
index aaf57009185b3a729ec96bee591a38633c722285..e71310a2696b97b3905949f554776fc0c4f8a33b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/tests/grafite/".
+
 
 (* commento *)
 (** hint. *)
index e48cc827edf53746995597c70f135324e6bcb23a..8f36be28840f707277c622529e8d8488fadd6b7b 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/tests/interactive/test5/".
+
 
 whelp instance 
   \lambda A:Set. 
index 4afdd3741e799ee244e93a8c47a53c7fc7e71891..42a99ff1b7db934bf2cf84a1d7c23cf6e0ce4618 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/tests/interactive/test6/".
+
 
 whelp instance 
   \lambda A:Set.
index d7347ed9f207c2f1535891c7f1a35456b1029a9d..55f22643ad7a5b937050f1fdf2167ded6902fe61 100644 (file)
@@ -1,4 +1,4 @@
-set "baseuri" "cic:/matita/tests/interactive/test7/".
+
 
 whelp instance 
   \lambda A:Set.
index 7e02c0fff8ad3144cbe266467d213729ad7c0f24..7aed7b6f87e7be514ff66978c4aa0ec0a41569f2 100644 (file)
@@ -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.
index 4c33beee0f8c38a89b79f366c4e573e378881c90..f99acff11ed11610ec411ec0b3e0ead3d6a10a92 100644 (file)
@@ -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".
index c99c59bcf7f77321d8c00aaef0f799e5d4d786d7..8261b33f07355eefe305b50c3e406de595116972 100644 (file)
@@ -12,8 +12,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/inversion2/".
-include "../legacy/coq.ma".
+
+include "coq.ma".
 
 inductive nat : Set \def
    O : nat
index 55933cd31bf8aeb42aa0834e890fedf877cf958d..734a4a9624be3effb8545c15d8231f9dec76d4f9 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/letrec/".
+
 
 
 alias id "O" = "cic:/Coq/Init/Datatypes/nat.ind#xpointer(1/1/1)".
index d9dfec329b7f35e68d198a27c985d5e3059c63d3..d2ac486b40d15789e620696f12297b59aac3ba57 100644 (file)
@@ -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 (file)
index c610118..0000000
+++ /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)
-
index 0e27ce4098d58eeee7276da93673e292b443d7df..539fac9cc869a5b4b0ce9db597d3dc788a6719fd 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/match_inference/".
+
 
 inductive pos: Set \def
 | one : pos
index de9746d527130f3c3a9c5715c6977118a67c8c9e..ff61c9da681542c9fafba76b5c847792ca7a27e2 100644 (file)
@@ -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)".
index df15e704ff0f93fb7545b23e78247a0e481033d4..1aa708fb1264bc1be037d2e3f5c8241f44e90b71 100644 (file)
@@ -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.
index bd0eb8d5a8a97fccb37891c97bbeaba8b0e61c5d..e9e6c8b1bfd11355bafeec780adabbd38509d765 100644 (file)
@@ -12,6 +12,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/mysql_escaping/".
+
 
 theorem a' : Prop \to Prop.intros.assumption.qed.
index 6246048425804773d94c7f1a1e2a2d088d8141a3..ef86f372d23acd5d9b377d58fc77c87e91913788 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/naiveparamod".
+
 
 include "logic/equality.ma".
 
index 2034001bd293d0e7d95c3c1dfedd4ab3caa53aaf..b270912add63478dcc603cc85df1841680f3817c 100644 (file)
@@ -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.
index 2d090e1b0883e39852fbf36c298d73f80f427db1..074dcc96a5e7a6b2fd20161a4e88efeca06d8253 100644 (file)
@@ -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".
index 7c46167f4a6f6ddada45800546adaee70b1eba8f..67a89bf6ced8c428907feb02f85eed16fc742009 100644 (file)
@@ -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
index ab47854da09c2170a38e1863110814c694d24ecd..6822cfb3e3c09d4f5d43eac1e75fc901f76808ea 100644 (file)
@@ -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)".
index 621e2d44921e467eb83200ba7c0aa7243894ce1d..c8645cc823af3f40921e6cf0827a5a11b602478b 100644 (file)
@@ -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)".
index 5c976bcb9f3f04a3326f1bef2c0759af7f60ea0f..5f845b4f0b397471b9c43331c23ed6f2bd4b79d0 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/paramodulation/irratsqrt2/".
+
 
 include "nat/times.ma".
 include "nat/minus.ma".
index 935a90dcfda59211665beee8299aef38b743a3ce..1196255d92d3cf39c772cba04ed36a6b05185b94 100644 (file)
@@ -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 (file)
index 0000000..a885f4e
--- /dev/null
@@ -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 (file)
index 0000000..80e9a2f
--- /dev/null
@@ -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 (file)
index 0000000..4799d5b
--- /dev/null
@@ -0,0 +1,2 @@
+axiom c : Type.
+axiom x : c === c.
index bc5d2e21777fbdbdb51d4e12a7e498bcf974ed5d..24bed8ade8da8dc9158fc5523bc2bee7d2b337a3 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/record/".
+
 
 record empty : Type \def {}.
 
index 2961fdc7e7d4887051c973f9e516edf12d3bc124..37a5309784a983a56258338d814595d83e964a10 100644 (file)
@@ -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".
index dff3b230019b3afbe5726c831421a5cc974f7560..a1956c9b5fe5b397faf83183e1ee3702644fcf27 100644 (file)
@@ -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 (file)
index 0000000..175ea39
--- /dev/null
@@ -0,0 +1,2 @@
+baseuri=cic:/matita/tests
+include_paths=../legacy
index 450c6767176a58d80c41ee39fed3ca04c3c34c8d..284be0701e16fa0cff10752442e7b105e467d4b5 100644 (file)
@@ -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)".
index 61150e817b42df9406d078bbdd48afb2a91591b0..7af3f5521b47d77d57f3b448c458241965cbf52f 100644 (file)
@@ -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".
index a44e80a867e911d162b18429aadb8424fe51fd24..f1e8998f0b65ace8b3c10b37b323364b493426de 100644 (file)
@@ -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. 
index 93da2eccee94aa4b7237fb509e1f398d84fa6809..bcd2def5336eb06e06676fbfd03219d1f17e2d24 100644 (file)
@@ -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".
index 85180da5b043025e53a30a600311a53a5a70043e..a2e2e40dfa2a4265b74414087c7d90b8e997e6d0 100644 (file)
@@ -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.
index 55cfb6aaf15be6171ffb0296e162ccb442d31edf..a8e219fcb20710730981a2d023b379b62dd489d8 100644 (file)
@@ -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
index 124cdc121a0a4ae4d28db1f89cb42fbf21a6f961..70041dc3a0e3b51f5d4e9087d61a975112cc8d00 100644 (file)
@@ -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)".
index 465d7c06e0953702c2b23104c18493e457eae183..3ceba6eaa1346747ce8af3a2f3787d49b3ae4def 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/tests/tinycals".
+
 
 theorem prova: 
   \forall A,B,C:Prop.
index 3318db17db5db75d782723017357a972465f2c4f..a4bd931500454061680bb92381ddf84557423e37 100644 (file)
@@ -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.