X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Floop-extension.lisp;h=802533092c71b36a0c5ac8fa1655219ce622c674;hp=db1cfb62bcda7b67715760b6b8437fe6f4179edd;hb=0e43efc5b776edd86d304e103123944a84efd9a4;hpb=8c6c643e3debe875bd14408cc3129d8148dfd125

diff --git a/sql/loop-extension.lisp b/sql/loop-extension.lisp
index db1cfb6..8025330 100644
--- a/sql/loop-extension.lisp
+++ b/sql/loop-extension.lisp
@@ -5,26 +5,30 @@
 ;;;; Name:    loop-extension.lisp
 ;;;; Purpose: Extensions to the Loop macro for CLSQL
 ;;;;
-;;;; Copyright (c) 2001-2004 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 #:cl-user)
+(in-package #:clsql-sys)
 
 #+(or allegro sbcl)
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defpackage #:ansi-loop 
+  (defpackage #:ansi-loop
     (:import-from #+sbcl #:sb-loop #+allegro #:excl
 		  #:*loop-epilogue*
-		  #:*loop-ansi-universe* 
+		  #:*loop-ansi-universe*
 		  #:add-loop-path)))
 
 #+(or allegro sbcl)
 (defun ansi-loop::loop-gentemp (&optional (pref 'loopva-))
   (gensym (string pref)))
 
-#+(or cmu scl sbcl openmcl allegro)
+#+clisp
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-package "ANSI-LOOP") (push :clisp-aloop cl:*features*)))
+
+#+(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))
@@ -52,10 +56,10 @@
 		    :message
 		    (format nil"Unknown preposition: ~S." prep)))))
     (unless in-phrase
-      (error 'clsql:sql-user-error 
+      (error 'clsql:sql-user-error
 	     :message "Missing OF or IN iteration path."))
     (unless from-phrase
-      (setq from-phrase '(clsql-sys:*default-database*)))
+      (setq from-phrase '(*default-database*)))
 
     (unless (consp variable)
       (setq variable (list variable)))
@@ -72,7 +76,7 @@
 			      'loop-record-result-))
 	     (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
 	 `(((,variable nil ,@(and data-type (list data-type)))
-	    (,result-var (clsql-sys:query ,(first in-phrase)))
+	    (,result-var (query ,(first in-phrase)))
 	    (,step-var nil))
 	   ()
 	   ()
@@ -93,7 +97,7 @@
 		 (setq ,result-var (rest ,result-var))
 		 nil))
 	   (,variable ,step-var))))
-      
+
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
 	     (db-var (ansi-loop::loop-gentemp 'loop-record-database-))
@@ -101,43 +105,41 @@
 			      'loop-record-result-set-))
 	     (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
 	 (push `(when ,result-set-var
-		  (clsql-sys:database-dump-result-set ,result-set-var ,db-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 nil)
+	    (,result-set-var t)
 	    (,step-var nil))
 	   ((multiple-value-bind (%rs %cols)
-		(clsql-sys:database-query-result-set ,query-var ,db-var :result-types :auto)
+		(database-query-result-set ,query-var ,db-var :result-types :auto)
 	      (setq ,result-set-var %rs ,step-var (make-list %cols))))
 	   ()
 	   ()
-	   (not (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (not (database-store-next-row ,result-set-var ,db-var ,step-var))
 	   (,variable ,step-var)
 	   (not ,result-set-var)
 	   ()
-	   (not (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (not (database-store-next-row ,result-set-var ,db-var ,step-var))
 	   (,variable ,step-var)))))))
 
-#+(or cmu scl sbcl openmcl allegro)
+#+(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)
 
-#+lispworks 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (in-package loop))
 
 #+lispworks
-(cl-user::define-loop-method (record records tuple tuples) clsql-loop-method 
-  (in of from))
+(cl-user::define-loop-method (loop::record loop::records loop::tuple loop::tuples)
+    clsql-loop-method
+  (loop::in loop::of loop::from))
 
 #+lispworks
-(defun clsql-loop-method (method-name iter-var iter-var-data-type 
-			  prep-phrases inclusive? allowed-preps 
+(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))
   (let ((in-phrase nil)
@@ -145,14 +147,14 @@
     (loop for (prep . rest) in prep-phrases
 	  do
 	  (cond
-	    ((or (eq prep 'in) (eq prep 'of))
+	    ((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 'from)
+	    ((eq prep 'loop::from)
 	     (when from-phrase
 	       (error 'clsql:sql-user-error
 		      :message
@@ -163,7 +165,7 @@
 	     (error 'clsql:sql-user-error
 		    :message (format nil "Unknown preposition: ~S." prep)))))
     (unless in-phrase
-      (error 'clsql:sql-user-error 
+      (error 'clsql:sql-user-error
 	     :message "Missing OF or IN iteration path."))
     (unless from-phrase
       (setq from-phrase '(clsql:*default-database*)))
@@ -207,7 +209,7 @@
 	   ()
 	   ()
 	   )))
-      
+
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))
 	     (db-var (gensym "LOOP-RECORD-DATABASE-"))
@@ -239,3 +241,8 @@
 	  ()
 	  ()))))))
 
+
+#+clisp-aloop
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setq cl:*features* (delete :clisp-aloop cl:*features*)))
+