Automated commit for debian release 6.7.2-1

[clsql.git] / sql / loop-extension.lisp

diff --git a/sql/loop-extension.lisp b/sql/loop-extension.lisp
index 802533092c71b36a0c5ac8fa1655219ce622c674..32a356c28fdfcb11bc609648cfe9709c03b210bf 100644 (file)
--- a/sql/loop-extension.lisp
+++ b/sql/loop-extension.lisp
@@ -7,7 +7,6 @@
 ;;;;
 ;;;; Copyright (c) 2001-2006 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai
 ;;;;
 ;;;;
 ;;;; Copyright (c) 2001-2006 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai
 ;;;;

-;;;; $Id$

 ;;;; *************************************************************************
 
 (in-package #:clsql-sys)
 ;;;; *************************************************************************
 
 (in-package #:clsql-sys)


@@ -16,9 +15,9 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:ansi-loop
     (:import-from #+sbcl #:sb-loop #+allegro #:excl
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:ansi-loop
     (:import-from #+sbcl #:sb-loop #+allegro #:excl

-                 #:*loop-epilogue*
-                 #:*loop-ansi-universe*
-                 #:add-loop-path)))
+                  #:*loop-epilogue*
+                  #:*loop-ansi-universe*
+                  #:add-loop-path)))

 
 #+(or allegro sbcl)
 (defun ansi-loop::loop-gentemp (&optional (pref 'loopva-))
 
 #+(or allegro sbcl)
 (defun ansi-loop::loop-gentemp (&optional (pref 'loopva-))


@@ -31,33 +30,33 @@
 #+(or allegro clisp-aloop cmu openmcl sbcl scl)
 (defun loop-record-iteration-path (variable data-type prep-phrases)
   (let ((in-phrase nil)
 #+(or allegro clisp-aloop cmu openmcl sbcl scl)
 (defun loop-record-iteration-path (variable data-type prep-phrases)
   (let ((in-phrase nil)

-       (from-phrase nil))
+        (from-phrase nil))

     (loop for (prep . rest) in prep-phrases
     (loop for (prep . rest) in prep-phrases

-         do
-         (case prep
-           ((:in :of)
-            (when in-phrase
-              (error 'clsql:sql-user-error
-                     :message
-                     (format nil
-                             "Duplicate OF or IN iteration path: ~S."
-                             (cons prep rest))))
-            (setq in-phrase rest))
-           ((:from)
-            (when from-phrase
-              (error 'clsql:sql-user-error
-                     :message
-                     (format nil
-                             "Duplicate FROM iteration path: ~S."
-                             (cons prep rest))))
-            (setq from-phrase rest))
-           (t
-            (error 'clsql:sql-user-error
-                   :message
-                   (format nil"Unknown preposition: ~S." prep)))))
+          do
+          (case prep
+            ((:in :of)
+             (when in-phrase
+               (error 'clsql:sql-user-error
+                      :message
+                      (format nil
+                              "Duplicate OF or IN iteration path: ~S."
+                              (cons prep rest))))
+             (setq in-phrase rest))
+            ((:from)
+             (when from-phrase
+               (error 'clsql:sql-user-error
+                      :message
+                      (format nil
+                              "Duplicate FROM iteration path: ~S."
+                              (cons prep rest))))
+             (setq from-phrase rest))
+            (t
+             (error 'clsql:sql-user-error
+                    :message
+                    (format nil"Unknown preposition: ~S." prep)))))

     (unless in-phrase
       (error 'clsql:sql-user-error
     (unless in-phrase
       (error 'clsql:sql-user-error

-            :message "Missing OF or IN iteration path."))
+             :message "Missing OF or IN iteration path."))

     (unless from-phrase
       (setq from-phrase '(*default-database*)))
 
     (unless from-phrase
       (setq from-phrase '(*default-database*)))
 


@@ -67,69 +66,69 @@
     (cond
      ;; object query
      ((and (consp (first in-phrase))
     (cond
      ;; object query
      ((and (consp (first in-phrase))

-          (string-equal "sql-query" (symbol-name (caar in-phrase)))
-          (consp (second (first in-phrase)))
-          (eq 'quote (first (second (first in-phrase))))
-          (symbolp (second (second (first in-phrase)))))
+           (string-equal "sql-query" (symbol-name (caar in-phrase)))
+           (consp (second (first in-phrase)))
+           (eq 'quote (first (second (first in-phrase))))
+           (symbolp (second (second (first in-phrase)))))

 
        (let ((result-var (ansi-loop::loop-gentemp
 
        (let ((result-var (ansi-loop::loop-gentemp

-                             'loop-record-result-))
-            (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
-        `(((,variable nil ,@(and data-type (list data-type)))
-           (,result-var (query ,(first in-phrase)))
-           (,step-var nil))
-          ()
-          ()
-          ()
-          (if (null ,result-var)
-              t
-              (progn
-                (setq ,step-var (first ,result-var))
-                (setq ,result-var (rest ,result-var))
-                nil))
-          (,variable ,step-var)
-          (null ,result-var)
-          ()
-          (if (null ,result-var)
-              t
-              (progn
-                (setq ,step-var (first ,result-var))
-                (setq ,result-var (rest ,result-var))
-                nil))
-          (,variable ,step-var))))
+                              'loop-record-result-))
+             (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
+         `(((,variable nil ,@(and data-type (list data-type)))
+            (,result-var (query ,(first in-phrase)))
+            (,step-var nil))
+           ()
+           ()
+           ()
+           (if (null ,result-var)
+               t
+               (progn
+                 (setq ,step-var (first ,result-var))
+                 (setq ,result-var (rest ,result-var))
+                 nil))
+           (,variable ,step-var)
+           (null ,result-var)
+           ()
+           (if (null ,result-var)
+               t
+               (progn
+                 (setq ,step-var (first ,result-var))
+                 (setq ,result-var (rest ,result-var))
+                 nil))
+           (,variable ,step-var))))

 
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
 
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))

-            (db-var (ansi-loop::loop-gentemp 'loop-record-database-))
-            (result-set-var (ansi-loop::loop-gentemp
-                             'loop-record-result-set-))
-            (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
-        (push `(when ,result-set-var
-                 (database-dump-result-set ,result-set-var ,db-var))
-              ansi-loop::*loop-epilogue*)
-        `(((,variable nil ,@(and data-type (list data-type)))
-           (,query-var ,(first in-phrase))
-           (,db-var ,(first from-phrase))
-           (,result-set-var t)
-           (,step-var nil))
-          ((multiple-value-bind (%rs %cols)
-               (database-query-result-set ,query-var ,db-var :result-types :auto)
-             (setq ,result-set-var %rs ,step-var (make-list %cols))))
-          ()
-          ()
-          (not (database-store-next-row ,result-set-var ,db-var ,step-var))
-          (,variable ,step-var)
-          (not ,result-set-var)
-          ()
-          (not (database-store-next-row ,result-set-var ,db-var ,step-var))
-          (,variable ,step-var)))))))
+             (db-var (ansi-loop::loop-gentemp 'loop-record-database-))
+             (result-set-var (ansi-loop::loop-gentemp
+                              'loop-record-result-set-))
+             (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
+         (push `(when ,result-set-var
+                  (database-dump-result-set ,result-set-var ,db-var))
+               ansi-loop::*loop-epilogue*)
+         `(((,variable nil ,@(and data-type (list data-type)))
+            (,query-var ,(first in-phrase))
+            (,db-var ,(first from-phrase))
+            (,result-set-var t)
+            (,step-var nil))
+           ((multiple-value-bind (%rs %cols)
+                (database-query-result-set ,query-var ,db-var :result-types :auto)
+              (setq ,result-set-var %rs ,step-var (make-list %cols))))
+           ()
+           ()
+           (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+           (,variable ,step-var)
+           (not ,result-set-var)
+           ()
+           (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+           (,variable ,step-var)))))))

 
 #+(or allegro clisp-aloop cmu openmcl sbcl scl)
 (ansi-loop::add-loop-path '(record records tuple tuples)
 
 #+(or allegro clisp-aloop cmu openmcl sbcl scl)
 (ansi-loop::add-loop-path '(record records tuple tuples)

-                         'loop-record-iteration-path
-                         ansi-loop::*loop-ansi-universe*
-                         :preposition-groups '((:of :in) (:from))
-                         :inclusive-permitted nil)
+                          'loop-record-iteration-path
+                          ansi-loop::*loop-ansi-universe*
+                          :preposition-groups '((:of :in) (:from))
+                          :inclusive-permitted nil)

 
 
 #+lispworks
 
 
 #+lispworks


@@ -139,34 +138,34 @@
 
 #+lispworks
 (defun clsql-loop-method (method-name iter-var iter-var-data-type
 
 #+lispworks
 (defun clsql-loop-method (method-name iter-var iter-var-data-type

-                         prep-phrases inclusive? allowed-preps
-                         method-specific-data)
-  (declare (ignore method-name inclusive? allowed-preps method-specific-data))
+                          prep-phrases inclusive? allowed-preps
+                          method-specific-data)
+  (declare (ignore method-name iter-var-data-type inclusive? allowed-preps method-specific-data))

   (let ((in-phrase nil)
   (let ((in-phrase nil)

-       (from-phrase nil))
+        (from-phrase nil))

     (loop for (prep . rest) in prep-phrases
     (loop for (prep . rest) in prep-phrases

-         do
-         (cond
-           ((or (eq prep 'loop::in) (eq prep 'loop::of))
-            (when in-phrase
-              (error 'clsql:sql-user-error
-                     :message
-                     (format nil "Duplicate OF or IN iteration path: ~S."
-                             (cons prep rest))))
-            (setq in-phrase rest))
-           ((eq prep 'loop::from)
-            (when from-phrase
-              (error 'clsql:sql-user-error
-                     :message
-                     (format nil "Duplicate FROM iteration path: ~S."
-                             (cons prep rest))))
-            (setq from-phrase rest))
-           (t
-            (error 'clsql:sql-user-error
-                   :message (format nil "Unknown preposition: ~S." prep)))))
+          do
+          (cond
+            ((or (eq prep 'loop::in) (eq prep 'loop::of))
+             (when in-phrase
+               (error 'clsql:sql-user-error
+                      :message
+                      (format nil "Duplicate OF or IN iteration path: ~S."
+                              (cons prep rest))))
+             (setq in-phrase rest))
+            ((eq prep 'loop::from)
+             (when from-phrase
+               (error 'clsql:sql-user-error
+                      :message
+                      (format nil "Duplicate FROM iteration path: ~S."
+                              (cons prep rest))))
+             (setq from-phrase rest))
+            (t
+             (error 'clsql:sql-user-error
+                    :message (format nil "Unknown preposition: ~S." prep)))))

     (unless in-phrase
       (error 'clsql:sql-user-error
     (unless in-phrase
       (error 'clsql:sql-user-error

-            :message "Missing OF or IN iteration path."))
+             :message "Missing OF or IN iteration path."))

     (unless from-phrase
       (setq from-phrase '(clsql:*default-database*)))
 
     (unless from-phrase
       (setq from-phrase '(clsql:*default-database*)))
 


@@ -176,70 +175,70 @@
     (cond
      ;; object query
      ((and (consp in-phrase)
     (cond
      ;; object query
      ((and (consp in-phrase)

-          (string-equal "sql-query" (symbol-name (car in-phrase)))
-          (consp (second in-phrase))
-          (eq 'quote (first (second in-phrase)))
-          (symbolp (second (second in-phrase))))
+           (string-equal "sql-query" (symbol-name (car in-phrase)))
+           (consp (second in-phrase))
+           (eq 'quote (first (second in-phrase)))
+           (symbolp (second (second in-phrase))))

 
        (let ((result-var (gensym "LOOP-RECORD-RESULT-"))
 
        (let ((result-var (gensym "LOOP-RECORD-RESULT-"))

-            (step-var (gensym "LOOP-RECORD-STEP-")))
-        (values
-         t
-         nil
-         `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
-             (,result-var (clsql:query ,in-phrase))
-             (,step-var nil))
-         ()
-         ()
-         ()
-         `((if (null ,result-var)
-               t
-               (progn
-                 (setq ,step-var (first ,result-var))
-                 (setq ,result-var (rest ,result-var))
-                 nil)))
-         `(,iter-var ,step-var)
-         `((if (null ,result-var)
-               t
-               (progn
-                 (setq ,step-var (first ,result-var))
-                 (setq ,result-var (rest ,result-var))
-                 nil)))
-          `(,iter-var ,step-var)
-          ()
-          ()
-          )))
+             (step-var (gensym "LOOP-RECORD-STEP-")))
+         (values
+          t
+          nil
+          `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
+              (,result-var (clsql:query ,in-phrase))
+              (,step-var nil))
+          ()
+          ()
+          ()
+          `((if (null ,result-var)
+                t
+                (progn
+                  (setq ,step-var (first ,result-var))
+                  (setq ,result-var (rest ,result-var))
+                  nil)))
+          `(,iter-var ,step-var)
+          `((if (null ,result-var)
+                t
+                (progn
+                  (setq ,step-var (first ,result-var))
+                  (setq ,result-var (rest ,result-var))
+                  nil)))
+           `(,iter-var ,step-var)
+           ()
+           ()
+           )))

 
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))
 
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))

-            (db-var (gensym "LOOP-RECORD-DATABASE-"))
-            (result-set-var (gensym "LOOP-RECORD-RESULT-SET-"))
-            (step-var (gensym "LOOP-RECORD-STEP-")))
-        (values
-         t
-         nil
-         `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
-           (,query-var ,in-phrase)
-           (,db-var ,(first from-phrase))
-           (,result-set-var nil)
-           (,step-var nil))
-         `((multiple-value-bind (%rs %cols)
-               (clsql-sys:database-query-result-set ,query-var ,db-var :result-types :auto)
-             (setq ,result-set-var %rs ,step-var (make-list %cols))))
-         ()
-         ()
-         `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
-             (when ,result-set-var
-               (clsql-sys:database-dump-result-set ,result-set-var ,db-var))
-             t))
-         `(,iter-var ,step-var)
-         `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
-             (when ,result-set-var
-               (clsql-sys:database-dump-result-set ,result-set-var ,db-var))
-             t))
-         `(,iter-var ,step-var)
-         ()
-         ()))))))
+             (db-var (gensym "LOOP-RECORD-DATABASE-"))
+             (result-set-var (gensym "LOOP-RECORD-RESULT-SET-"))
+             (step-var (gensym "LOOP-RECORD-STEP-")))
+         (values
+          t
+          nil
+          `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
+            (,query-var ,in-phrase)
+            (,db-var ,(first from-phrase))
+            (,result-set-var nil)
+            (,step-var nil))
+          `((multiple-value-bind (%rs %cols)
+                (clsql-sys:database-query-result-set ,query-var ,db-var :result-types :auto)
+              (setq ,result-set-var %rs ,step-var (make-list %cols))))
+          ()
+          ()
+          `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
+              (when ,result-set-var
+                (clsql-sys:database-dump-result-set ,result-set-var ,db-var))
+              t))
+          `(,iter-var ,step-var)
+          `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
+              (when ,result-set-var
+                (clsql-sys:database-dump-result-set ,result-set-var ,db-var))
+              t))
+          `(,iter-var ,step-var)
+          ()
+          ()))))))

 
 
 #+clisp-aloop
 
 
 #+clisp-aloop