Commit 927e5709a8b10ce2039837de5a64ed1545021e14
2018-06-15T10:49:44
use super-stream, rename accessors
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
diff --git a/package.lisp b/package.lisp
index a72cd34..1d8dbc3 100644
--- a/package.lisp
+++ b/package.lisp
@@ -27,12 +27,12 @@
#:discard-token
#:lexer
#:lexer-buffer
+ #:lexer-character
#:lexer-eof-p
- #:lexer-in-character
- #:lexer-in-eof
- #:lexer-in-line
#:lexer-input
+ #:lexer-input-ended
#:lexer-input-n
+ #:lexer-line
#:lexer-match-char
#:lexer-match-start
#:lexer-token
diff --git a/token-stream.lisp b/token-stream.lisp
index 70589f4..1e0dffd 100644
--- a/token-stream.lisp
+++ b/token-stream.lisp
@@ -43,20 +43,18 @@
:adjustable t
:fill-pointer 0))
-(defclass lexer (input-stream)
- ((in :initarg :stream
- :reader lexer-in
- :type input-stream)
- (in-line :initarg :line
+(defclass lexer (super-stream input-stream)
+ ((line :initarg :line
:initform 0
- :accessor lexer-in-line
+ :accessor lexer-line
:type fixnum)
- (in-character :initarg :character
+ (character :initarg :character
:initform -1
- :accessor lexer-in-character
+ :accessor lexer-character
:type fixnum)
- (in-eof :initform nil
- :accessor lexer-in-eof)
+ (input-ended :initform nil
+ :accessor lexer-input-ended
+ :type boolean)
(buffer :initform (make-buffer)
:accessor lexer-buffer
:type string)
@@ -127,18 +125,12 @@ stack."))
;; Stream methods
-(defmethod stream-close ((lx lexer))
- (stream-close (lexer-in lx)))
-
(defmethod stream-element-type ((lx lexer))
'token)
-(defmethod stream-open-p ((lx lexer))
- (stream-open-p (lexer-in lx)))
-
;; Input
-(defmethod lexer-push-extend ((lx lexer) (c character))
+(defmethod lexer-push-extend ((lx lexer) item)
(let* ((buffer (lexer-buffer lx))
(fp (the fixnum (fill-pointer buffer)))
(new-fp (1+ fp)))
@@ -149,27 +141,27 @@ stack."))
(setf (lexer-buffer lx) new-buffer))
(setf (fill-pointer buffer) new-fp))
(locally (declare (optimize (safety 0)))
- (setf (char buffer fp) c))
+ (setf (aref buffer fp) item))
fp))
(defmethod lexer-input ((lx lexer))
- (let ((in (lexer-in lx)))
- (multiple-value-bind (c state) (stream-read in)
+ (let ((in (stream-underlying-stream lx)))
+ (multiple-value-bind (item state) (stream-read in)
(ecase state
- ((nil) (let* ((pos (the fixnum (lexer-push-extend lx c)))
+ ((nil) (let* ((pos (the fixnum (lexer-push-extend lx item)))
(buf (lexer-buffer lx)))
- (declare (type (vector character) buf))
- (cond ((or (and (char= #\Newline c)
+ (declare (type vector buf))
+ (cond ((or (and (char= #\Newline item)
(or (not (< 0 pos))
(char/= #\Return
(char buf (1- pos)))))
- (char= #\Return c))
- (setf (lexer-in-character lx) 0)
- (incf (the fixnum (lexer-in-line lx))))
+ (char= #\Return item))
+ (setf (lexer-character lx) 0)
+ (incf (the fixnum (lexer-line lx))))
(t
- (incf (the fixnum (lexer-in-character lx)))))
- (values c nil)))
- ((:eof) (setf (lexer-in-eof lx) t)
+ (incf (the fixnum (lexer-character lx)))))
+ (values item nil)))
+ ((:eof) (setf (lexer-input-ended lx) t)
(values nil :eof))
((:non-blocking)
(signal (make-condition 'non-blocking :stream lx)))))))
@@ -186,7 +178,7 @@ stack."))
(let ((length (- (the fixnum (fill-pointer (lexer-buffer lx)))
(the fixnum (lexer-match-start lx)))))
(declare (type fixnum length))
- (when (lexer-in-eof lx)
+ (when (lexer-input-ended lx)
(if (= 0 length)
(signal (make-instance 'end-of-file :stream lx))
(return)))
@@ -272,7 +264,7 @@ stack."))
(let ((match (match lx s)))
(when match
(return match)))
- (when (lexer-in-eof lx)
+ (when (lexer-input-ended lx)
(return))
(lexer-input lx)
(incf (the fixnum (lexer-match-start lx)))))
@@ -284,7 +276,7 @@ stack."))
(defmethod match-not ((lx lexer) (f function))
(let ((match-start (lexer-match-start lx)))
(cond ((or (funcall f lx)
- (lexer-in-eof lx))
+ (lexer-input-ended lx))
(setf (lexer-match-start lx) match-start)
nil)
(t