From a4449b6f1b9fb2471da255fc506bcad6f8feb220 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2004 17:03:56 +0000 Subject: [PATCH] r8852: package renaming --- sql/classes.lisp | 5 ++--- sql/kmr-mop.lisp | 2 +- sql/metaclasses.lisp | 5 ++--- sql/objects.lisp | 6 ++---- sql/operations.lisp | 5 ++--- sql/package.lisp | 44 +++++++++++++++++++++----------------------- sql/sql.lisp | 2 +- sql/syntax.lisp | 2 +- sql/table.lisp | 4 ++-- 9 files changed, 34 insertions(+), 41 deletions(-) diff --git a/sql/classes.lisp b/sql/classes.lisp index c390c5f..0babb5c 100644 --- a/sql/classes.lisp +++ b/sql/classes.lisp @@ -1,7 +1,6 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ====================================================================== -;;;; File: classes.lisp -;;;; Updated: <04/04/2004 12:08:49 marcusp> +;;;; $Id: $ ;;;; ====================================================================== ;;;; ;;;; Description ========================================================== @@ -12,7 +11,7 @@ ;;;; ;;;; ====================================================================== -(in-package #:clsql-usql-sys) +(in-package #:clsql-sys) (defvar +empty-string+ "''") diff --git a/sql/kmr-mop.lisp b/sql/kmr-mop.lisp index 32cc35d..6949c12 100644 --- a/sql/kmr-mop.lisp +++ b/sql/kmr-mop.lisp @@ -16,7 +16,7 @@ ;;; re-exports into CLSQL-USQL-SYS them to hide differences in ;;; MOP implementations. -(in-package #:clsql-usql-sys) +(in-package #:clsql-sys) #+lispworks (defun intern-eql-specializer (slot) diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp index 60679fb..ebedaa8 100644 --- a/sql/metaclasses.lisp +++ b/sql/metaclasses.lisp @@ -1,7 +1,6 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ====================================================================== -;;;; File: metaclasses.lisp -;;;; Updated: <04/04/2004 12:08:11 marcusp> +;;;; $Id: $ ;;;; ====================================================================== ;;;; ;;;; Description ========================================================== @@ -12,7 +11,7 @@ ;;;; ====================================================================== -(in-package #:clsql-usql-sys) +(in-package #:clsql-sys) (eval-when (:compile-toplevel :load-toplevel :execute) (when (>= (length (generic-function-lambda-list diff --git a/sql/objects.lisp b/sql/objects.lisp index 14bb76f..6a18fe5 100644 --- a/sql/objects.lisp +++ b/sql/objects.lisp @@ -1,8 +1,6 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ====================================================================== -;;;; File: objects.lisp -;;;; Updated: <04/04/2004 12:07:55 marcusp> -;;;; ====================================================================== +;;;; $Id: $ ;;;; ;;;; Description ========================================================== ;;;; ====================================================================== @@ -12,7 +10,7 @@ ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-sys) +(in-package #:clsql-sys) (defclass standard-db-object () ((view-database diff --git a/sql/operations.lisp b/sql/operations.lisp index b07c068..b552e98 100644 --- a/sql/operations.lisp +++ b/sql/operations.lisp @@ -1,7 +1,6 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ====================================================================== -;;;; File: operations.lisp -;;;; Updated: <04/04/2004 12:07:26 marcusp> +;;;; $Id: $ ;;;; ====================================================================== ;;;; ;;;; Description ========================================================== @@ -11,7 +10,7 @@ ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-sys) +(in-package #:clsql-sys) ;; Keep a hashtable for mapping symbols to sql generator functions, diff --git a/sql/package.lisp b/sql/package.lisp index 39f16a9..ef691b7 100644 --- a/sql/package.lisp +++ b/sql/package.lisp @@ -1,9 +1,9 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ====================================================================== ;;;; File: package.lisp -;;;; Author: Marcus Pearce , Kevin Rosenberg +;;;; Authors: Marcus Pearce and Kevin Rosenberg ;;;; Created: 30/03/2004 -;;;; Updated: <04/04/2004 12:21:50 marcusp> +;;;; Updated: $Id: $ ;;;; ====================================================================== ;;;; ;;;; Description ========================================================== @@ -19,22 +19,21 @@ #+sbcl (if (find-package 'sb-mop) - (pushnew :usql-sbcl-mop cl:*features*) - (pushnew :usql-sbcl-pcl cl:*features*)) + (pushnew :clsql-sbcl-mop cl:*features*) + (pushnew :clsql-sbcl-pcl cl:*features*)) #+cmu (if (eq (symbol-package 'pcl:find-class) (find-package 'common-lisp)) - (pushnew :usql-cmucl-mop cl:*features*) - (pushnew :usql-cmucl-pcl cl:*features*))) + (pushnew :clsql-cmucl-mop cl:*features*) + (pushnew :clsql-cmucl-pcl cl:*features*))) (eval-when (:compile-toplevel :load-toplevel :execute) - (defpackage #:clsql-usql-sys - (:nicknames #:usql-sys) + (defpackage #:clsql-sys (:use #:common-lisp #:clsql-base-sys - #+usql-sbcl-mop #:sb-mop - #+usql-cmucl-mop #:mop + #+clsql-sbcl-mop #:sb-mop + #+clsql-cmucl-mop #:mop #+allegro #:mop #+lispworks #:clos #+scl #:clos @@ -46,11 +45,11 @@ #+lispworks (:shadowing-import-from #:clos) - #+usql-sbcl-mop + #+clsql-sbcl-mop (:shadowing-import-from #:sb-pcl #:generic-function-lambda-list) - #+usql-sbcl-pcl + #+clsql-sbcl-pcl (:shadowing-import-from #:sb-pcl #:name @@ -68,11 +67,11 @@ #:make-method-lambda #:generic-function-lambda-list #:class-precedence-list #:slot-definition-type #:class-direct-superclasses) - #+usql-cmucl-mop + #+clsql-cmucl-mop (:shadowing-import-from #:pcl #:generic-function-lambda-list) - #+usql-cmucl-pcl + #+clsql-cmucl-pcl (:shadowing-import-from #:pcl #:class-direct-slots @@ -397,15 +396,14 @@ (setf *packages-for-warn-on-redefinition* (delete "SQL" *packages-for-warn-on-redefinition* :test 'string=)) -(defpackage #:clsql-usql - (:nicknames #:usql #:sql) - (:use :common-lisp) - (:import-from :clsql-usql-sys . #2#) +(defpackage #:clsql + (:use #:common-lisp) + (:import-from :clsql-sys . #2#) (:export . #2#) (:documentation "This is the SQL-Interface package of USQL.")) ;; This is from USQL's pcl-patch - #+(or usql-sbcl-pcl usql-cmucl-pcl) + #+(or clsql-sbcl-pcl clsql-cmucl-pcl) (progn ;; Note that this will no longer required for cmucl as of version 19a. (in-package #+cmu :pcl #+sbcl :sb-pcl) @@ -420,13 +418,13 @@ #+sbcl (if (find-package 'sb-mop) - (setq cl:*features* (delete :usql-sbcl-mop cl:*features*)) - (setq cl:*features* (delete :usql-sbcl-pcl cl:*features*))) + (setq cl:*features* (delete :clsql-sbcl-mop cl:*features*)) + (setq cl:*features* (delete :clsql-sbcl-pcl cl:*features*))) #+cmu (if (find-package 'mop) - (setq cl:*features* (delete :usql-cmucl-mop cl:*features*)) - (setq cl:*features* (delete :usql-cmucl-pcl cl:*features*))) + (setq cl:*features* (delete :clsql-cmucl-mop cl:*features*)) + (setq cl:*features* (delete :clsql-cmucl-pcl cl:*features*))) );eval-when diff --git a/sql/sql.lisp b/sql/sql.lisp index b5c7284..4ed2e81 100644 --- a/sql/sql.lisp +++ b/sql/sql.lisp @@ -11,7 +11,7 @@ ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-sys) +(in-package #:clsql-sys) ;;; Basic operations on databases diff --git a/sql/syntax.lisp b/sql/syntax.lisp index f3f8372..76fb071 100644 --- a/sql/syntax.lisp +++ b/sql/syntax.lisp @@ -13,7 +13,7 @@ ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-sys) +(in-package #:clsql-sys) (defvar *original-reader-enter* nil) diff --git a/sql/table.lisp b/sql/table.lisp index 715cef0..1a225de 100644 --- a/sql/table.lisp +++ b/sql/table.lisp @@ -14,7 +14,7 @@ ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-sys) +(in-package #:clsql-sys) ;; Utilities @@ -317,4 +317,4 @@ POSITION." (defun sequence-last (name &key (database *default-database*)) "Return the last value of the sequence NAME in DATABASE." - (database-sequence-last (database-identifier name) database)) \ No newline at end of file + (database-sequence-last (database-identifier name) database)) -- 2.34.1