From: David Vazquez <davazp@gmail.com>
Date: Wed, 26 Dec 2012 17:27:25 +0000 (+0000)
Subject: join and join-trailing accept optional argument
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=8eb087275657563dad1e433cd3c85b7c487380ab;p=jscl.git

join and join-trailing accept optional argument
---

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 12b3a69..79b9b6b 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -388,7 +388,7 @@
   (!reduce #'concat-two strs ""))
 
 ;;; Concatenate a list of strings, with a separator
-(defun join (list separator)
+(defun join (list &optional (separator ""))
   (cond
     ((null list)
      "")
@@ -399,7 +399,7 @@
              separator
              (join (cdr list) separator)))))
 
-(defun join-trailing (list separator)
+(defun join-trailing (list &optional (separator ""))
   (if (null list)
       ""
       (concat (car list) separator (join-trailing (cdr list) separator))))
@@ -738,7 +738,7 @@
                                                      (integer-to-string (+ idx n-required-arguments)) ":" *newline*
                                                      (lookup-variable-translation (car arg) new-env)
                                                      "="
-                                                     (ls-compile (cdr arg) new-env fenv)
+                                                     (ls-compile (cadr arg) new-env fenv)
                                                      ";" *newline*)
                                              cases)
                                        (incf idx)))