X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Floop-extension.lisp;h=802533092c71b36a0c5ac8fa1655219ce622c674;hp=d0f816f37da0192eadea3cdb3c5f2c35a68918a1;hb=0e43efc5b776edd86d304e103123944a84efd9a4;hpb=279b34c9e8e28545c8f2a0959acb01d90138eeda diff --git a/sql/loop-extension.lisp b/sql/loop-extension.lisp index d0f816f..8025330 100644 --- a/sql/loop-extension.lisp +++ b/sql/loop-extension.lisp @@ -5,27 +5,30 @@ ;;;; Name: loop-extension.lisp ;;;; Purpose: Extensions to the Loop macro for CLSQL ;;;; -;;;; Copyright (c) 2001-2004 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai +;;;; Copyright (c) 2001-2006 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai ;;;; ;;;; $Id$ ;;;; ************************************************************************* -(in-package #:cl-user) +(in-package #:clsql-sys) #+(or allegro sbcl) (eval-when (:compile-toplevel :load-toplevel :execute) - (defpackage #:ansi-loop + (defpackage #:ansi-loop (:import-from #+sbcl #:sb-loop #+allegro #:excl - #:loop-error #:*loop-epilogue* - #:*loop-ansi-universe* + #:*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) +#+clisp +(eval-when (:compile-toplevel :load-toplevel :execute) + (when (find-package "ANSI-LOOP") (push :clisp-aloop cl:*features*))) + +#+(or allegro clisp-aloop cmu openmcl sbcl scl) (defun loop-record-iteration-path (variable data-type prep-phrases) (let ((in-phrase nil) (from-phrase nil)) @@ -34,21 +37,29 @@ (case prep ((:in :of) (when in-phrase - (ansi-loop::loop-error - "Duplicate OF or IN iteration path: ~S." (cons prep rest))) + (error 'clsql:sql-user-error + :message + (format nil + "Duplicate OF or IN iteration path: ~S." + (cons prep rest)))) (setq in-phrase rest)) ((:from) (when from-phrase - (ansi-loop::loop-error - "Duplicate FROM iteration path: ~S." (cons prep rest))) + (error 'clsql:sql-user-error + :message + (format nil + "Duplicate FROM iteration path: ~S." + (cons prep rest)))) (setq from-phrase rest)) (t - (ansi-loop::loop-error - "Unknown preposition: ~S." prep)))) + (error 'clsql:sql-user-error + :message + (format nil"Unknown preposition: ~S." prep))))) (unless in-phrase - (ansi-loop::loop-error "Missing OF or IN iteration path.")) + (error 'clsql:sql-user-error + :message "Missing OF or IN iteration path.")) (unless from-phrase - (setq from-phrase '(clsql:*default-database*))) + (setq from-phrase '(*default-database*))) (unless (consp variable) (setq variable (list variable))) @@ -65,7 +76,7 @@ 'loop-record-result-)) (step-var (ansi-loop::loop-gentemp 'loop-record-step-))) `(((,variable nil ,@(and data-type (list data-type))) - (,result-var (clsql:query ,(first in-phrase))) + (,result-var (query ,(first in-phrase))) (,step-var nil)) () () @@ -86,7 +97,7 @@ (setq ,result-var (rest ,result-var)) nil)) (,variable ,step-var)))) - + ((consp variable) (let ((query-var (ansi-loop::loop-gentemp 'loop-record-)) (db-var (ansi-loop::loop-gentemp 'loop-record-database-)) @@ -94,43 +105,41 @@ 'loop-record-result-set-)) (step-var (ansi-loop::loop-gentemp 'loop-record-step-))) (push `(when ,result-set-var - (clsql:database-dump-result-set ,result-set-var ,db-var)) + (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) + (,result-set-var t) (,step-var nil)) ((multiple-value-bind (%rs %cols) - (clsql:database-query-result-set ,query-var ,db-var :result-types :auto) + (database-query-result-set ,query-var ,db-var :result-types :auto) (setq ,result-set-var %rs ,step-var (make-list %cols)))) () () - (not (clsql:database-store-next-row ,result-set-var ,db-var ,step-var)) + (not (database-store-next-row ,result-set-var ,db-var ,step-var)) (,variable ,step-var) (not ,result-set-var) () - (not (clsql:database-store-next-row ,result-set-var ,db-var ,step-var)) + (not (database-store-next-row ,result-set-var ,db-var ,step-var)) (,variable ,step-var))))))) -#+(or cmu scl sbcl openmcl allegro) +#+(or allegro clisp-aloop cmu openmcl sbcl scl) (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)) +(cl-user::define-loop-method (loop::record loop::records loop::tuple loop::tuples) + clsql-loop-method + (loop::in loop::of loop::from)) #+lispworks -(defun clsql-loop-method (method-name iter-var iter-var-data-type - prep-phrases inclusive? allowed-preps +(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) @@ -138,21 +147,26 @@ (loop for (prep . rest) in prep-phrases do (cond - ((or (eq prep 'in) (eq prep 'of)) + ((or (eq prep 'loop::in) (eq prep 'loop::of)) (when in-phrase - (error - "Duplicate OF or IN iteration path: ~S." (cons prep rest))) + (error 'clsql:sql-user-error + :message + (format nil "Duplicate OF or IN iteration path: ~S." + (cons prep rest)))) (setq in-phrase rest)) - ((eq prep 'from) + ((eq prep 'loop::from) (when from-phrase - (error - "Duplicate FROM iteration path: ~S." (cons prep rest))) + (error 'clsql:sql-user-error + :message + (format nil "Duplicate FROM iteration path: ~S." + (cons prep rest)))) (setq from-phrase rest)) (t - (error - "Unknown preposition: ~S." prep)))) + (error 'clsql:sql-user-error + :message (format nil "Unknown preposition: ~S." prep))))) (unless in-phrase - (error "Missing OF or IN iteration path.")) + (error 'clsql:sql-user-error + :message "Missing OF or IN iteration path.")) (unless from-phrase (setq from-phrase '(clsql:*default-database*))) @@ -195,7 +209,7 @@ () () ))) - + ((consp iter-var) (let ((query-var (gensym "LOOP-RECORD-")) (db-var (gensym "LOOP-RECORD-DATABASE-")) @@ -210,20 +224,25 @@ (,result-set-var nil) (,step-var nil)) `((multiple-value-bind (%rs %cols) - (clsql:database-query-result-set ,query-var ,db-var :result-types :auto) + (clsql-sys:database-query-result-set ,query-var ,db-var :result-types :auto) (setq ,result-set-var %rs ,step-var (make-list %cols)))) () () - `((unless (clsql:database-store-next-row ,result-set-var ,db-var ,step-var) + `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var) (when ,result-set-var - (clsql:database-dump-result-set ,result-set-var ,db-var)) + (clsql-sys:database-dump-result-set ,result-set-var ,db-var)) t)) `(,iter-var ,step-var) - `((unless (clsql:database-store-next-row ,result-set-var ,db-var ,step-var) + `((unless (clsql-sys:database-store-next-row ,result-set-var ,db-var ,step-var) (when ,result-set-var - (clsql:database-dump-result-set ,result-set-var ,db-var)) + (clsql-sys:database-dump-result-set ,result-set-var ,db-var)) t)) `(,iter-var ,step-var) () ())))))) + +#+clisp-aloop +(eval-when (:compile-toplevel :load-toplevel :execute) + (setq cl:*features* (delete :clisp-aloop cl:*features*))) +