Changeset main,6

Timestamp:

07/15/2008 03:19:20 PM (4 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tags

revision id:

dsowen@fugue88.ws-20080715211920-1u7y8ssyhehgo7el

Message:

Don't create scanners at runtime

File:

• main/tags.lisp (modified) (3 diffs)

main/tags.lisp

@@ -40 +40 @@
     (cl-ppcre:regex-replace-all set str #'f)))
 
-(defun xml-escape-pcdata (str)
-  (xml-escape "[<>&]" str))
+(let ((scanner (create-scanner "[<>&]")))
+  (defun xml-escape-pcdata (str)
+    (xml-escape scanner str)))
 
-(defun xml-escape-attr (str)
-  (xml-escape "['\"]" str))
+(let ((scanner (create-scanner "['\"]")))
+  (defun xml-escape-attr (str)
+    (xml-escape scanner str)))
 
 
@@ -72 +74 @@
       (values name b (nreverse args)))))
 
+(defparameter *nbsp-scanner* (cl-ppcre:create-scanner "([^ ])  ([^ ])"))
+
 (defun do-body (body)
   (do ((item #1=(pop body) #1#))
@@ -78 +82 @@
       (string
        (format *tag-out* "~A"
-               (regex-replace-all "([^ ])  ([^ ])"
+               (regex-replace-all *nbsp-scanner*
                                   (xml-escape-pcdata item)
                                   "\\1&nbsp; \\2")))