diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 41 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 46 | ||||
| -rw-r--r-- | src/algebra/strap/SETCAT-.lsp | 44 | ||||
| -rw-r--r-- | src/algebra/strap/SETCAT.lsp | 27 |
5 files changed, 87 insertions, 78 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0001fc28..14e44425 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-01-31 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/Makefile.pamphlet: Tidy layer 0 dependency. + SETCAT and SETCAT- are no longer required for bootstrap. + * algebra/SETCAT.lsp: Remove. + * algebra/SETCAT-.lsp: Likewise. + 2009-01-30 Waldek Hebisch <hebisch@math.uni.wroc.pl> Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 206fe452..3921b396 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -341,7 +341,7 @@ axiom_algebra_bootstrap = \ PSETCAT- QFCAT QFCAT- RCAGG \ RCAGG- REF RING RING- \ RNG RNS RNS- SETAGG \ - SETAGG- SETCAT SETCAT- SINT \ + SETAGG- SINT \ STAGG STAGG- SYMBOL TSETCAT \ TSETCAT- UFD UFD- ULSCAT \ UPOLYC UPOLYC- URAGG URAGG- \ @@ -354,6 +354,42 @@ axiom_algebra_bootstrap_objects = \ $(addprefix $(OUT)/, \ $(addsuffix .$(FASLEXT), $(axiom_algebra_bootstrap))) +$(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/PRIMCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/KONVERT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) + +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/ORDSET.$(FASLEXT) $(OUT)/ORDSET-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM \ @@ -443,6 +479,9 @@ axiom_algebra_layer_5_nrlibs = \ axiom_algebra_layer_5_objects = \ $(addprefix $(OUT)/, \ $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_5))) + +$(OUT)/CHARPOL.$(FASLEXT): $(OUT)/SETCAT-.$(FASLEXT) + axiom_algebra_layer_6 = \ ALGEBRA ALGEBRA- AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ DIFEXT DIFEXT- ES1 ES2 GRMOD GRMOD- \ diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 43631245..207cee78 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -66,11 +66,6 @@ compile the spad code we must load the compiled definition of [[RING]]. In this case we must compile the cached lisp code before we try to compile the spad file. -The cycle for [[SETCAT]] is longer consisting of: [[SETCAT]] needs -{\bf SINT} needs {\bf UFD} needs {\bf GCDDOM} needs {\bf COMRING} needs -{\bf RING} needs {\bf RNG} needs {\bf ABELGRP} needs {\bf CABMON} needs -{\bf ABELMON} needs {\bf ABELSG} needs {\bf SETCAT}. - It is highly recommended that you try to become a developer of Axiom and read the archived mailing lists before you decide to change a cached file. In the fullness of time we will rewrite the whole algebra @@ -154,7 +149,7 @@ axiom_algebra_bootstrap = \ PSETCAT- QFCAT QFCAT- RCAGG \ RCAGG- REF RING RING- \ RNG RNS RNS- SETAGG \ - SETAGG- SETCAT SETCAT- SINT \ + SETAGG- SINT \ STAGG STAGG- SYMBOL TSETCAT \ TSETCAT- UFD UFD- ULSCAT \ UPOLYC UPOLYC- URAGG URAGG- \ @@ -183,6 +178,42 @@ system.spad.pamphlet (MSYSCMD) <<layer0>>= +$(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/PRIMCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/KONVERT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + +$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) + +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/ORDSET.$(FASLEXT) $(OUT)/ORDSET-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) + +$(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM \ @@ -336,6 +367,9 @@ sortpak.spad.pamphlet (SORTPAK) \end{verbatim} <<layer6>>= + +$(OUT)/CHARPOL.$(FASLEXT): $(OUT)/SETCAT-.$(FASLEXT) + axiom_algebra_layer_6 = \ ALGEBRA ALGEBRA- AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ DIFEXT DIFEXT- ES1 ES2 GRMOD GRMOD- \ diff --git a/src/algebra/strap/SETCAT-.lsp b/src/algebra/strap/SETCAT-.lsp deleted file mode 100644 index 72ddd996..00000000 --- a/src/algebra/strap/SETCAT-.lsp +++ /dev/null @@ -1,44 +0,0 @@ - -(/VERSIONCHECK 2) - -(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Short|) - |SETCAT-;hash;SSi;1|)) - -(PUT '|SETCAT-;hash;SSi;1| '|SPADreplace| 'SXHASH) - -(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%String|) - |SETCAT-;latex;SS;2|)) - -(PUT '|SETCAT-;latex;SS;2| '|SPADreplace| - '(XLAM (|s|) "\\mbox{\\bf Unimplemented}")) - -(DEFUN |SETCAT-;hash;SSi;1| (|s| $) (DECLARE (IGNORE $)) (SXHASH |s|)) - -(DEFUN |SETCAT-;latex;SS;2| (|s| $) - (DECLARE (IGNORE $)) - "\\mbox{\\bf Unimplemented}") - -(DEFUN |SetCategory&| (|#1|) - (PROG (|dv$1| |dv$| $ |pv$|) - (RETURN - (PROGN - (LETT |dv$1| (|devaluate| |#1|) . #0=(|SetCategory&|)) - (LETT |dv$| (LIST '|SetCategory&| |dv$1|) . #0#) - (LETT $ (|newShell| 11) . #0#) - (|setShellEntry| $ 0 |dv$|) - (|setShellEntry| $ 3 - (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) - (|stuffDomainSlots| $) - (|setShellEntry| $ 6 |#1|) - $)))) - -(MAKEPROP '|SetCategory&| '|infovec| - (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|SingleInteger|) - |SETCAT-;hash;SSi;1| (|String|) |SETCAT-;latex;SS;2|) - '#(|latex| 0 |hash| 5) 'NIL - (CONS (|makeByteWordVec2| 1 'NIL) - (CONS '#() - (CONS '#() - (|makeByteWordVec2| 10 - '(1 0 9 0 10 1 0 7 0 8))))) - '|lookupComplete|)) diff --git a/src/algebra/strap/SETCAT.lsp b/src/algebra/strap/SETCAT.lsp deleted file mode 100644 index 9b1da323..00000000 --- a/src/algebra/strap/SETCAT.lsp +++ /dev/null @@ -1,27 +0,0 @@ - -(/VERSIONCHECK 2) - -(DEFPARAMETER |SetCategory;AL| 'NIL) - -(DEFUN |SetCategory;| () - (PROG (#0=#:G1399) - (RETURN - (PROG1 (LETT #0# - (|sublisV| - (PAIR '(#1=#:G1398) (LIST '(|OutputForm|))) - (|Join| (|BasicType|) (|CoercibleTo| '#1#) - (|mkCategory| '|domain| - '(((|hash| ((|SingleInteger|) $)) T) - ((|latex| ((|String|) $)) T)) - NIL '((|String|) (|SingleInteger|)) - NIL))) - |SetCategory|) - (|setShellEntry| #0# 0 '(|SetCategory|)))))) - -(DEFUN |SetCategory| () - (LET () - (COND - (|SetCategory;AL|) - (T (SETQ |SetCategory;AL| (|SetCategory;|)))))) - -(MAKEPROP '|SetCategory| 'NILADIC T) |