X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/55f543faf8169dbf9da21f52ffb7442c7cb48bc0..d5fdd49e70b734b791eb907706f92da5775e2a8b:/src/parser/scanner-charbuf-impl.lisp diff --git a/src/parser/scanner-charbuf-impl.lisp b/src/parser/scanner-charbuf-impl.lisp index 86c4445..43d1f9f 100644 --- a/src/parser/scanner-charbuf-impl.lisp +++ b/src/parser/scanner-charbuf-impl.lisp @@ -107,10 +107,10 @@ Which leaves us with the need to determine whether there are outstanding captures. We simply maintain a counter, and rely on the client releasing - captured places properly when he's finished. In practice, this is usually - done using the `peek' parser macro so there isn't a problem.")) + captured places properly when they've finished. In practice, this is + usually done using the `peek' parser macro so there isn't a problem.")) -(export 'charbuf-scanner-place-p) +(export '(charbuf-scanner-place charbuf-scanner-place-p)) (defstruct charbuf-scanner-place "A captured place we can return to later. @@ -354,8 +354,9 @@ (defstruct (charbuf-slice (:constructor make-charbuf-slice - (buf &optional (start 0) %end - &aux (end (or %end (length buf)))))) + (buf + &optional (start 0) %end + &aux (end (or %end (length buf)))))) (buf nil :type (or charbuf (eql :eof)) :read-only t) (start 0 :type (and fixnum unsigned-byte) :read-only t) (end 0 :type (and fixnum unsigned-byte) :read-only t)) @@ -389,7 +390,7 @@ :index index)))) (last-link (charbuf-scanner-place-link place-b))) (flet ((bad () - (error "Incorrect places ~S and ~S to `scanner-interval'." + (error "Incorrect places ~S and ~S to `scanner-interval'" place-a place-b))) (do ((link (charbuf-scanner-place-link place-a) (charbuf-chain-link-next link))