X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Floop-extension.lisp;h=f8129b53cf527d5438ccf20bdb4e1245a38d8bd9;hp=c3a2b9f2e930f37be93d1cce60f903d369321955;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=ce0e343835a040406678dff74a62d1b0cb56f317

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index c3a2b9f..f8129b5 100644
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -18,7 +18,20 @@
 
 ;;;; MIT-LOOP extension
 
-#+(or cmu scl)
+#+(or allegro sbcl)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defpackage #:ansi-loop 
+    (:import-from #+sbcl #:sb-loop #+allegro #:excl
+		  #:loop-error
+		  #:*loop-epilogue*
+		  #:*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)
 (defun loop-record-iteration-path (variable data-type prep-phrases)
   (let ((in-phrase nil)
 	(from-phrase nil))
@@ -41,7 +54,7 @@
     (unless in-phrase
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase
-      (setq from-phrase '(*default-database*)))
+      (setq from-phrase '(clsql-base:*default-database*)))
     (cond
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -50,22 +63,23 @@
 			      '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))
+		  (clsql-base:database-dump-result-set ,result-set-var ,db-var))
 	       ansi-loop::*loop-epilogue*)
-	 `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
+	 `(((,variable nil ,@(and data-type (list data-type)))
+	    (,query-var ,(first in-phrase))
 	    (,db-var ,(first from-phrase))
 	    (,result-set-var nil)
 	    (,step-var nil))
 	   ((multiple-value-bind (%rs %cols)
-		(database-query-result-set ,query-var ,db-var)
+		(clsql-base:database-query-result-set ,query-var ,db-var)
 	      (setq ,result-set-var %rs ,step-var (make-list %cols))))
 	   ()
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (not (clsql-base: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))
+	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var))
 	   (,variable ,step-var))))
       (t
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -73,26 +87,122 @@
 	     (result-set-var (ansi-loop::loop-gentemp
 			      'loop-record-result-set-)))
 	 (push `(when ,result-set-var
-		 (database-dump-result-set ,result-set-var ,db-var))
+		 (clsql-base:database-dump-result-set ,result-set-var ,db-var))
 	       ansi-loop::*loop-epilogue*)
-	 `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
+	 `(((,variable nil ,@(and data-type (list data-type)))
+	    (,query-var ,(first in-phrase))
 	    (,db-var ,(first from-phrase))
 	    (,result-set-var nil))
 	   ((multiple-value-bind (%rs %cols)
-		(database-query-result-set ,query-var ,db-var)
+		(clsql-base:database-query-result-set ,query-var ,db-var)
 	      (setq ,result-set-var %rs ,variable (make-list %cols))))
 	   ()
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,variable))
+	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
 	   ()
 	   (not ,result-set-var)
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,variable))
+	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
 	   ()))))))
 
-#+(or cmu scl)
+#+(or cmu scl sbcl openmcl allegro)
 (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))
+
+#+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))
+  (let ((in-phrase nil)
+	(from-phrase nil))
+    (loop for (prep . rest) in prep-phrases
+	  do
+	  (cond
+	    ((or (eq prep 'in) (eq prep 'of))
+	     (when in-phrase
+	       (error
+		"Duplicate OF or IN iteration path: ~S." (cons prep rest)))
+	     (setq in-phrase rest))
+	    ((eq prep 'from)
+	     (when from-phrase
+	       (error
+		"Duplicate FROM iteration path: ~S." (cons prep rest)))
+	     (setq from-phrase rest))
+	    (t
+	     (error
+	      "Unknown preposition: ~S." prep))))
+    (unless in-phrase
+      (error "Missing OF or IN iteration path."))
+    (unless from-phrase
+      (setq from-phrase '(clsql-base:*default-database*)))
+    (cond
+      ((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-base:database-query-result-set ,query-var ,db-var)
+	      (setq ,result-set-var %rs ,step-var (make-list %cols))))
+	  ()
+	  ()
+	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var)
+	      (when ,result-set-var
+		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
+	      t))
+	  `(,iter-var ,step-var)
+	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var)
+	      (when ,result-set-var
+		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
+	      t))
+	  `(,iter-var ,step-var)
+	  ()
+	  ())))
+      (t
+       (let ((query-var (gensym "LOOP-RECORD-"))
+	     (db-var (gensym "LOOP-RECORD-DATABASE-"))
+	     (result-set-var (gensym "LOOP-RECORD-RESULT-SET-")))
+	 (values
+	  t
+	  nil
+	  `((,iter-var nil ,iter-var-data-type) (,query-var ,in-phrase)
+	    (,db-var ,(first from-phrase))
+	    (,result-set-var nil))
+	  `((multiple-value-bind (%rs %cols)
+		(clsql-base:database-query-result-set ,query-var ,db-var)
+	      (setq ,result-set-var %rs ,iter-var (make-list %cols))))
+	  ()
+	  ()
+	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
+	      (when ,result-set-var
+		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
+	      t))
+	   ()
+	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
+	      (when ,result-set-var
+		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
+	      t))
+	  ()
+	  ()
+	  ()))))))
+