From f922392341133cb3386ff75bb2ee096dd6d53081 Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Fri, 26 Dec 2014 22:13:25 +0100 Subject: [PATCH] Simplify some loop constructs, per stassats gripe. --- src/parsers/command-parser.lisp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/parsers/command-parser.lisp b/src/parsers/command-parser.lisp index 4a31c1d..766048b 100644 --- a/src/parsers/command-parser.lisp +++ b/src/parsers/command-parser.lisp @@ -40,8 +40,8 @@ (typep s-exp 'fixed-connection)) (slot-boundp s-exp 'specs) (eq :inline (first (csv-specs s-exp)))) - :collect (progn (setf (second (csv-specs s-exp)) position) - s-exp) + :do (setf (second (csv-specs s-exp)) position) + :and :collect s-exp :else :collect (if (and (consp s-exp) (listp (cdr s-exp))) (inject-inline-data-position s-exp position) @@ -60,12 +60,11 @@ ((and (typep s-exp 'fd-connection) (slot-boundp s-exp 'pgloader.connection::path)) - (if (uiop:relative-pathname-p (fd-path s-exp)) - (progn (setf (fd-path s-exp) - (uiop:merge-pathnames* (fd-path s-exp) - filename)) - s-exp) - s-exp)) + (when (uiop:relative-pathname-p (fd-path s-exp)) + (setf (fd-path s-exp) + (uiop:merge-pathnames* (fd-path s-exp) + filename))) + s-exp) ((and (or (typep s-exp 'csv-connection) (typep s-exp 'fixed-connection))