Ferruccio Guidi [Sun, 27 Feb 2011 18:27:15 +0000 (18:27 +0000)]
- rc_sat.ma: we changed the notation for extensional equality. we now
use \cong like in geometry
- rc_eval.ma (second part of former rc_ma): we completed the evaluation
by adding a stack, and we proved weakening and thinning for it
Ferruccio Guidi [Sun, 27 Feb 2011 15:31:29 +0000 (15:31 +0000)]
- notation is now in a separate file
- sn.ma: we updated the axiomatization of SN while correcting the saturation
conditions
- rc_sat.ma: we proved that depRC is a candidate
Ferruccio Guidi [Sat, 26 Feb 2011 20:28:06 +0000 (20:28 +0000)]
- new file ext.ma with the objects needed for the normalization so
far, that should be removed or should go into other files
- sn.ma: we parametrized the saturation conditions
- rc_sat.ma (first part of former rc.ma): we introduced extensional
equality on candidates
Ferruccio Guidi [Mon, 21 Feb 2011 19:05:11 +0000 (19:05 +0000)]
we started to set up the strong normalization proof.
we plan to use saturated subsets of strongly normalizing terms
(see for instance D. Cescutti 2001, but a better citation is required)
rather than reducibility candidates.
The benefit is that reduction is not needed to define such subsets.
Also, this approach was never tried on a system with dependent types.
Wilmer Ricciotti [Wed, 19 Jan 2011 11:29:14 +0000 (11:29 +0000)]
Added some typing info to elimination principles, allowing the refiner
to succeed in more cases, also speeding up the generation process (no
more slow record definitions).
Wilmer Ricciotti [Wed, 19 Jan 2011 11:06:23 +0000 (11:06 +0000)]
Added some typing info to elimination principles, allowing the refiner
to succeed in more cases, also speeding up the generation process (no
more slow record definitions).
Bug fixed: the newScript method must be called only after registering the
gui. I have moved the invocation of self#newScript from the initializer to the
instance() function to solve the issue (an ugly gtk error when Matita starts).
1) sequent2pres merged into content2pres
2) more functions to render sequents/context/substs to content and then to
presentation
3) new virtual class NCic.status with methods implementing pretty-printing
functions (same interface that used to be given in NCicPp); objects of this
class are now used REALLY ALL OVER the matita code (well, almost...)
4) NCicPp implements a concrete version of NCic.status
(low level pretty-printer)
5) ApplyTransformation implements a concrete version of NCic.status
(high level pretty-printer that uses notation). It also exports the boolean
reference to deactivate the high level pretty printer in favour of the
low level one
6) some code simplifications here and there (in particular for tactics)
7) return type of BoxPp changed to yield informations about hyperlinks;
the information is not used yet by the interface and it is not computed
yet (not that easy to do...)
8) other minor stuff here and there
Ferruccio Guidi [Sun, 2 Jan 2011 15:47:01 +0000 (15:47 +0000)]
- ld-html-root: ported to permanent lambda-delta url
- ld.dtd: we can specify a language encoding for the metalinguistic
annotation, moreover we export the metalinguistic classification
- the other files are modified in order to support this feature
1. reset of statuses simplified
2. NCicEnvironment.invalidate_all (that used to hide a bug in invalidation)
removed. The semantics of the MTI is now more shacky, but this needs to be
fixed in other ways.
3. {lexicon_,grafite_,...}status renamed into status
1. MatitaGuiTypes.gui interface streamlined
2. added new menu item to close a script
3. restored graying of "Save" menu item when the script is unnamed
Andrea Asperti [Thu, 23 Dec 2010 12:11:57 +0000 (12:11 +0000)]
1. bug fixed: in the last commit on NCicLibrary we forgot that
get_already_included must be transitively closed; fixed and changed
the function name
2. added a cache to assert_ng (called ~asserted) to avoid re-asserting
the same file twice during a single include command
Andrea Asperti [Thu, 23 Dec 2010 10:32:44 +0000 (10:32 +0000)]
1. bug in addition of universe constraints fixed: the recursive
inclusion does not add constraints to the NCicLibrary.storage
2. since we no longer perform recursive cleaning,
NCicEnvironment.invalidate_item is no longer recursive. This fixed
definitely the bugs in undo/redo linked to "include"s
Large commit: refactoring of the code of the interface.
1. management of font sizes centralized in MatitaMisc according to the
MVC paradigm
2. functionalities related to the script window moved from MatitaGui to
MatitaScript
Class mathViewer got rid of. The circular dependency between
the scripts needs to be sorted out by putting matitaScript much
later in the chain. This commit temporary introduces bad type
expressions here and there.
1. Method screenshot moved to CicMathView where it belongs to.
2. the mutual dependency between MatitaScript and CicMathView/MatitaMathView
needs to be solved differently (it used to be solved using guistuff, which
I do not consider any longer a good solution). To be done.
With this commit, anything related to MathML vs Textual is now in
cicMathView.ml.
1) matitaMathView.ml splitted into cicMathView.ml + matitaMathView.ml
2) interface of matitaMathView.ml and cicMathView.ml greatly simplifed
so to avoid any reference to the textual/MathML datatypes.
3) up to the problem of taking screenshots, the file matitaMathView.ml
is now oblivious of the difference between text and MathML. It will
be soon possible to switch between text and MathML simply by changing
the implementation of cicMathView.
This commit simplifies the interfaces of the various Widget-related .mli
files, so that the same inferfaces can be used both for the MathMl widget and
the textual widget.
Practically, it is now sufficient to switch between two implementations of
matitaMathView to change between MathML/textual.
1) some dead code removed
2) code of MatitaClean commented out (but still there for disambiguation and
the like?)
3) dependencies and uris moved into dumpable_status (from other statuses
and/or imperative code) and made functional
4) all the bugs related to recursive compilation seem to have been fixed by 3)
Andrea Asperti [Thu, 16 Dec 2010 11:51:30 +0000 (11:51 +0000)]
Some bugs fixed (and some still open) in recursive compilation of files:
a) matitac now takes again either a list of files to be compiled or
nothing (to compile all files in the cwd)
b) ...
Previous patch improved: we now use an ad-hoc wrapper for Grammar.parsable
in order to localize all Obj.magic --- related to use of Ulexing in Camlp5 ---
in GrafiteParser (as they used to be).
BIG BUG FIXED (???): in place of using Grammar.Entry.parse we should have
used from the beginning Grammar.Entry.parse_parsable in order to avoid token
loss (because of backtracking) between consecutive reads. I have fixed the issue
for statements only (since they are the one that show the problem). Should I
do the same everywhere?
Patch to avoid double creation of metavariables changed to a simpler one
that keeps disambiguating twice the term. The old patch introduced a few
bugs that were difficult to fix.
Andrea Asperti [Fri, 10 Dec 2010 12:35:26 +0000 (12:35 +0000)]
Big change:
- new command "include alias" to include only the aliases
- "include" now always includes the aliases and it includes everything else
only if the file has not been already included
Andrea Asperti [Fri, 10 Dec 2010 10:58:22 +0000 (10:58 +0000)]
Patch to avoid double creation of metavariables changed to a simpler one
that keeps disambiguating twice the term. The old patch introduced a few
bugs that were difficult to fix.