r5062: return from san diego

diff --git a/base-class.lisp b/base-class.lisp
index 4b65c8d441be56ec697de28d0e686b4ded29bf53..9682f3d5438b67fb4e009fa7c30bfb526dfbec90 100644 (file)
--- a/base-class.lisp
+++ b/base-class.lisp
@@ -7,14 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: base-class.lisp,v 1.9 2003/05/22 20:40:03 kevin Exp $
+;;;; $Id: base-class.lisp,v 1.10 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
 
-(in-package :hyperobject)
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+(in-package #:hyperobject)
 
 
 (defclass hyperobject ()

diff --git a/connect.lisp b/connect.lisp
index 05a873578612048589ffd0f0068458fe28f0347c..742d956fefef10ae7e74afec1e96501953d9731f 100644 (file)
--- a/connect.lisp
+++ b/connect.lisp
@@ -7,14 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: connect.lisp,v 1.3 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: connect.lisp,v 1.4 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
 
-(in-package :hyperobject)
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+(in-package #:hyperobject)
 
 (defvar *ho-sql-db* "ho")
 (defun ho-sql-db ()

diff --git a/metaclass.lisp b/metaclass.lisp
index 321a4b0f6eded131ab403ef05cfcf22203bab95d..60c89d28e0951c7dae8d305b47b91ebd6a5600d5 100644 (file)
--- a/metaclass.lisp
+++ b/metaclass.lisp
@@ -8,17 +8,13 @@
 ;;;; Date Started:  Apr 2000
 ;;;;
 ;;;;
-;;;; $Id: metaclass.lisp,v 1.7 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: metaclass.lisp,v 1.8 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
-(in-package :hyperobject)
+(in-package #:hyperobject)
 
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
-
-  
 (defparameter *class-options*
   '(:user-name :default-print-slots :description :version :sql-name
     :direct-rules)

diff --git a/mop.lisp b/mop.lisp
index 695b4e9ef790e8a5bca7ea8d78e2ba6315999ea3..19e2743b011c7c5ab6183a6e349da03dccae7a48 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,15 +11,12 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking\r
 ;;;; capability and sub-objects.\r
 ;;;;\r
-;;;; $Id: mop.lisp,v 1.75 2003/05/26 21:43:05 kevin Exp $\r
+;;;; $Id: mop.lisp,v 1.76 2003/06/06 21:59:29 kevin Exp $\r
 ;;;;\r
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg\r
 ;;;; *************************************************************************\r
  \r
-(in-package :hyperobject)\r
-\r
-(eval-when (:compile-toplevel :execute)\r
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))\r
+(in-package #:hyperobject)\r
 \r
 ;; Main class\r
 \r

diff --git a/package.lisp b/package.lisp
index 25f5a4f048b942c280fc4ac0f2c2936c4525285b..2cff019cefab96be7d7448b22c3a45e1a696c7a1 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,15 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Apr 2000\r
 ;;;;\r
-;;;; $Id: package.lisp,v 1.48 2003/05/17 22:24:38 kevin Exp $\r
+;;;; $Id: package.lisp,v 1.49 2003/06/06 21:59:29 kevin Exp $\r
 ;;;;\r
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg\r
 ;;;; *************************************************************************\r
 \r
-(eval-when (:compile-toplevel :execute)\r
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))\r
-\r
-(in-package :cl-user)\r
+(in-package #:cl-user)\r
 \r
 #+sbcl\r
 (eval-when (:compile-toplevel :load-toplevel :execute)\r

diff --git a/rules.lisp b/rules.lisp
index fcce008806921189179c701c6d6793582a08ad0a..6a0745281dd99d423bc5926b915a925d3cfa7a1d 100644 (file)
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,15 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.45 2003/05/17 05:39:35 kevin Exp $
+;;;; $Id: rules.lisp,v 1.46 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
-(in-package :hyperobject)
-
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+(in-package #:hyperobject)
 
 ;;; Slot accessor and class rules
 

diff --git a/sql.lisp b/sql.lisp
index 2cbd602fc4a77c17290254c955b1b8dd1548a80a..179a452d9e3cc9dbe0d9852e36120826dc34b79d 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -2,20 +2,17 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          sqlgen.lisp
+;;;; Name:          sql.lisp
 ;;;; Purpose:       SQL Generation functions for Hyperobject
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql.lisp,v 1.5 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: sql.lisp,v 1.6 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
 
-(in-package :hyperobject)
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
-
+(in-package #:hyperobject)
 
 ;;;; Metaclass initialization commands
 
@@ -50,7 +47,6 @@
         (lisp-name (if name name (slot-definition-name esd))))
       (lisp-name-to-sql-name lisp-name)))
 
-
 (defun lisp-name-to-sql-name (lisp)
   "Convert a lisp name (atom or list, string or symbol) into a canonical
 SQL name"
@@ -59,19 +55,17 @@ SQL name"
          (typecase lisp
            (symbol (symbol-name lisp))
            (t (write-to-string lisp)))))
-  (let ((sql (make-string (length lisp))))
-    (dotimes (i (length lisp))
-      (declare (fixnum i))
-      (setf (char sql i)
-           (let ((c (char lisp i)))
-             (case c
-               (#\- #\_)
-               (#\$ #\_)
-               (#\+ #\_)
-               (#\# #\_)
-               (otherwise c)))))
-    (string-upcase sql)))
-
+  (do* ((len (length lisp))
+       (sql (make-string len))
+       (i 0 (1+ i)))
+      ((= i len) (string-upcase sql))
+    (declare (fixnum i)
+            (simple-string sql))
+    (setf (schar sql i)
+         (let ((c (char lisp i)))
+           (case c
+             ((#\- #\$ #\+ #\#) #\_)
+             (otherwise c))))))
                        
 (defun define-inverse (class esd)
   "Define an inverse function for a slot"
@@ -203,8 +197,6 @@ SQL name"
                                          (slot-value self name))))))))))
     values))
 
-
-
 (defun inverse-field-string (fields)
   (let (inverse)
     (dolist (field fields)

diff --git a/views.lisp b/views.lisp
index dfd6aaa6332190f72d336c683c7330bb50a2a92d..b9097a1f93f47b62402edf51c58f7cd96766aac9 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -7,15 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.49 2003/05/30 18:46:35 kevin Exp $
+;;;; $Id: views.lisp,v 1.50 2003/06/06 21:59:29 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
-(in-package :hyperobject)
-
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+(in-package #:hyperobject)
 
 
 (defclass object-view ()