From cf32b86f933ac576e4f529ed0959cb6be25459e8 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 4 Feb 2009 23:09:12 +0000
Subject: 	* algebra/gaussian.spad.pamphlet (ComplexCategory): Reinstate 
 attribute 'complex'. 	* algebra/Makefile.pamphlet: Tidy.

---
 src/ChangeLog                      |  2 ++
 src/algebra/Makefile.in            | 20 ++++++++++++++++++++
 src/algebra/Makefile.pamphlet      | 27 ++++++++++++++++++++-------
 src/algebra/gaussian.spad.pamphlet |  1 +
 4 files changed, 43 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index 39750138..ad753d16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* algebra/gaussian.spad.pamphlet (ComplexCategory): Reinstate
+	attribute 'complex'.
 	* algebra/Makefile.pamphlet: Tidy.
 
 2009-02-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 2f6bf3e4..b9543285 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -267,6 +267,26 @@ axiom_algebra_layer_0_nrlibs = \
 axiom_algebra_layer_0_objects = \
 	$(addprefix $(OUT)/, \
            $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_0))) 
+
+$(OUT)/AGG.$(FASLEXT) $(OUT)/AGG-.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+
+$(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
+$(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+
+$(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
+	$(OUT)/SETCAT.$(FASLEXT)
+$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
+	$(OUT)/IEVALAB.$(FASLEXT)
+
+$(OUT)/LOGIC.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT)
+$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+
+$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RETRACT-.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT)
+$(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
+
 axiom_algebra_layer_1 = \
   AGG      AGG-     IEVALAB  IEVALAB- FORTCAT   ITUPLE   \
   PATAB    PPCURVE  PSCURVE  REAL     RESLATC   RETRACT  \
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 3bd3e172..94c3641c 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -238,14 +238,27 @@ axiom_algebra_layer_0_objects = \
 
 \subsubsection{Completed spad files}
 
-\begin{verbatim}
-ituple.spad.pamphlet   (ITFUN2 ITFUN3 ITUPLE)
-mkrecord.spad.pamphlet (MKRECORD)
-pcurve.spad.pamphlet   (PPCURVE PSCURVE)
-coerce.spad.pamphlet   (TYPE KOERCE KONVERT RETRACT)
-\end{verbatim}
-
 <<layer1>>=
+
+$(OUT)/AGG.$(FASLEXT) $(OUT)/AGG-.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+
+$(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
+$(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+
+$(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
+	$(OUT)/SETCAT.$(FASLEXT)
+$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
+	$(OUT)/IEVALAB.$(FASLEXT)
+
+$(OUT)/LOGIC.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT)
+$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+
+$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RETRACT-.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT)
+$(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
+
 axiom_algebra_layer_1 = \
   AGG      AGG-     IEVALAB  IEVALAB- FORTCAT   ITUPLE   \
   PATAB    PPCURVE  PSCURVE  REAL     RESLATC   RETRACT  \
diff --git a/src/algebra/gaussian.spad.pamphlet b/src/algebra/gaussian.spad.pamphlet
index fba0d687..a22dc1a0 100644
--- a/src/algebra/gaussian.spad.pamphlet
+++ b/src/algebra/gaussian.spad.pamphlet
@@ -28,6 +28,7 @@ ComplexCategory(R:CommutativeRing): Category ==
   Join(MonogenicAlgebra(R, SparseUnivariatePolynomial R), FullyRetractableTo R,
    DifferentialExtension R, FullyEvalableOver R, FullyPatternMatchable(R),
     Patternable(R), FullyLinearlyExplicitRingOver R, CommutativeRing) with
+     complex                       ++ indicates that % has sqrt(-1)
      imaginary:   () -> %          ++ imaginary() = sqrt(-1) = %i.
      conjugate:   % -> %           ++ conjugate(x + %i y) returns x - %i y.
      complex  :   (R, R) -> %      ++ complex(x,y) constructs x + %i*y.
-- 
cgit v1.2.3