X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Floop-extension.lisp;h=76010e41bcb98e0813b92163ab1a0451d8d7b8e4;hb=41b951fca5ef48b594ca316cf1253b4d1192a045;hp=c3a2b9f2e930f37be93d1cce60f903d369321955;hpb=ce0e343835a040406678dff74a62d1b0cb56f317;p=clsql.git diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp index c3a2b9f..76010e4 100644 --- a/base/loop-extension.lisp +++ b/base/loop-extension.lisp @@ -18,7 +18,41 @@ ;;;; MIT-LOOP extension -#+(or cmu scl) +#+sbcl +(eval-when (:compile-toplevel :load-toplevel :execute) + (defpackage #:ansi-loop + (:import-from #:sb-loop + #:loop-error + #:*loop-epilogue* + #:*loop-ansi-universe* + #:add-loop-path))) + +#+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 allegro) (defun loop-record-iteration-path (variable data-type prep-phrases) (let ((in-phrase nil) (from-phrase nil)) @@ -41,7 +75,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-sys:*default-database*))) (cond ((consp variable) (let ((query-var (ansi-loop::loop-gentemp 'loop-record-)) @@ -50,22 +84,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-sys: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-sys: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-sys: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-sys: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 +108,120 @@ (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-sys: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-sys: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-sys: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-sys: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 (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-))) + (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-sys:database-query-result-set ,query-var ,db-var) + (setq ,result-set-var %rs ,step-var (make-list %cols)))) + () + () + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + `(,iter-var ,step-var) + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + `(,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-))) + (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-sys:database-query-result-set ,query-var ,db-var) + (setq ,result-set-var %rs ,iter-var (make-list %cols)))) + () + () + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + () + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + () + () + ())))))) +