aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/algebra/ChangeLog7
-rw-r--r--src/algebra/Makefile.in6
-rw-r--r--src/algebra/Makefile.pamphlet6
-rw-r--r--src/algebra/domain.spad45
4 files changed, 62 insertions, 2 deletions
diff --git a/src/algebra/ChangeLog b/src/algebra/ChangeLog
index 40cf4385..cbb2b4fc 100644
--- a/src/algebra/ChangeLog
+++ b/src/algebra/ChangeLog
@@ -1,5 +1,12 @@
2007-10-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ Fix SF/1790912
+ * domain.spad: New.
+ * Makefile.pamphlet (axiom_algebra_layer_23): Include DOMAIN.o
+ (DOMAIN.NRLIB/code.$(FASLEXT)): New rule.
+
+2007-10-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
Fix SF/1795259
* aggcat.spad.pamphlet (HomogeneousAggregate): Make
CoercibleTo(OutputForm) if argument is of that category.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 2ea676a4..f9dc2f60 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -811,7 +811,7 @@ axiom_algebra_layer_22_objects = \
axiom_algebra_layer_23 = \
CPIMA.o IRURPK.o LAZM3PK.o LEXTRIPK.o \
NORMPK.o QCMPACK.o RURPK.o SFRGCD.o \
- SFQCMPK.o INTRVL.o ODEEF.o
+ SFQCMPK.o INTRVL.o ODEEF.o DOMAIN.o
axiom_algebra_layer_23_nrlibs = \
$(axiom_algebra_layer_23:.$(OBJEXT)=.NRLIB/code.$(OBJEXT))
@@ -900,6 +900,10 @@ $(builddir)/%.tex: $(srcdir)/%.pamphlet
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
$(INSTALL_DATA) $< $@
+DOMAIN.NRLIB/code.$(FASLEXT): domain.spad
+ @ rm -rf $*.NRLIB
+ echo ")co $(srcdir)/domain.spad" | ${INTERPSYS}
+
${INPUT}/TESTFR.input: $(srcdir)/fr.spad.pamphlet
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 5e3d9ad0..b9c956c6 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1235,7 +1235,7 @@ zerodim.spad.pamphlet (LEXTRIPK IRURPK RURPK)
axiom_algebra_layer_23 = \
CPIMA.o IRURPK.o LAZM3PK.o LEXTRIPK.o \
NORMPK.o QCMPACK.o RURPK.o SFRGCD.o \
- SFQCMPK.o INTRVL.o ODEEF.o
+ SFQCMPK.o INTRVL.o ODEEF.o DOMAIN.o
axiom_algebra_layer_23_nrlibs = \
$(axiom_algebra_layer_23:.$(OBJEXT)=.NRLIB/code.$(OBJEXT))
@@ -1853,6 +1853,10 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
<<genericSPADfiles>>
<<genericDOCfiles>>
+DOMAIN.NRLIB/code.$(FASLEXT): domain.spad
+ @ rm -rf $*.NRLIB
+ echo ")co $(srcdir)/domain.spad" | ${INTERPSYS}
+
@
<<diagrams.tex (OUT from IN)>>=
diff --git a/src/algebra/domain.spad b/src/algebra/domain.spad
new file mode 100644
index 00000000..dec41cc2
--- /dev/null
+++ b/src/algebra/domain.spad
@@ -0,0 +1,45 @@
+--Copyright (C) 2007, Gabriel Dos Reis.
+--All rights reserved.
+--
+--Redistribution and use in source and binary forms, with or without
+--modification, are permitted provided that the following conditions are
+--met:
+--
+-- - Redistributions of source code must retain the above copyright
+-- notice, this list of conditions and the following disclaimer.
+--
+-- - Redistributions in binary form must reproduce the above copyright
+-- notice, this list of conditions and the following disclaimer in
+-- the documentation and/or other materials provided with the
+-- distribution.
+--
+-- - Neither the name of The Numerical Algorithms Group Ltd. nor the
+-- names of its contributors may be used to endorse or promote products
+-- derived from this software without specific prior written permission.
+--
+--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+--IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+--TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+--PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+--OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+--EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+--PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+--PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+--LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+--NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+--SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+)abbrev domain DOMAIN Domain
+++ Author: Gabriel Dos Reis
+++ Date Create: October 18, 2007.
+++ Date Last Updated: October 18, 2007.
+++ Basic Operations:
+++ Related Constructors: Type, OutputForm
+++ Also See: Type
+Domain(): Public == Private where
+ Public ==> CoercibleTo(OutputForm)
+ Private ==> add
+ coerce x ==
+ outputDomainConstructor(x)$Lisp
+