Commit 0d784ef10437ecceebb751da1f23b65db3c376e4
2017-06-21T11:13:05
untabify
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243
diff --git a/template.lisp b/template.lisp
index e2b9914..9103bad 100644
--- a/template.lisp
+++ b/template.lisp
@@ -49,32 +49,32 @@
(defun template-var-p (var)
(and (symbolp var)
(eq (symbol-package var)
- (find-package *template-vars-package*))))
+ (find-package *template-vars-package*))))
(defmacro template-let (bindings &body body)
"By default bind to an existing variable."
(let ((bindings (mapcar (lambda (b)
- (if (consp b)
- b
- (list b b)))
- bindings)))
+ (if (consp b)
+ b
+ (list b b)))
+ bindings)))
`(let ,(mapcar (lambda (b) `(,(template-var-key (car b)) ,(cadr b)))
- bindings)
+ bindings)
(declare (special ,@(mapcar (lambda (b) (template-var-key (car b)))
- bindings)))
+ bindings)))
(symbol-macrolet ,(mapcar (lambda (b)
- `(,(car b) ,(template-var-key (car b))))
- bindings)
- ,@body))))
+ `(,(car b) ,(template-var-key (car b))))
+ bindings)
+ ,@body))))
(defmacro define-template-var (name &optional (value nil value-p) doc)
(let ((var (template-var-key name)))
(if value-p
- `(defparameter ,var ,value ,@(when doc `(,doc)))
- (if doc
- `(progn (defvar ,var)
- (setf (documentation ',var t) ,doc))
- `(defvar ,var)))))
+ `(defparameter ,var ,value ,@(when doc `(,doc)))
+ (if doc
+ `(progn (defvar ,var)
+ (setf (documentation ',var t) ,doc))
+ `(defvar ,var)))))
;; Template reader
@@ -84,36 +84,36 @@
(defvar *writing*)
(flet ((read-plain (stream &optional char)
- (declare (ignore char))
- (let ((plain (with-output-to-string (out)
- (loop for c = (peek-char nil stream nil #\« t)
- until (char= #\« c)
- do (write-char (read-char stream) out)))))
- (when (and *nested*
- (char= #\« (peek-char nil stream nil #\Z t)))
- (read-char stream t nil t)
- (unless (char= #\Space (peek-char nil stream t nil t))
- (unread-char #\« stream)))
- (unless (= 0 (length plain))
- (if *writing*
- plain
- `(write-string ,plain *template-output*)))))
+ (declare (ignore char))
+ (let ((plain (with-output-to-string (out)
+ (loop for c = (peek-char nil stream nil #\« t)
+ until (char= #\« c)
+ do (write-char (read-char stream) out)))))
+ (when (and *nested*
+ (char= #\« (peek-char nil stream nil #\Z t)))
+ (read-char stream t nil t)
+ (unless (char= #\Space (peek-char nil stream t nil t))
+ (unread-char #\« stream)))
+ (unless (= 0 (length plain))
+ (if *writing*
+ plain
+ `(write-string ,plain *template-output*)))))
(read-var (stream char)
- (let ((var (let ((*package* *template-vars-package*))
- (read stream))))
- (assert (eq *template-vars-package* (symbol-package var)))
- (ecase char
- ( #\$ (car (push (the symbol var) *template-vars*))))))
+ (let ((var (let ((*package* *template-vars-package*))
+ (read stream))))
+ (assert (eq *template-vars-package* (symbol-package var)))
+ (ecase char
+ ( #\$ (car (push (the symbol var) *template-vars*))))))
(dispatch-template-eval (stream c n)
- (declare (ignore c n))
- (assert (not *nested*) nil "Template parse error: Nested « ")
- (let ((*nested* t)) (read stream t nil t)))
+ (declare (ignore c n))
+ (assert (not *nested*) nil "Template parse error: Nested « ")
+ (let ((*nested* t)) (read stream t nil t)))
(dispatch-template-eval-print (stream c n)
- (declare (ignore c n))
- (assert (not *writing*) () "Template parse error: Nested «=")
- (let ((*nested* t)
- (*writing* t))
- `(write-string (str ,(read stream t nil t)) *template-output*))))
+ (declare (ignore c n))
+ (assert (not *writing*) () "Template parse error: Nested «=")
+ (let ((*nested* t)
+ (*writing* t))
+ `(write-string (str ,(read stream t nil t)) *template-output*))))
(let ((rt (copy-readtable nil)))
(make-dispatch-macro-character #\« t rt)
(set-dispatch-macro-character #\« #\Space #'dispatch-template-eval rt)
@@ -123,12 +123,12 @@
(defun read-template (stream)
(let ((*readtable* (copy-readtable rt))
- (*nested* nil)
- (*writing* nil)
- (*template-vars* nil))
- (loop while (peek-char nil stream nil)
- for item = (read-plain stream) then (read stream)
- when item collect item)))))
+ (*nested* nil)
+ (*writing* nil)
+ (*template-vars* nil))
+ (loop while (peek-char nil stream nil)
+ for item = (read-plain stream) then (read stream)
+ when item collect item)))))
(defun read-template-from-string (string)
(with-input-from-string (s string)
@@ -136,8 +136,8 @@
(defun read-template-from-file (path)
(with-open-file (stream path
- :element-type 'character
- :external-format :utf-8)
+ :element-type 'character
+ :external-format :utf-8)
(read-template stream)))
;; Compilation
@@ -145,40 +145,40 @@
(defmacro do-tree ((var tree) &body body)
(let ((walk (gensym "WALK-")))
`(labels ((,walk (,var)
- (if (consp ,var)
- (progn (,walk (car ,var))
- (,walk (cdr ,var)))
- (progn ,@body))))
+ (if (consp ,var)
+ (progn (,walk (car ,var))
+ (,walk (cdr ,var)))
+ (progn ,@body))))
(,walk ,tree))))
(defun collect-vars (sexp)
(let (vars)
(do-tree (x sexp)
(when (and (symbolp x) (eq *template-vars-package* (symbol-package x)))
- (pushnew x vars :test #'eq)))
+ (pushnew x vars :test #'eq)))
(nreverse vars)))
(defun template-printer-code (template)
(let ((vars))
(labels ((walk (x)
- (if (consp x)
- (cons (walk (car x)) (walk (cdr x)))
- (if (template-var-p x)
- (let ((g (assoc x vars)))
- (if g
- (cdr g)
- (cdar (push (cons x (gensym (symbol-name x)))
- vars))))
- x))))
+ (if (consp x)
+ (cons (walk (car x)) (walk (cdr x)))
+ (if (template-var-p x)
+ (let ((g (assoc x vars)))
+ (if g
+ (cdr g)
+ (cdar (push (cons x (gensym (symbol-name x)))
+ vars))))
+ x))))
(let ((body (walk template)))
- `(lambda ()
- ,@(if vars
- `((let ,(mapcar (lambda (var)
- `(,(cdr var) (when (boundp ',(car var))
- (symbol-value ',(car var)))))
- vars)
- ,@body))
- body))))))
+ `(lambda ()
+ ,@(if vars
+ `((let ,(mapcar (lambda (var)
+ `(,(cdr var) (when (boundp ',(car var))
+ (symbol-value ',(car var)))))
+ vars)
+ ,@body))
+ body))))))
#+nil
(template-printer-code (read-template-from-string "plop«= $abc »"))
@@ -200,22 +200,22 @@
(defun compile-template-from-file (path)
(let ((found #1=(gethash path *template-cache*)))
(if (and found
- (= (car found) #2=(file-write-date path)))
- (cdr found)
- (let ((template (compile-template (read-template-from-file path))))
- (format t "~&;; Compiling template ~S~%" path)
- (if found
- (setf (car found) #2#
- (cdr found) template)
- (setf #1# (cons #2# template)))
- template))))
+ (= (car found) #2=(file-write-date path)))
+ (cdr found)
+ (let ((template (compile-template (read-template-from-file path))))
+ (format t "~&;; Compiling template ~S~%" path)
+ (if found
+ (setf (car found) #2#
+ (cdr found) template)
+ (setf #1# (cons #2# template)))
+ template))))
;; Print template
(defun print-template (template)
(funcall (etypecase template
- (pathname (compile-template-from-file template))
- (string (compile-template (read-template-from-string template))))))
+ (pathname (compile-template-from-file template))
+ (string (compile-template (read-template-from-string template))))))
(define-compiler-macro print-template (&whole form template)
(if (stringp template)