Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2001-05-17 15:06:20 -0700 (Thu, 17 May 2001)
Revision: 3232
Log message:

      I joined Itt_hide and Itt_squash into a single theory - Itt_squash that deals
      with both the meta-level squash operator (Base_trivial!squash{}) and the type
      theory squash operator (Itt_squash!squash{'A}). This makes sense because
      these two operators are almost exectly the same in nature except for oe
      being a meta-level operator and another - an object-level one.
      
      This commit also renames Itt_hide!hide into Itt_squash!squash. This means
      that we now have two operators named "squash", however this should not cause
      any confusion since all part of the system (including the parser and display
      form mechanism) take into account the number of arguments.
      
      Warning: This commit probably broke lots of proofs. I plan to fix that
      after I have a chance to rewrite the squash theory a little better (for
      now I just copied the one from Itt_hide). Hopefully, I should have it
      done within a week.
      

Changes  Path
+1 -2 metaprl/doc/latex/theories/itt/print.ml
+4 -4 metaprl/theories/fol/cfol_itt_base.prla
+4 -5 metaprl/theories/itt/Makefile
+1 -1 metaprl/theories/itt/itt_bunion.prla
+10 -10 metaprl/theories/itt/itt_collection.ml
+1 -1 metaprl/theories/itt/itt_collection.mli
+13 -13 metaprl/theories/itt/itt_collection.prla
+4 -4 metaprl/theories/itt/itt_comment.ml
+1 -1 metaprl/theories/itt/itt_comment.mli
+1 -1 metaprl/theories/itt/itt_disect.ml
+6 -6 metaprl/theories/itt/itt_disect.prla
+1 -26 metaprl/theories/itt/itt_equal.ml
+1 -10 metaprl/theories/itt/itt_equal.mli
+4 -4 metaprl/theories/itt/itt_esquash.prla
Deleted metaprl/theories/itt/itt_hide.ml
Deleted metaprl/theories/itt/itt_hide.mli
+3 -1 metaprl/theories/itt/itt_int_base.ml
+19 -19 metaprl/theories/itt/itt_int_base.prla
+3 -3 metaprl/theories/itt/itt_int_ext.prla
+2 -2 metaprl/theories/itt/itt_isect.ml
+2 -2 metaprl/theories/itt/itt_isect.mli
+9 -9 metaprl/theories/itt/itt_isect.prla
+1 -1 metaprl/theories/itt/itt_list.prla
+1 -1 metaprl/theories/itt/itt_logic.ml
+3 -3 metaprl/theories/itt/itt_logic.prla
+1 -1 metaprl/theories/itt/itt_quotient.ml
+2 -2 metaprl/theories/itt/itt_quotient.mli
+3 -5 metaprl/theories/itt/itt_set.ml
+3 -3 metaprl/theories/itt/itt_set.mli
+174 -36 metaprl/theories/itt/itt_squash.ml
+57 -9 metaprl/theories/itt/itt_squash.mli
+21 -19 metaprl/theories/itt/itt_struct2.ml
+2 -2 metaprl/theories/itt/itt_struct2.mli
+15 -15 metaprl/theories/itt/itt_struct2.prla
+2 -0 metaprl/theories/itt/itt_unit.ml
+1 -1 metaprl/theories/itt/itt_unit.prla
+2 -0 metaprl/theories/itt/itt_void.ml
+1 -0 texinputs/metaprl.tex