X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..e4af0384a9d904782ddb865afc90fb8a9703615c:/src/parser/scanner-token-impl.lisp

diff --git a/src/parser/scanner-token-impl.lisp b/src/parser/scanner-token-impl.lisp
index 8ab427a..7713ec9 100644
--- a/src/parser/scanner-token-impl.lisp
+++ b/src/parser/scanner-token-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
@@ -39,11 +39,11 @@
   (scanner-step scanner))
 
 (defmethod scanner-at-eof-p ((scanner token-scanner))
-  (with-slots (type) scanner
+  (with-slots ((type %type)) scanner
     (eq type :eof)))
 
 (defmethod scanner-step ((scanner token-scanner))
-  (with-slots (type value tail captures line column) scanner
+  (with-slots ((type %type) value tail captures line column) scanner
     (acond ((and tail (token-scanner-place-next tail))
 	    (setf type (token-scanner-place-type it)
 		  value (token-scanner-place-value it)
@@ -64,7 +64,7 @@
 		  (setf tail nil)))))))
 
 (defmethod scanner-capture-place ((scanner token-scanner))
-  (with-slots (type value captures tail line column) scanner
+  (with-slots ((type %type) value captures tail line column) scanner
     (incf captures)
     (or tail
 	(setf tail (make-token-scanner-place :scanner scanner
@@ -72,7 +72,7 @@
 					     :line line :column column)))))
 
 (defmethod scanner-restore-place ((scanner token-scanner) place)
-  (with-slots (type value tail line column) scanner
+  (with-slots ((type %type) value tail line column) scanner
     (setf type (token-scanner-place-type place)
 	  value (token-scanner-place-value place)
 	  line (token-scanner-place-line place)