diff options
author | dos-reis <gdr@axiomatics.org> | 2007-09-12 22:50:38 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2007-09-12 22:50:38 +0000 |
commit | 993fb4527de00eac33c829de67924cbe3056c3c5 (patch) | |
tree | 3fc3f83f038cc9b7a022ff0569f46039c285e06f /src/interp | |
parent | 00ce53963a1de13d5cd653176561cd63e63f8876 (diff) | |
download | open-axiom-993fb4527de00eac33c829de67924cbe3056c3c5.tar.gz |
* bits.lisp: New. Import boot-pkg.
* bits.lisp.pamphlet: Move content to bits.lisp. Remove.
* Makefile.pamphlet (bits.$(FASLEXT)): New rule.
Diffstat (limited to 'src/interp')
-rw-r--r-- | src/interp/ChangeLog | 6 | ||||
-rw-r--r-- | src/interp/Makefile.in | 3 | ||||
-rw-r--r-- | src/interp/Makefile.pamphlet | 3 | ||||
-rw-r--r-- | src/interp/bits.lisp (renamed from src/interp/bits.lisp.pamphlet) | 35 |
4 files changed, 16 insertions, 31 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 6a564d6d..d5e66e73 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,5 +1,11 @@ 2007-09-12 Gabriel Dos Reis <gdr@cs.tamu.edu> + * bits.lisp: New. Import boot-pkg. + * bits.lisp.pamphlet: Move content to bits.lisp. Remove. + * Makefile.pamphlet (bits.$(FASLEXT)): New rule. + +2007-09-12 Gabriel Dos Reis <gdr@cs.tamu.edu> + * Makefile.pamphlet (cstream.$(FASLEXT)): New rule. * cstream.boot.pamphlet: Import sys-macros. * sys-macros.lisp (|shoeConsole|): Move from macros.lisp.pamphlet. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index d8f00284..445c20e5 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -480,6 +480,9 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index fe3e5fc6..61d396de 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1975,6 +1975,9 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/bits.lisp.pamphlet b/src/interp/bits.lisp index 1b38eadf..d6f26708 100644 --- a/src/interp/bits.lisp.pamphlet +++ b/src/interp/bits.lisp @@ -1,22 +1,3 @@ -%% Oh Emacs, this is a -*- Lisp -*- file despite apperance. -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/interp/bits.lisp} Pamphlet} -\author{Timothy Daly} - -\begin{document} - -\maketitle -\begin{abstract} -\end{abstract} - -\tableofcontents -\eject - -\section{License} - -<<license>>= ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. ;; All rights reserved. ;; @@ -48,9 +29,6 @@ ;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -@ -<<*>>= -<<license>> ;;; The types "bit" and "bit vector" are implemented differently ;;; in different variants of lisp. @@ -62,6 +40,7 @@ ;;; The operations which extract or set a single part of the vector are ;;; provided as macros. +(IMPORT-MODULE "boot-pkg") (in-package "BOOT") ;;; SMW Nov 88: Created @@ -82,18 +61,12 @@ (defun bvec-greater (bv1 bv2) (let ((pos (mismatch bv1 bv2))) (cond ((or (null pos) (>= pos (length bv1))) nil) - ((< pos (length bv2)) (> (bit bv1 pos) (bit bv2 pos))) - ((find 1 bv1 :start pos) t) - (t nil)))) + ((< pos (length bv2)) (> (bit bv1 pos) (bit bv2 pos))) + ((find 1 bv1 :start pos) t) + (t nil)))) (defun bvec-and (bv1 bv2) (bit-and bv1 bv2)) (defun bvec-or (bv1 bv2) (bit-ior bv1 bv2)) (defun bvec-xor (bv1 bv2) (bit-xor bv1 bv2)) (defun bvec-nand (bv1 bv2) (bit-nand bv1 bv2)) (defun bvec-nor (bv1 bv2) (bit-nor bv1 bv2)) (defun bvec-not (bv) (bit-not bv)) -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} |