From: Mark Wooding Date: Thu, 26 May 2016 08:26:09 +0000 (+0100) Subject: src/lexer-impl.lisp: Rename internal `skip-until' function. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/0ad3667e905948b4bbade7a0da172c8cefcafad9 src/lexer-impl.lisp: Rename internal `skip-until' function. This shouldn't have leaked. --- diff --git a/doc/SYMBOLS b/doc/SYMBOLS index 89723e7..45369ff 100644 --- a/doc/SYMBOLS +++ b/doc/SYMBOLS @@ -472,7 +472,7 @@ lexer-proto.lisp lexer-error function class must parser scan-comment function - skip-until function parser + skip-until parser sod-token-scanner class syntax-error function class diff --git a/src/lexer-impl.lisp b/src/lexer-impl.lisp index 42370c0..ffd522f 100644 --- 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)))) -(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) diff --git a/src/lexer-proto.lisp b/src/lexer-proto.lisp index d5f25fd..22d61c0 100644 --- 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'." - `(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))))