Commit 24bd7c762df20410681ab5c2229dbecf0f4d625a
2017-02-09T10:55:15
Fix lexer.
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
diff --git a/parser.lisp b/parser.lisp
index 13396e6..9739478 100644
--- a/parser.lisp
+++ b/parser.lisp
@@ -118,9 +118,11 @@
(let* ((length (- end start))
(s (make-string length)))
(labels ((at (i j)
- (unless (= length j)
- (setf (char s j) (code-char (aref ib i)))
- (at (1+ i) (1+ j)))))
+ (let ((ib-char (aref ib i)))
+ (unless (or (= length j)
+ (= ib-char -1))
+ (setf (char s j) (code-char ib-char))
+ (at (1+ i) (1+ j))))))
(at start 0))))
(defmethod ib-push-extend ((p parser) (c fixnum))
@@ -191,7 +193,7 @@
(defmethod make-token ((p parser) (class symbol) &rest initargs)
(let ((pt (pop-token p)))
- (apply #'make-instance
+ (apply #'make-instance class
:string (token-string pt)
:line (token-line pt)
:character (token-character pt)
@@ -310,9 +312,14 @@
;; Productions
-(defmethod match-comment ((p parser))
- (when (match p "/*")
- (match-until p "*/")))
+(defclass comment-token (token) ())
+
+(defmethod comment-token ((p parser))
+ (push-token p)
+ (if (match p "/*")
+ (progn (match-until p "*/")
+ (make-token p 'comment-token))
+ (discard-token p)))
(defmethod match-newline ((p parser))
(or (match p #\Newline)
@@ -748,8 +755,7 @@
(number-token p)
(comma-token p)
(cdc-token p)
- (and (match-comment p)
- (consume-token p))
+ (comment-token p)
(colon-token p)
(semicolon-token p)
(cdo-token p)
@@ -792,7 +798,7 @@
;; Tests
#+test
-(lex-string "/* hello comment world */")
+(lex-string "/* hello world */ body { color: #ff0000; }")
;; Parsing