From 0140f390dc26d640b2289c212da82e5b3f51106f Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 14 Oct 2002 04:09:02 +0000 Subject: [PATCH] r3002: sbcl additions --- base/cmucl-compat.lisp | 22 ++++++++++++++----- clsql-base.asd | 6 ++--- clsql-mysql.asd | 4 ++-- clsql-oracle.asd | 4 ++-- clsql-postgresql-socket.asd | 4 ++-- clsql-postgresql.asd | 4 ++-- clsql-uffi.asd | 4 ++-- clsql.asd | 6 ++--- db-mysql/mysql-package.lisp | 4 ++-- db-mysql/mysql-sql.lisp | 4 ++-- .../postgresql-socket-package.lisp | 4 ++-- debian/changelog | 6 +++++ uffi/clsql-uffi-package.lisp | 3 ++- 13 files changed, 47 insertions(+), 28 deletions(-) diff --git a/base/cmucl-compat.lisp b/base/cmucl-compat.lisp index a479bc1..3da7694 100644 --- a/base/cmucl-compat.lisp +++ b/base/cmucl-compat.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: cmucl-compat.lisp,v 1.1 2002/09/30 10:19:01 kevin Exp $ +;;;; $Id: cmucl-compat.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,6 +20,7 @@ (in-package :cl-user) (defpackage :cmucl-compat + (:use #:common-lisp) (:export #:shrink-vector #:make-sequence-of-type @@ -40,7 +41,11 @@ (defmacro shrink-vector (vec len) `(lisp::shrink-vector ,vec ,len)) -#-cmu +#+sbcl +(defmacro shrink-vector (vec len) + `(sb-kernel::shrink-vector ,vec ,len)) + +#-(or cmu sbcl) (defmacro shrink-vector (vec len) "Shrinks a vector. Optimized if vector has a fill pointer. Needs to be a macro to overwrite value of VEC." @@ -64,7 +69,7 @@ Needs to be a macro to overwrite value of VEC." -#-cmu +#-(or cmu sbcl) (defun make-sequence-of-type (type length) "Returns a sequence of the given TYPE and LENGTH." (declare (fixnum length)) @@ -91,9 +96,12 @@ Needs to be a macro to overwrite value of VEC." (lisp::make-sequence-of-type type len)) (defun make-sequence-of-type (type len) (system::make-sequence-of-type type len))) - -#-cmu +#+sbcl +(defun make-sequence-of-type (type len) + (sb-impl::make-sequence-of-type type len)) + +#-(or cmu sbcl) (defun result-type-or-lose (type nil-ok) (unless (or type nil-ok) (error "NIL output type invalid for this sequence function")) @@ -113,3 +121,7 @@ Needs to be a macro to overwrite value of VEC." #+cmu (defun result-type-or-lose (type nil-ok) (lisp::result-type-or-lose type nil-ok)) + +#+sbcl +(defun result-type-or-lose (type nil-ok) + (sb-impl::result-type-or-lose type nil-ok)) diff --git a/clsql-base.asd b/clsql-base.asd index dcb0e28..8d1bf0d 100644 --- a/clsql-base.asd +++ b/clsql-base.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql-base.asd,v 1.15 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-base.asd,v 1.16 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -18,7 +18,7 @@ (in-package :asdf) -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-base :name "cl-sql-base" :author "Kevin M. Rosenberg " @@ -41,7 +41,7 @@ (:file "db-interface" :depends-on ("conditions")) (:file "initialize" :depends-on ("db-interface")))))) -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (when (ignore-errors (find-class 'load-compiled-op)) (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql-base)))) (pushnew :clsql-base cl:*features*))) diff --git a/clsql-mysql.asd b/clsql-mysql.asd index 8b440c1..f74d39c 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-mysql.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-mysql.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,7 +20,7 @@ ;;; System definition -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-mysql :name "cl-sql-mysql" :author "Kevin M. Rosenberg " diff --git a/clsql-oracle.asd b/clsql-oracle.asd index 56707a0..8800008 100644 --- a/clsql-oracle.asd +++ b/clsql-oracle.asd @@ -1,13 +1,13 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; This is copyrighted software. See interfaces/oracle/* files for terms. ;;;; -;;;; $Id: clsql-oracle.asd,v 1.10 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-oracle.asd,v 1.11 2002/10/14 04:09:02 kevin Exp $ (in-package :asdf) ;;; System definition -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-oracle :name "cl-sql-oracle" :author "Kevin M. Rosenberg " diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd index 4504817..819d64d 100644 --- a/clsql-postgresql-socket.asd +++ b/clsql-postgresql-socket.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-postgresql-socket.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-postgresql-socket.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,7 +20,7 @@ ;;; System definition -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-postgresql-socket :name "cl-sql-postgresql-socket" :author "Kevin M. Rosenberg " diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd index f377ddd..b17607b 100644 --- a/clsql-postgresql.asd +++ b/clsql-postgresql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-postgresql.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-postgresql.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -19,7 +19,7 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :asdf) -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-postgresql :name "cl-sql-postgresql" :author "Kevin M. Rosenberg " diff --git a/clsql-uffi.asd b/clsql-uffi.asd index e5e726d..2d22cc2 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-uffi.asd,v 1.12 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-uffi.asd,v 1.13 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -22,7 +22,7 @@ ;;; System definition -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql-uffi :name "cl-sql-base" :author "Kevin M. Rosenberg " diff --git a/clsql.asd b/clsql.asd index f4a609d..67e9b7f 100644 --- a/clsql.asd +++ b/clsql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql.asd,v 1.13 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql.asd,v 1.14 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -18,7 +18,7 @@ (in-package :asdf) -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (defsystem :clsql :name "cl-sql" :author "Kevin M. Rosenberg " @@ -43,7 +43,7 @@ :depends-on (:clsql-base) ) -#+(or allegro lispworks cmu openmcl mcl) +#+(or allegro lispworks cmu sbcl openmcl mcl) (when (ignore-errors (find-class 'load-compiled-op)) (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql)))) (pushnew :clsql cl:*features*))) diff --git a/db-mysql/mysql-package.lisp b/db-mysql/mysql-package.lisp index 95499be..12d6bef 100644 --- a/db-mysql/mysql-package.lisp +++ b/db-mysql/mysql-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-package.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: mysql-package.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,7 +20,7 @@ (in-package :cl-user) (defpackage :mysql - (:use :common-lisp :clsql-uffi) + (:use #:common-lisp #:clsql-uffi) (:export #:database-library-loaded diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 472d810..4011692 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-sql.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: mysql-sql.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -33,7 +33,7 @@ ;;;; Added field types (defpackage :clsql-mysql - (:use :common-lisp :clsql-base-sys :mysql :clsql-uffi) + (:use #:common-lisp #:clsql-base-sys #:mysql #:clsql-uffi) (:export #:mysql-database) (:documentation "This is the CLSQL interface to MySQL.")) diff --git a/db-postgresql-socket/postgresql-socket-package.lisp b/db-postgresql-socket/postgresql-socket-package.lisp index 04b08a9..7898830 100644 --- a/db-postgresql-socket/postgresql-socket-package.lisp +++ b/db-postgresql-socket/postgresql-socket-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-package.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: postgresql-socket-package.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -22,7 +22,7 @@ #+lispworks (require "comm") (defpackage :postgresql-socket - (:use :common-lisp) + (:use #:common-lisp) (:export #:pgsql-ftype #:pgsql-ftype#bytea #:pgsql-ftype#int2 diff --git a/debian/changelog b/debian/changelog index feee5b8..c5e2b59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (1.0.0-1) unstable; urgency=low + + * Add SBCL support + + -- Kevin M. Rosenberg Sun, 13 Oct 2002 20:52:41 -0600 + cl-sql (0.9.9-1) unstable; urgency=high * Add version depends for common-lisp-controller diff --git a/uffi/clsql-uffi-package.lisp b/uffi/clsql-uffi-package.lisp index 9e39e03..c2eb33d 100644 --- a/uffi/clsql-uffi-package.lisp +++ b/uffi/clsql-uffi-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: clsql-uffi-package.lisp,v 1.1 2002/09/30 10:19:24 kevin Exp $ +;;;; $Id: clsql-uffi-package.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,6 +20,7 @@ (in-package :cl-user) (defpackage :clsql-uffi + (:use #:common-lisp) (:export #:canonicalize-type-list #:convert-raw-field -- 2.34.1