src/lexer-impl.lisp: Rename internal `skip-until' function.

This shouldn't have leaked.

diff --git a/doc/SYMBOLS b/doc/SYMBOLS
index 89723e727158c0b284459796e8615d53aa051516..45369ff07745e5464c80feab83daa44a95136fc7 100644 (file)
--- a/doc/SYMBOLS
+++ b/doc/SYMBOLS
@@ -472,7 +472,7 @@ lexer-proto.lisp
   lexer-error                                   function class
   must                                          parser
   scan-comment                                  function
   lexer-error                                   function class
   must                                          parser
   scan-comment                                  function

-  skip-until                                    function parser
+  skip-until                                    parser

   sod-token-scanner                             class
   syntax-error                                  function class
 
   sod-token-scanner                             class
   syntax-error                                  function class
 

diff --git a/src/lexer-impl.lisp b/src/lexer-impl.lisp
index 42370c06f91e144192096210008352b8c66334b1..ffd522feb7c5b1e749c2a4350727000fcbe6fe46 100644 (file)
--- a/src/lexer-impl.lisp
+++ b/src/lexer-impl.lisp
@@ -46,7 +46,7 @@ (defun show-char (char)
         (format nil "`~C'" char))
        (t (format nil "<~(~:C~)>" char))))
 
         (format nil "`~C'" char))
        (t (format nil "<~(~:C~)>" char))))
 

-(defun skip-until (scanner token-types &key keep-end)
+(defun %skip-until (scanner token-types &key keep-end)

   "This is the implementation of the `skip-until' parser."
   (do ((consumedp nil t))
       ((member (token-type scanner) token-types)
   "This is the implementation of the `skip-until' parser."
   (do ((consumedp nil t))
       ((member (token-type scanner) token-types)

diff --git a/src/lexer-proto.lisp b/src/lexer-proto.lisp
index d5f25fd5d9c5df5100895f546cfe5871d6b25978..22d61c01b26bb0e36bea923ce39eda64972d99ed 100644 (file)
--- a/src/lexer-proto.lisp
+++ b/src/lexer-proto.lisp
@@ -116,7 +116,7 @@ (defparse skip-until (:context (context token-scanner-context)
    discard it.  KEEP-END defaults to true if multiple TOKEN-TYPES are given;
    otherwise false.  If end-of-file is encountered then the indicator list is
    simply the list of TOKEN-TYPES; otherwise the result is `nil'."
    discard it.  KEEP-END defaults to true if multiple TOKEN-TYPES are given;
    otherwise false.  If end-of-file is encountered then the indicator list is
    simply the list of TOKEN-TYPES; otherwise the result is `nil'."

-  `(skip-until ,(parser-scanner context)
+  `(%skip-until ,(parser-scanner context)

               (list ,@token-types)
               :keep-end ,(if keep-end-p keep-end
                              (> (length token-types) 1))))
               (list ,@token-types)
               :keep-end ,(if keep-end-p keep-end
                              (> (length token-types) 1))))