From b9dc8d1a007860c938ab98e26771d3c3a60e76f5 Mon Sep 17 00:00:00 2001 From: Vladimir Sedach Date: Wed, 25 Aug 2010 00:56:04 -0400 Subject: [PATCH] Rename stringify to str (clojure influence). --- src/deprecated-interface.lisp | 6 +++--- src/lib/ps-html.lisp | 6 +++--- src/macros.lisp | 4 ++-- src/package.lisp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/deprecated-interface.lisp b/src/deprecated-interface.lisp index e95e68e..749f000 100644 --- a/src/deprecated-interface.lisp +++ b/src/deprecated-interface.lisp @@ -79,7 +79,7 @@ is output to the OUTPUT-STREAM stream." (defpsmacro-deprecated === eql) (defpsmacro-deprecated == equal) (defpsmacro-deprecated % rem) -(defpsmacro-deprecated concat-string stringify) +(defpsmacro-deprecated concat-string str) (defpsmacro !== (&rest args) (warn-deprecated '!==) @@ -98,5 +98,5 @@ is output to the OUTPUT-STREAM stream." `(set-timeout (lambda () ,@body) ,timeout)) (defun concat-string (&rest things) - (warn-deprecated 'concat-string 'stringify) - (apply #'stringify things)) + (warn-deprecated 'concat-string 'str) + (apply #'str things)) diff --git a/src/lib/ps-html.lisp b/src/lib/ps-html.lisp index 63da789..6f3587a 100644 --- a/src/lib/ps-html.lisp +++ b/src/lib/ps-html.lisp @@ -40,7 +40,7 @@ attr-val (pop attrs)) (if attr-test (push `(if ,attr-test - (stringify ,(format nil " ~A=\"" attr-name) ,attr-val "\"") + (str ,(format nil " ~A=\"" attr-name) ,attr-val "\"") "") r) (progn @@ -96,7 +96,7 @@ (concat-constant-strings (reverse r))))) (defmacro+ps ps-html (&rest html-forms) - `(stringify ,@(process-html-forms-lhtml html-forms))) + `(str ,@(process-html-forms-lhtml html-forms))) (defmacro+ps who-ps-html (&rest html-forms) - `(stringify ,@(process-html-forms-cl-who html-forms))) + `(str ,@(process-html-forms-cl-who html-forms))) diff --git a/src/macros.lisp b/src/macros.lisp index 436a6a8..d2492ac 100644 --- a/src/macros.lisp +++ b/src/macros.lisp @@ -400,11 +400,11 @@ lambda-list::= (assert (equal result-type ''string) () "Right now Parenscript 'concatenate' only support strings.") (cons '+ sequences)) -(defun stringify (&rest things) +(defun str (&rest things) "Like concatenate but prints all of its arguments." (format nil "~{~A~}" things)) -(defpsmacro stringify (&rest things) +(defpsmacro str (&rest things) (if (and (= (length things) 1) (stringp (car things))) (car things) `((@ (list ,@things) :join) ""))) diff --git a/src/package.lisp b/src/package.lisp index a67a97f..90a4bbc 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -251,7 +251,7 @@ #:random #:ignore-errors #:concatenate - #:stringify + #:str #:length #:defined #:undefined -- 2.11.4.GIT