X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Floop-extension.lisp;h=f8129b53cf527d5438ccf20bdb4e1245a38d8bd9;hp=0eba251c5c2fb8d29d79dacc9bdc765d88f4a028;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=e5744a78271044484b3399d4fc1d55b3e8808784 diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp index 0eba251..f8129b5 100644 --- a/base/loop-extension.lisp +++ b/base/loop-extension.lisp @@ -54,7 +54,7 @@ (unless in-phrase (ansi-loop::loop-error "Missing OF or IN iteration path.")) (unless from-phrase - (setq from-phrase '(clsql-base-sys:*default-database*))) + (setq from-phrase '(clsql-base:*default-database*))) (cond ((consp variable) (let ((query-var (ansi-loop::loop-gentemp 'loop-record-)) @@ -63,7 +63,7 @@ 'loop-record-result-set-)) (step-var (ansi-loop::loop-gentemp 'loop-record-step-))) (push `(when ,result-set-var - (clsql-base-sys: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 ,@(and data-type (list data-type))) (,query-var ,(first in-phrase)) @@ -71,15 +71,15 @@ (,result-set-var nil) (,step-var nil)) ((multiple-value-bind (%rs %cols) - (clsql-base-sys: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 (clsql-base-sys: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 (clsql-base-sys: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-)) @@ -87,22 +87,22 @@ (result-set-var (ansi-loop::loop-gentemp 'loop-record-result-set-))) (push `(when ,result-set-var - (clsql-base-sys: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 ,@(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) - (clsql-base-sys: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 (clsql-base-sys: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 (clsql-base-sys: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 sbcl openmcl allegro) @@ -112,7 +112,9 @@ :preposition-groups '((:of :in) (:from)) :inclusive-permitted nil) -#+lispworks (in-package loop) +#+lispworks +(eval-when (:compile-toplevel :load-toplevel :execute) + (in-package loop)) #+lispworks (cl-user::define-loop-method (record records tuple tuples) clsql-loop-method @@ -122,6 +124,7 @@ (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 @@ -143,13 +146,13 @@ (unless in-phrase (error "Missing OF or IN iteration path.")) (unless from-phrase - (setq from-phrase '(clsql-base-sys:*default-database*))) + (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-))) + (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 @@ -159,26 +162,26 @@ (,result-set-var nil) (,step-var nil)) `((multiple-value-bind (%rs %cols) - (clsql-base-sys: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)))) () () - `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var) + `((unless (clsql-base: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)) + (clsql-base: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) + `((unless (clsql-base: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)) + (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-))) + (let ((query-var (gensym "LOOP-RECORD-")) + (db-var (gensym "LOOP-RECORD-DATABASE-")) + (result-set-var (gensym "LOOP-RECORD-RESULT-SET-"))) (values t nil @@ -186,18 +189,18 @@ (,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) + (clsql-base: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) + `((unless (clsql-base: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)) + (clsql-base: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) + `((unless (clsql-base: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)) + (clsql-base:database-dump-result-set ,result-set-var ,db-var)) t)) () ()