X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..9e41cce7de76880e0e61905fb37100e3fade84e7:/src/parser/scanner-charbuf-impl.lisp?ds=sidebyside diff --git a/src/parser/scanner-charbuf-impl.lisp b/src/parser/scanner-charbuf-impl.lisp index 272c7ed..1919b69 100644 --- a/src/parser/scanner-charbuf-impl.lisp +++ b/src/parser/scanner-charbuf-impl.lisp @@ -60,31 +60,12 @@ (buf nil :type (or charbuf (member nil :eof)) :read-only t) (size 0 :type charbuf-index :read-only t)) -(export 'charbuf-scanner-place-p) -(defstruct charbuf-scanner-place - "A captured place we can return to later. - - We remember the buffer-chain link, so that we can retrace our steps up to - the present. We also need the index at which we continue reading - characters; and the line and column numbers to resume from." - (scanner nil :type charbuf-scanner :read-only t) - (link nil :type charbuf-chain-link :read-only t) - (index 0 :type charbuf-index :read-only t) - (line 0 :type fixnum :read-only t) - (column 0 :type fixnum :read-only t)) - -(defmethod file-location ((place charbuf-scanner-place)) - (make-file-location (scanner-filename - (charbuf-scanner-place-scanner place)) - (charbuf-scanner-place-line place) - (charbuf-scanner-place-column place))) - ;;;-------------------------------------------------------------------------- ;;; Main class. (export 'charbuf-scanner) (defclass charbuf-scanner (character-scanner) - ((stream :initarg :stream :type stream) + ((%stream :initarg :stream :type stream) (buf :initform nil :type (or charbuf (member nil :eof))) (size :initform 0 :type (integer 0 #.charbuf-size)) (index :initform 0 :type (integer 0 #.charbuf-size)) @@ -129,6 +110,25 @@ captured places properly when he's finished. In practice, this is usually done using the `peek' parser macro so there isn't a problem.")) +(export 'charbuf-scanner-place-p) +(defstruct charbuf-scanner-place + "A captured place we can return to later. + + We remember the buffer-chain link, so that we can retrace our steps up to + the present. We also need the index at which we continue reading + characters; and the line and column numbers to resume from." + (scanner nil :type charbuf-scanner :read-only t) + (link nil :type charbuf-chain-link :read-only t) + (index 0 :type charbuf-index :read-only t) + (line 0 :type fixnum :read-only t) + (column 0 :type fixnum :read-only t)) + +(defmethod file-location ((place charbuf-scanner-place)) + (make-file-location (scanner-filename + (charbuf-scanner-place-scanner place)) + (charbuf-scanner-place-line place) + (charbuf-scanner-place-column place))) + ;;;-------------------------------------------------------------------------- ;;; Utilities. @@ -143,7 +143,7 @@ (if we're currently rewound) or with a new buffer from the stream.")) (defmethod charbuf-scanner-fetch ((scanner charbuf-scanner)) - (with-slots (stream buf size index tail captures) scanner + (with-slots ((stream %stream) buf size index tail captures) scanner (loop (acond @@ -254,7 +254,7 @@ ;; Grab the filename from the underlying stream if we don't have a better ;; guess. (default-slot (scanner 'filename slot-names) - (with-slots (stream) scanner + (with-slots ((stream %stream)) scanner (aif (stream-pathname stream) (namestring it) nil))) ;; Get ready with the first character.