r3002: sbcl additions

diff --git a/base/cmucl-compat.lisp b/base/cmucl-compat.lisp
index a479bc1e687181d3a61ce0fa718c55425c4efbba..3da769492d82e0cf8583f66d24b4d5c05bac03d6 100644 (file)
--- a/base/cmucl-compat.lisp
+++ b/base/cmucl-compat.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -20,6 +20,7 @@
 (in-package :cl-user)
 
 (defpackage :cmucl-compat
 (in-package :cl-user)
 
 (defpackage :cmucl-compat

+  (:use #:common-lisp)

   (:export
    #:shrink-vector
    #:make-sequence-of-type
   (:export
    #:shrink-vector
    #:make-sequence-of-type


@@ -40,7 +41,11 @@
 (defmacro shrink-vector (vec len)
   `(lisp::shrink-vector ,vec ,len))
 
 (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."
 (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))
 (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)))
       (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"))
 (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))
 #+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 dcb0e28f60c2ad90eae86c9d57bbbecf386e082e..8d1bf0d5b802a4398347557b60cd94a0faaa8a04 100644 (file)
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -18,7 +18,7 @@
 
 (in-package :asdf)
 
 
 (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 <kmr@debian.org>"
 (defsystem :clsql-base
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -41,7 +41,7 @@
             (:file "db-interface" :depends-on ("conditions"))
             (:file "initialize" :depends-on ("db-interface"))))))
 
             (: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*)))
 (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 8b440c16f65ada4078dae70f36b5f91749c75c03..f74d39cbac4cf1ccc8b8547c99152af1b213d7c1 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-mysql.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $\r
+;;;; $Id: clsql-mysql.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -20,7 +20,7 @@
 \r
 ;;; System definition\r
 \r
 \r
 ;;; System definition\r
 \r

-#+(or allegro lispworks cmu openmcl mcl)\r
+#+(or allegro lispworks cmu sbcl openmcl mcl)\r

 (defsystem :clsql-mysql\r
   :name "cl-sql-mysql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-mysql\r
   :name "cl-sql-mysql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 56707a04432df208eff9ba19ca18432e24a50b22..8800008379d6964d1a9bf22dcfa35bb184b33646 100644 (file)
--- 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.
 ;;;; 
 ;;;; -*- 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
 
 
 (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 <kmr@debian.org>"
 (defsystem :clsql-oracle
   :name "cl-sql-oracle"
   :author "Kevin M. Rosenberg <kmr@debian.org>"

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 4504817b363236a85076303f08182922de69c87d..819d64d9c423675e587b7459da65c8757a24054d 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-postgresql-socket.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -20,7 +20,7 @@
 \r
 ;;; System definition\r
 \r
 \r
 ;;; System definition\r
 \r

-#+(or allegro lispworks cmu openmcl mcl)\r
+#+(or allegro lispworks cmu sbcl openmcl mcl)\r

 (defsystem :clsql-postgresql-socket\r
   :name "cl-sql-postgresql-socket"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-postgresql-socket\r
   :name "cl-sql-postgresql-socket"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index f377dddecb16579261093d5bb6db748ee97bfb9c..b17607b8dcb433b28af4a71ef19534641fc4bf36 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-postgresql.asd,v 1.11 2002/09/30 10:19:23 kevin Exp $\r
+;;;; $Id: clsql-postgresql.asd,v 1.12 2002/10/14 04:09:02 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -19,7 +19,7 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 (in-package :asdf)\r
 \r
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 (in-package :asdf)\r
 \r

-#+(or allegro lispworks cmu openmcl mcl)\r
+#+(or allegro lispworks cmu sbcl openmcl mcl)\r

 (defsystem :clsql-postgresql\r
   :name "cl-sql-postgresql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-postgresql\r
   :name "cl-sql-postgresql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index e5e726dd5343216b22df9b038ca04fbb535de81f..2d22cc2e3c15da05e46f4234a5597ea2deb8f77b 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -22,7 +22,7 @@
 
 ;;; System definition
 
 
 ;;; 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 <kmr@debian.org>"
 (defsystem :clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"

diff --git a/clsql.asd b/clsql.asd
index f4a609d36fee469bd94c61991d18a9b7e5f85041..67e9b7f8dcd24a92ab43d9de18bfc08506f5f289 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -18,7 +18,7 @@
 
 (in-package :asdf)
 
 
 (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 <kmr@debian.org>"
 (defsystem :clsql
   :name "cl-sql"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -43,7 +43,7 @@
   :depends-on (:clsql-base)
   )
 
   :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*)))
 (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 95499bed354e045fa9eb12e6bd83575a3c4d20b9..12d6bef13a5ad654881929342addf784f3bb8a0b 100644 (file)
--- a/db-mysql/mysql-package.lisp
+++ b/db-mysql/mysql-package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -20,7 +20,7 @@
 (in-package :cl-user)
 
 (defpackage :mysql
 (in-package :cl-user)
 
 (defpackage :mysql

-    (:use :common-lisp :clsql-uffi)
+    (:use #:common-lisp #:clsql-uffi)

     (:export 
      #:database-library-loaded
      
     (:export 
      #:database-library-loaded
      

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 472d810bf36d25f5f1b78d4607afd627a55eddce..4011692b396c2da2fb91e238574998adb0a72bed 100644 (file)
--- 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
 ;;;;
 ;;;;                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
 ;;;;
 ;;;; 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
 ;;;; 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."))
 
     (: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 04b08a9e0f4ec925231273b7368fcaf3353ccd7f..78988302856c01a70ef0951f01463ef7a818e9d6 100644 (file)
--- 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
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -22,7 +22,7 @@
 #+lispworks (require "comm")
 
 (defpackage :postgresql-socket
 #+lispworks (require "comm")
 
 (defpackage :postgresql-socket

-  (:use :common-lisp)
+  (:use #:common-lisp)

   (:export #:pgsql-ftype
           #:pgsql-ftype#bytea
           #:pgsql-ftype#int2
   (:export #:pgsql-ftype
           #:pgsql-ftype#bytea
           #:pgsql-ftype#int2

diff --git a/debian/changelog b/debian/changelog
index feee5b8253d9a8ab8e798afe19d665718ab17fb0..c5e2b59093bde5afe83dca318e3395241a8ed2b7 100644 (file)
--- 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 <kmr@debian.org>  Sun, 13 Oct 2002 20:52:41 -0600
+

 cl-sql (0.9.9-1) unstable; urgency=high
 
   * Add version depends for common-lisp-controller
 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 9e39e0305296967bb7351ee5ca237216948938bd..c2eb33d500fc6e7fe6a9888c87a1f09e5ba2792f 100644 (file)
--- a/uffi/clsql-uffi-package.lisp
+++ b/uffi/clsql-uffi-package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -20,6 +20,7 @@
 (in-package :cl-user)
 
 (defpackage :clsql-uffi
 (in-package :cl-user)
 
 (defpackage :clsql-uffi

+  (:use #:common-lisp)

   (:export
    #:canonicalize-type-list
    #:convert-raw-field
   (:export
    #:canonicalize-type-list
    #:convert-raw-field