From 478198368a09dcc3f8b079c89d22ac7bdd403179 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 30 Aug 2006 08:24:02 +0000 Subject: [PATCH] r11059: fix loop package on lispworks --- sql/loop-extension.lisp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sql/loop-extension.lisp b/sql/loop-extension.lisp index 3eb6182..98597a6 100644 --- a/sql/loop-extension.lisp +++ b/sql/loop-extension.lisp @@ -131,9 +131,11 @@ :preposition-groups '((:of :in) (:from)) :inclusive-permitted nil) + #+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 @@ -145,14 +147,14 @@ (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 '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 'clsql:sql-user-error :message @@ -222,18 +224,18 @@ (,result-set-var nil) (,step-var nil)) `((multiple-value-bind (%rs %cols) - (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 (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 - (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 (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 - (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) () -- 2.34.1