new file mode 100644

@@ -0,0 +1,30 @@

+Copyright (c) 2016 Edward Langley

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+Redistributions of source code must retain the above copyright notice,

+this list of conditions and the following disclaimer.

+

+Redistributions in binary form must reproduce the above copyright

+notice, this list of conditions and the following disclaimer in the

+documentation and/or other materials provided with the distribution.

+

+Neither the name of the project's author nor the names of its

+contributors may be used to endorse or promote products derived from

+this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES  INCLUDING, BUT NOT LIMITED

+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

@@ -6,13 +6,21 @@ A simple package implementing a DSL for generating format strings.

 # Introduction

+## Hello World

+

+```lisp

+CL-USER> (define-message hello (name)

+           "Hello " :str)

+CL-USER> (hello "world")

+Hello world

+NIL

+```

+

 ```lisp

 (make-format-string '(:str)) #| ==> "~a" |#

 (make-format-string '((:map () :str))) #| ==> "~{~a~}" |#

-(define-message hello (name)

-  "Hello " :str)

 (define-message print-comma-separated (values)

   (:map () :str))

@@ -1,7 +1,7 @@

 ;;;; format-string-builder.asd

 (asdf:defsystem #:format-string-builder

-  :description "Describe format-string-builder here"

+  :description "A DSL wrapping cl:format's syntax with something more lispy."

   :author "fiddlerwoaroof"

   :license "MIT"

   :depends-on (:alexandria

@@ -87,9 +87,6 @@

       (null "")

       (t modifier))))

-(#-dev defvar

- #+dev defparameter *format-string-registry* (make-hash-table))

-

 (defun generate-function-defs ()

   (loop for name being the hash-keys in *format-string-registry* using (hash-value spec)

         collect `(,name (&key colon-p at-p)

@@ -105,24 +102,28 @@

      (setf (contents command) (mapcar #'form-step contents))

      command)))

-(defun form-step (form)

-  (flet ((dispatch-keyword (keyword &optional args)

-           (if-let ((spec (gethash keyword *format-string-registry*)))

-             (let ((result (apply #'make-instance spec)))

-               (when args

-                 (dispatch-command result args))

-               result))))

-    (etypecase form

-      (list (cond ((null form) nil)

-                  ((keywordp (car form)) (dispatch-keyword (car form) (cdr form)))))

-      ((or character string) form)

-      (keyword (dispatch-keyword form)))))

-

-(defun make-format-string (forms)

-  (with-output-to-string (*format-stream*)

-    (print-format-representation

-      (mapcar #'form-step (macroexpand forms))

-      *format-stream*)))

+(eval-when (:compile-toplevel :load-toplevel :execute)

+  (#-dev defvar #+dev defparameter

+	 *format-string-registry* (make-hash-table))

+

+  (defun form-step (form)

+    (flet ((dispatch-keyword (keyword &optional args)

+	     (if-let ((spec (gethash keyword *format-string-registry*)))

+	       (let ((result (apply #'make-instance spec)))

+		 (when args

+		   (dispatch-command result args))

+		 result))))

+      (etypecase form

+	(list (cond ((null form) nil)

+		    ((keywordp (car form)) (dispatch-keyword (car form) (cdr form)))))

+	((or character string) form)

+	(keyword (dispatch-keyword form)))))

+

+  (defun make-format-string (forms)

+    (with-output-to-string (*format-stream*)

+      (print-format-representation

+       (mapcar #'form-step (macroexpand forms))

+       *format-stream*))))

 (defun define-simple-format-char (name format-char &key at-p colon-p)

   (setf (gethash (intern (string name) :keyword)

@@ -257,9 +258,11 @@ spec passed as the body."

     (:ensure-line (#\&))

     (:new-line (#\%))))

-(define-message hello (stream name)

-  (:titlecase () "hello" #\space :str))

+#+null

+(progn

+  (define-message hello (stream name)

+    (:titlecase () "hello" #\space :str))

-(define-message print-comma-separated (stream)

-  (:own-line ()

-   (:rest () :str :exit ", ")))

+  (define-message print-comma-separated (stream)

+    (:own-line ()

+	       (:rest () :str :exit ", "))))

@@ -2,7 +2,7 @@

 (defpackage #:format-string-builder

   (:use #:cl #:alexandria)

-  (:import #:serapeum #:intersperse #:op)

+  (:import-from #:serapeum #:intersperse #:op)

   (:export #:make-format-string

            #:define-message))