X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/6e5e19055a818fecda4d20672be221d43e627b3a..944bf9362ff51217b1617f85126d26e821b8aa91:/src/parser/scanner-charbuf-impl.lisp

diff --git a/src/parser/scanner-charbuf-impl.lisp b/src/parser/scanner-charbuf-impl.lisp
index f9cd792..43d1f9f 100644
--- a/src/parser/scanner-charbuf-impl.lisp
+++ b/src/parser/scanner-charbuf-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -67,8 +67,8 @@
 (defclass charbuf-scanner (character-scanner)
   ((%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))
+   (size :initform 0 :type charbuf-index)
+   (index :initform 0 :type charbuf-index)
    (captures :initform 0 :type (and fixnum unsigned-byte))
    (tail :initform nil :type (or charbuf-chain-link null))
    (unread :initform nil :type (or charbuf-chain-link nil))
@@ -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))