(SETF CHAR) and move string related code to string.lisp

[jscl.git] / src / utils.lisp

diff --git a/src/utils.lisp b/src/utils.lisp
index 31afe28..f6d8120 100644 (file)
--- a/src/utils.lisp
+++ b/src/utils.lisp
@@ -3,20 +3,21 @@
 ;; Copyright (C) 2012, 2013 David Vazquez
 ;; Copyright (C) 2012 Raimon Grau
 
-;; This program is free software: you can redistribute it and/or
+;; JSCL is free software: you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation, either version 3 of the
 ;; License, or (at your option) any later version.
 ;;
-;; This program is distributed in the hope that it will be useful, but
+;; JSCL is distributed in the hope that it will be useful, but
 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
 
-(defvar *newline* (string (code-char 10)))
+(defvar *newline* "
+")
 
 (defmacro concatf (variable &body form)
   `(setq ,variable (concat ,variable (progn ,@form))))
@@ -37,15 +38,9 @@
 
 ;;; Concatenate a list of strings, with a separator
 (defun join (list &optional (separator ""))
-  (cond
-    ((null list)
-     "")
-    ((null (cdr list))
-     (car list))
-    (t
-     (concat (car list)
-             separator
-             (join (cdr list) separator)))))
+  (!reduce (lambda (s o) (concat s separator o))  
+           (cdr list) 
+           :initial-value (car list))) 
 
 (defun join-trailing (list &optional (separator ""))
   (if (null list)
@@ -85,3 +80,7 @@
          (setq x (truncate x 10)))
        (mapconcat (lambda (x) (string (digit-char x)))
                  digits)))))
+
+(defun float-to-string (x)
+  #+jscl (float-to-string x)
+  #+common-lisp (format nil "~f" x))