X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Floop-extension.lisp;fp=base%2Floop-extension.lisp;h=2290f2736696b8adb1d7efb27f443882224d6ba7;hb=c50e9039c1b0d99d121f3d2dc48aa5e397fb2cc3;hp=6ac4368b40e4669d4a3d25cae2aa05223939327b;hpb=e3ed4080f0a28d94e81aad7452fb1f81e1e50253;p=clsql.git

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index 6ac4368..2290f27 100644
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -26,12 +26,33 @@
 		  #:*loop-epilogue*
 		  #:*loop-ansi-universe* 
 		  #:add-loop-path)))
-  
-#+sbcl 
+
+#+lispworks
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defpackage #:ansi-loop 
+    (:import-from #:loop
+		  #:*epilogue*)))
+
+#+allegro
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package '#:ansi-loop)
+    (let ((excl::*enable-package-locked-errors* nil))
+      (rename-package '#:excl '#:excl
+		      (cons '#:ansi-loop
+			    (package-nicknames (find-package '#:excl)))))))
+
+#+lispworks
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package '#:ansi-loop)
+    (rename-package '#:loop '#:loop
+		    (cons '#:ansi-loop
+			  (package-nicknames (find-package '#:loop))))))
+
+#+(or sbcl lispworks)
 (defun ansi-loop::loop-gentemp (&optional (pref 'loopva-))
   (gensym (string pref)))
 
-#+(or cmu scl sbcl openmcl)
+#+(or cmu scl sbcl openmcl allegro)
 (defun loop-record-iteration-path (variable data-type prep-phrases)
   (let ((in-phrase nil)
 	(from-phrase nil))
@@ -103,9 +124,93 @@
 	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))
 	   ()))))))
 
-#+(or cmu scl sbcl openmcl)
+#+(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 (in-package loop)
+
+#+lispworks
+(cl-user::define-loop-method (record records tuple tuples) ansi-loop::clsql-loop-method (in of from))
+
+#+lispworks
+(defun ansi-loop::clsql-loop-method (method-name iter-var iter-var-data-type 
+				     prep-phrases 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-sys:*default-database*)))
+    (cond
+      ((consp iter-var)
+       (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-)))
+	 #+ignore
+	 (push `(when ,result-set-var
+		 (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+	       ansi-loop::*epilogue*)
+	 `(((,iter-var nil ,iter-var-data-type) (,query-var ,(first in-phrase))
+	    (,db-var ,(first from-phrase))
+	    (,result-set-var nil)
+	    (,step-var nil))
+	   ((multiple-value-bind (%rs %cols)
+		(clsql-base-sys:database-query-result-set ,query-var ,db-var)
+	      (setq ,result-set-var %rs ,step-var (make-list %cols))))
+	   ()
+	   ()
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (,iter-var ,step-var)
+	   (not ,result-set-var)
+	   ()
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (,iter-var ,step-var))))
+      (t
+       (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-)))
+	 #+ignore
+	 (push `(when ,result-set-var
+		 (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+	       ansi-loop::*epilogue*)
+	 `(((,iter-var nil ,iter-var-data-type) (,query-var ,(first in-phrase))
+	    (,db-var ,(first from-phrase))
+	    (,result-set-var nil))
+	   ((multiple-value-bind (%rs %cols)
+		(clsql-base-sys:database-query-result-set ,query-var ,db-var)
+	      (setq ,result-set-var %rs ,iter-var (make-list %cols))))
+	   ()
+	   ()
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var))
+	   ()
+	   (not ,result-set-var)
+	   ()
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var))
+	   ()))))))
+
+
+