Merge branch 'master' into doc

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

diff --git a/src/parser/scanner-impl.lisp b/src/parser/scanner-impl.lisp
index aa8a98a..4909be9 100644 (file)
--- a/src/parser/scanner-impl.lisp
+++ b/src/parser/scanner-impl.lisp
@@ -31,6 +31,9 @@
 (defmethod file-location ((scanner character-scanner))
   (scanner-file-location scanner))
 
 (defmethod file-location ((scanner character-scanner))
   (scanner-file-location scanner))
 

+(defmethod file-location ((scanner token-scanner))
+  (scanner-file-location scanner))
+

 ;;;--------------------------------------------------------------------------
 ;;; Streams on character scanners.
 
 ;;;--------------------------------------------------------------------------
 ;;; Streams on character scanners.
 


@@ -59,12 +62,15 @@
 (defstruct (string-scanner
             (:constructor make-string-scanner
                 (string &key (start 0) end
 (defstruct (string-scanner
             (:constructor make-string-scanner
                 (string &key (start 0) end

-                 &aux (index start)
+                 &aux (%string string)
+                      (index start)

                       (limit (or end (length string))))))
   "Scanner structure for a simple string scanner."
                       (limit (or end (length string))))))
   "Scanner structure for a simple string scanner."

-  (string "" :type string :read-only t)
+  (%string "" :type string :read-only t)

   (index 0 :type (and fixnum unsigned-byte))
   (limit nil :type (and fixnum unsigned-byte) :read-only t))
   (index 0 :type (and fixnum unsigned-byte))
   (limit nil :type (and fixnum unsigned-byte) :read-only t))

+(define-access-wrapper string-scanner-string string-scanner-%string
+                      :read-only t)

 
 (defmethod scanner-at-eof-p ((scanner string-scanner))
   (>= (string-scanner-index scanner) (string-scanner-limit scanner)))
 
 (defmethod scanner-at-eof-p ((scanner string-scanner))
   (>= (string-scanner-index scanner) (string-scanner-limit scanner)))


@@ -83,21 +89,25 @@
 
 (defmethod scanner-interval
     ((scanner string-scanner) place-a &optional place-b)
 
 (defmethod scanner-interval
     ((scanner string-scanner) place-a &optional place-b)

-  (with-slots (string index) scanner
+  (with-slots ((string %string) index) scanner

     (subseq string place-a (or place-b index))))
 
     (subseq string place-a (or place-b index))))
 

+(defmethod make-scanner-stream ((scanner string-scanner))
+  (make-instance 'character-scanner-stream :scanner scanner))
+

 ;;;--------------------------------------------------------------------------
 ;;; List scanner.
 
 ;;;--------------------------------------------------------------------------
 ;;; List scanner.
 

-(export 'list-scanner)
+(export '(list-scanner list-scanner-p make-list-scanner))

 (defstruct (list-scanner
 (defstruct (list-scanner

-            (:constructor make-list-scanner (list)))
+            (:constructor make-list-scanner (list &aux (%list list))))

   "Simple token scanner for lists.
 
    The list elements are the token semantic values; the token types are the
    names of the elements' classes.  This is just about adequate for testing
    purposes, but is far from ideal for real use."
   "Simple token scanner for lists.
 
    The list elements are the token semantic values; the token types are the
    names of the elements' classes.  This is just about adequate for testing
    purposes, but is far from ideal for real use."

-  (list nil :type list))
+  (%list nil :type list))
+(define-access-wrapper list-scanner-list list-scanner-%list)

 
 (defmethod scanner-step ((scanner list-scanner))
   (pop (list-scanner-list scanner)))
 
 (defmethod scanner-step ((scanner list-scanner))
   (pop (list-scanner-list scanner)))