configure.ac, doc/Makefile.am: Ship the bibliography style.

[sod] / src / parser / parser-impl.lisp

diff --git a/src/parser/parser-impl.lisp b/src/parser/parser-impl.lisp
index 0a7d667e1f44635d54ef9ea250d1c874a1adf00e..3027ddd9b93a1a3d5850953b7e585fb8897b10ae 100644 (file)
--- a/src/parser/parser-impl.lisp
+++ b/src/parser/parser-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
 
 ;;;----- 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
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by


@@ -129,12 +129,12 @@ (defmethod parser-places-must-be-released-p ((context list-parser)) nil)
 
 (export 'string-parser)
 (defclass string-parser (character-parser-context)
 
 (export 'string-parser)
 (defclass string-parser (character-parser-context)

-  ((string :initarg :string :reader parser-string)
+  ((%string :initarg :string :reader parser-string)

    (index :initarg :index :initform 0 :reader parser-index)
    (index :initarg :index :initform 0 :reader parser-index)

-   (length :initform (gensym "LEN-") :reader parser-length)))
+   (%length :initform (gensym "LEN-") :reader parser-length)))

 
 (defmethod wrap-parser ((context string-parser) form)
 
 (defmethod wrap-parser ((context string-parser) form)

-  (with-slots (string index length) context
+  (with-slots ((string %string) index (length %length)) context

     `(let* (,@(unless (symbolp string)
                (let ((s string))
                  (setf string (gensym "STRING-"))
     `(let* (,@(unless (symbolp string)
                (let ((s string))
                  (setf string (gensym "STRING-"))