From 9e5b282a3d8f23079f486e9bf9f19ea3278b2b25 Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Sat, 26 Nov 2005 21:48:18 +0000 Subject: [PATCH] - use trivial-gray-streams - replaced dep-* files, since most of them were identical --- dep-acl5.lisp => definline.lisp | 40 ++++++++++++---------- dep-acl.lisp | 42 ----------------------- dep-clisp.lisp | 59 --------------------------------- dep-cmucl-dtc.lisp | 30 ----------------- dep-cmucl.lisp | 30 ----------------- dep-lw.lisp | 30 ----------------- dep-openmcl.lisp | 16 --------- dep-sbcl.lisp | 30 ----------------- 8 files changed, 22 insertions(+), 255 deletions(-) rename dep-acl5.lisp => definline.lisp (71%) delete mode 100644 dep-acl.lisp delete mode 100644 dep-clisp.lisp delete mode 100644 dep-cmucl-dtc.lisp delete mode 100644 dep-cmucl.lisp delete mode 100644 dep-lw.lisp delete mode 100644 dep-openmcl.lisp delete mode 100644 dep-sbcl.lisp diff --git a/dep-acl5.lisp b/definline.lisp similarity index 71% rename from dep-acl5.lisp rename to definline.lisp index a597064..34d2644 100644 --- a/dep-acl5.lisp +++ b/definline.lisp @@ -1,11 +1,11 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; Encoding: utf-8; -*- +;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- ;;; --------------------------------------------------------------------------- -;;; Title: ACL-5.0 dependent stuff + fixups +;;; Title: definline ;;; Created: 1999-05-25 22:32 ;;; Author: Gilbert Baumann ;;; License: LLGPL (See file COPYING for details). ;;; --------------------------------------------------------------------------- -;;; (c) copyright 1998,1999 by Gilbert Baumann +;;; (c) copyright 1999 by Gilbert Baumann ;;; This code is free software; you can redistribute it and/or modify it ;;; under the terms of the version 2.1 of the GNU Lesser General Public @@ -24,29 +24,33 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;;; Changes -;;; ======= +(in-package :runes) -;;; When Who What -;;; --------------------------------------------------------------------------- -;;; 2002-01-04 GB spend BLOCK for DEFSUBST -;;; 1999-08-31 SES Stig Erik Sandø -;;; -;;; Changed #+allegro-v5.0 to -;;; #+(and allegro-version>= (version>= 5)) -;;; - -;; ACL is incapable to define compiler macros on (setf foo) -;; Unfortunately it is also incapable to declaim such functions inline. -;; So we revoke the DEFUN hack from dep-gcl here. +#-(or allegro openmcl) +(defmacro definline (name args &body body) + `(progn + (declaim (inline ,name)) + (defun ,name ,args .,body))) +#+openmcl (defmacro runes::definline (fun args &body body) + (if (consp fun) + `(defun ,fun ,args + ,@body) + `(progn + (defun ,fun ,args .,body) + (define-compiler-macro ,fun (&rest .args.) + (cons '(lambda ,args .,body) + .args.))))) + +#+allegro +(defmacro definline (fun args &body body) (if (and (consp fun) (eq (car fun) 'setf)) (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") (symbol-package (cadr fun))))) `(progn (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::definline ,fnam ,args .,body))) + (definline ,fnam ,args .,body))) (labels ((declp (x) (and (consp x) (eq (car x) 'declare)))) `(progn diff --git a/dep-acl.lisp b/dep-acl.lisp deleted file mode 100644 index efd67b0..0000000 --- a/dep-acl.lisp +++ /dev/null @@ -1,42 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: RUNES; -*- -;;; --------------------------------------------------------------------------- -;;; Title: ACL-4.3 dependent stuff + fixups -;;; Created: 1999-05-25 22:33 -;;; Author: Gilbert Baumann -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1998,1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -;; ACL is incapable to define compiler macros on (setf foo) -;; Unfortunately it is also incapable to declaim such functions inline. -;; So we revoke the DEFUN hack from dep-gcl here. - -(defmacro runes::definline (fun args &body body) - (if (and (consp fun) (eq (car fun) 'setf)) - (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") - (symbol-package (cadr fun))))) - `(progn - (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::definline ,fnam ,args .,body))) - `(progn - (defun ,fun ,args .,body) - (define-compiler-macro ,fun (&rest .args.) - (cons '(lambda ,args .,body) - .args.))))) diff --git a/dep-clisp.lisp b/dep-clisp.lisp deleted file mode 100644 index e8fa296..0000000 --- a/dep-clisp.lisp +++ /dev/null @@ -1,59 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- -;;; --------------------------------------------------------------------------- -;;; Title: CLISP dependent stuff + fixups -;;; Created: 1999-05-25 22:32 -;;; Author: Gilbert Baumann -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(in-package :CL-USER) - -(eval-when (compile load eval) - (if (fboundp 'cl::define-compiler-macro) - (pushnew 'define-compiler-macro *features*))) - -;;;(setq lisp:*load-paths* '(#P"./")) -;;; -;;;#+DEFINE-COMPILER-MACRO -;;;(cl:define-compiler-macro ldb (bytespec value &whole whole) -;;; (let (pos size) -;;; (cond ((and (consp bytespec) -;;; (= (length bytespec) 3) -;;; (eq (car bytespec) 'byte) -;;; (constantp (setq size (second bytespec))) -;;; (constantp (setq pos (third bytespec)))) -;;; `(logand ,(if (eql pos 0) value `(ash ,value (- ,pos))) -;;; (1- (ash 1 ,size)))) -;;; (t -;;; whole)))) -;;; -;;;#-DEFINE-COMPILER-MACRO -;;;(progn -;;; (export 'runes::define-compiler-macro :runes) -;;; (defmacro runes::define-compiler-macro (name args &body body) -;;; (declare (ignore args body)) -;;; `(progn -;;; ',name))) - -(defmacro runes::definline (name args &body body) - `(progn - (declaim (inline ,name)) - (defun ,name ,args .,body))) diff --git a/dep-cmucl-dtc.lisp b/dep-cmucl-dtc.lisp deleted file mode 100644 index 2f6cb29..0000000 --- a/dep-cmucl-dtc.lisp +++ /dev/null @@ -1,30 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- -;;; --------------------------------------------------------------------------- -;;; Title: CMUCL dependent stuff + fixups -;;; Created: 1999-05-25 22:32 -;;; Author: Gilbert Baumann -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defmacro runes::definline (name args &body body) - `(progn - (declaim (inline ,name)) - (defun ,name ,args .,body))) diff --git a/dep-cmucl.lisp b/dep-cmucl.lisp deleted file mode 100644 index 2f6cb29..0000000 --- a/dep-cmucl.lisp +++ /dev/null @@ -1,30 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- -;;; --------------------------------------------------------------------------- -;;; Title: CMUCL dependent stuff + fixups -;;; Created: 1999-05-25 22:32 -;;; Author: Gilbert Baumann -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defmacro runes::definline (name args &body body) - `(progn - (declaim (inline ,name)) - (defun ,name ,args .,body))) diff --git a/dep-lw.lisp b/dep-lw.lisp deleted file mode 100644 index b6bfbbd..0000000 --- a/dep-lw.lisp +++ /dev/null @@ -1,30 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- -;;; --------------------------------------------------------------------------- -;;; Title: LispWorks dependent stuff + fixups -;;; Created: 2005-01-28 09:43 -;;; Author: Edi Weitz (Copied from dep-cmucl.lisp) -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defmacro runes::definline (name args &body body) - `(progn - (declaim (inline ,name)) - (defun ,name ,args .,body))) diff --git a/dep-openmcl.lisp b/dep-openmcl.lisp deleted file mode 100644 index f5bb8a9..0000000 --- a/dep-openmcl.lisp +++ /dev/null @@ -1,16 +0,0 @@ -;;;; dep-openmcl.lisp -;;;; -;;;; This file is part of the CXML parser, released under (L)LGPL. -;;;; See file COPYING for details. -;;;; -;;;; (c) copyright 1999 by Gilbert Baumann - -(defmacro runes::definline (fun args &body body) - (if (consp fun) - `(defun ,fun ,args - ,@body) - `(progn - (defun ,fun ,args .,body) - (define-compiler-macro ,fun (&rest .args.) - (cons '(lambda ,args .,body) - .args.))))) diff --git a/dep-sbcl.lisp b/dep-sbcl.lisp deleted file mode 100644 index c111a17..0000000 --- a/dep-sbcl.lisp +++ /dev/null @@ -1,30 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; -*- -;;; --------------------------------------------------------------------------- -;;; Title: SBCL dependent stuff + fixups -;;; Created: 1999-05-25 22:32 -;;; Author: Gilbert Baumann -;;; License: LLGPL (See file COPYING for details). -;;; --------------------------------------------------------------------------- -;;; (c) copyright 1999 by Gilbert Baumann - -;;; This code is free software; you can redistribute it and/or modify it -;;; under the terms of the version 2.1 of the GNU Lesser General Public -;;; License as published by the Free Software Foundation, as clarified -;;; by the "Preamble to the Gnu Lesser General Public License" found in -;;; the file COPYING. -;;; -;;; This code is distributed in the hope that it will be useful, -;;; but without any warranty; without even the implied warranty of -;;; merchantability or fitness for a particular purpose. See the GNU -;;; Lesser General Public License for more details. -;;; -;;; Version 2.1 of the GNU Lesser General Public License is in the file -;;; COPYING that was distributed with this file. If it is not present, -;;; you can access it from http://www.gnu.org/copyleft/lesser.txt (until -;;; superseded by a newer version) or write to the Free Software -;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defmacro runes::definline (name args &body body) - `(progn - (declaim (inline ,name)) - (defun ,name ,args .,body)))