From 85b24b09dc2103e0d44b043c85f29bb26272a9ef Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 12 Sep 2007 22:34:35 +0000 Subject: * dq.boot: New. * dq.boot.pamphlet: Move content to dq.boot.pamphlet. Remove. * Makefile.pamphlet (dq.$(FASLEXT)): New rule. --- src/interp/ChangeLog | 3 ++ src/interp/Makefile.in | 4 ++ src/interp/Makefile.pamphlet | 4 ++ src/interp/dq.boot | 82 +++++++++++++++++++++++++++++++++++ src/interp/dq.boot.pamphlet | 100 ------------------------------------------- 5 files changed, 93 insertions(+), 100 deletions(-) create mode 100644 src/interp/dq.boot delete mode 100644 src/interp/dq.boot.pamphlet diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 15318499..2246e539 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,6 +1,9 @@ 2007-09-12 Gabriel Dos Reis + * dq.boot: New. + * dq.boot.pamphlet: Move content to dq.boot.pamphlet. Remove. * vmlisp.lisp.pamphlet (BPINAME): Define for SBCL. + * Makefile.pamphlet (dq.$(FASLEXT)): New rule. 2007-09-12 Gabriel Dos Reis diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 3f0fed26..0664b77a 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -477,6 +477,10 @@ database.date: $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) $(INSTALL) $< $@ + +dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + as.clisp: as.boot @ echo 417 making $@ from $< @ echo '(progn (old-boot::boot "as.boot"))' | ${DEPSYS} diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index ad4d277d..a698508a 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1972,6 +1972,10 @@ distclean-local: clean-local $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) $(INSTALL) $< $@ + +dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + <> <> diff --git a/src/interp/dq.boot b/src/interp/dq.boot new file mode 100644 index 00000000..894e21cd --- /dev/null +++ b/src/interp/dq.boot @@ -0,0 +1,82 @@ +-- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. +-- All rights reserved. +-- 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. + + +import '"boot-pkg" + +)package "BOOT" + +-- Dequeue functions + +-- dqUnit makes a unit dq i.e. a dq with one item, from the item + +-- dqUnitCopy copies a unit dq + +-- dqAppend appends 2 dq's, destroying the first + +-- dqConcat concatenates a list of dq's, destroying all but the last + +-- dqToList transforms a dq to a list + +dqUnit s==(a:=[s];CONS(a,a)) + +dqUnitCopy s== dqUnit(CAAR s) + +dqAppend(x,y)== + if null x + then y + else if null y + then x + else + RPLACD (CDR x,CAR y) + RPLACD (x, CDR y) + x + +dqConcat ld== + if null ld + then nil + else if null rest ld + then first ld + else dqAppend(first ld,dqConcat rest ld) + +dqToList s==if null s then nil else CAR s + +dqAddAppend(x,y)== + if null x + then nil + else if null y + then nil + else + RPLACD (CDR x,CAR y) + RPLACD (x, CDR y) + x diff --git a/src/interp/dq.boot.pamphlet b/src/interp/dq.boot.pamphlet deleted file mode 100644 index 1346ecc9..00000000 --- a/src/interp/dq.boot.pamphlet +++ /dev/null @@ -1,100 +0,0 @@ -\documentclass{article} -\usepackage{axiom} -\begin{document} -\title{\$SPAD/src/interp dq.boot} -\author{The Axiom Team} -\maketitle -\begin{abstract} -\end{abstract} -\eject -\tableofcontents -\eject -\section{License} -<>= --- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --- 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. - -@ -<<*>>= -<> - -)package "BOOT" - --- Dequeue functions - --- dqUnit makes a unit dq i.e. a dq with one item, from the item - --- dqUnitCopy copies a unit dq - --- dqAppend appends 2 dq's, destroying the first - --- dqConcat concatenates a list of dq's, destroying all but the last - --- dqToList transforms a dq to a list - -dqUnit s==(a:=[s];CONS(a,a)) - -dqUnitCopy s== dqUnit(CAAR s) - -dqAppend(x,y)== - if null x - then y - else if null y - then x - else - RPLACD (CDR x,CAR y) - RPLACD (x, CDR y) - x - -dqConcat ld== - if null ld - then nil - else if null rest ld - then first ld - else dqAppend(first ld,dqConcat rest ld) - -dqToList s==if null s then nil else CAR s - -dqAddAppend(x,y)== - if null x - then nil - else if null y - then nil - else - RPLACD (CDR x,CAR y) - RPLACD (x, CDR y) - x -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} -- cgit v1.2.3