BUGFIX: haml-comment

src/cl-haml.lisp

@@ -90,7 +90,7 @@ Must accept a function designater which must be called with the lock hold.")
   (with-lock
     (maphash (lambda (key value)
                (declare (ignore value))
-               (when (type key 'pathname)
+               (when (typep key 'pathname)
                  (remhash key *functions*)))
              *functions*)))
 

src/cl-who-patch.lisp

@@ -1,7 +1,7 @@
 (in-package :cl-who)
 
 (defmethod convert-tag-to-string-list (tag attr-list body body-fn)
-  (declare (optimize speed space))
+  ;; (declare (optimize speed space))
   (let ((tag (string tag)))
     (nconc (when *indent*
              (list +newline+ (n-spaces *indent*)))

src/read-element.lisp

@@ -40,7 +40,7 @@
                                 (char= char #\:))
                       do (write-char (read-char stream) out)))
               :keyword)
-      (error "Type Error: Attribute key. [~S]" (read in))))
+      (error "Type Error: Attribute key. [~S]" (read stream))))
 
 
 (defun read-attributes (stream &optional (eof-error-p nil)

src/read-lisp-block.lisp

@@ -10,5 +10,5 @@
   (let ((line (read-line stream nil eof-value)))
     (list (if (or (eq line eof-value)
                   (zerop (length (string-trim *whitespace-chars* line))))
-              +haml-multiple-commen+
+              +haml-multiple-comment+
               +haml-line-comment+))))

src/specials.lisp

@@ -9,7 +9,7 @@
 (defconstant +lisp+   '+lisp+)
 (defconstant +haml+   '+haml+)
 (defconstant +haml-multiple-comment+ '+haml-multiple-comment+)
-(defconstant +haml-line-comment      '+haml-line-comment+)
+(defconstant +haml-line-comment+     '+haml-line-comment+)
 
 (defconstant +eof+ 'eof)
 

test/reader-test.lisp

@@ -19,8 +19,8 @@
         '(+haml+ (:|meta| :|http-equiv| "content-type" :|content| "text/html")))
     (is "%title Hello, world" +haml+ '(+haml+ (:|title| "Hello, world")))
     (is "%body.class1.class2{:class \"class3\"}" +haml+
-        '(+haml+ (:|body| :|class| "class1 class2 class3")))
-    (is "%h1#id2{:id \"id-x\"}" +haml+ '(+haml+ (:|h1| :|id| "id2")))
+        '(+haml+ (:|body| :|class| (.class "class1 class2" "class3"))))
+    (is "%h1#id2{:id \"id-x\"}" +haml+ '(+haml+ (:|h1| :|id| (.id "id2" "id-x"))))
     (is "%p{:id \"id-x\"}= (format nil \"Hello, World\")" +haml+
         '(+haml+ (:|p| :|id| "id-x"
                   (cl-who:str (format nil "Hello, World")))))

test/test-haml/test-01.haml

@@ -16,6 +16,11 @@
     %header
       %h1#id1.class1.class2{:class "class3"} This is Test!
 
+    -#
+      %div#id.class1.class2 Comment!
+      % Comment?
+      % Comment...
+
     %article#main
       %h2= (format nil "~{~A~^, ~}" '(hello world))
       %table{:border "1"}
@@ -29,6 +34,7 @@
             - dotimes (j 9)
               %td= (* (1+ i) (1+ j))
 
+    -# Comment!
     %footer
       %p
         Multiple line 1.
@@ -45,4 +51,4 @@
           - (oddp i)
             %p !!!
           - t
-            %p ???
+            %p ???