;;;; MIT-LOOP extension
-#+sbcl
+#+(or allegro sbcl)
(eval-when (:compile-toplevel :load-toplevel :execute)
(defpackage #:ansi-loop
- (:import-from #:sb-loop
+ (:import-from #+sbcl #:sb-loop #+allegro #:excl
#: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)
+#+(or allegro sbcl)
(defun ansi-loop::loop-gentemp (&optional (pref 'loopva-))
(gensym (string pref)))
(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-))
'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 ,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)
- (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-))
(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 ,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)
- (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)
: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) ansi-loop::clsql-loop-method (in of from))
+(cl-user::define-loop-method (record records tuple tuples) 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)
+(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
(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 (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))
+ (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-sys:database-query-result-set ,query-var ,db-var)
+ `((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))))
- ()
- ()
- (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))))
+ ()
+ ()
+ `((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 (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))
+ (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-sys:database-query-result-set ,query-var ,db-var)
+ `((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))
()
- ()
- (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))
- ()))))))
-
-
+ `((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))
+ ()
+ ()
+ ()))))))
projects / clsql.git / blobdiff