From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 10 Aug 2019 00:16:13 +0000 (+0100)
Subject: src/parser/parser-proto.lisp: Muffle a `&optional ... &key ...' warning.
X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/211bf0df3e49bda800a748474ada19dff6f15b5f

src/parser/parser-proto.lisp: Muffle a `&optional ... &key ...' warning.

Somehow I missed this one.
---

diff --git a/src/parser/parser-proto.lisp b/src/parser/parser-proto.lisp
index ed439f9..979a2a5 100644
--- a/src/parser/parser-proto.lisp
+++ b/src/parser/parser-proto.lisp
@@ -879,9 +879,10 @@
    "Return the parser's current token's semantic value."))
 
 (export 'token)
-(defparse token (:context (context token-parser-context)
-		 type &optional (value nil valuep) &key peekp)
-  "Match tokens of a particular type.
+(locally  (declare #+sbcl (sb-ext:muffle-conditions style-warning))
+  (defparse token (:context (context token-parser-context)
+			    type &optional (value nil valuep) &key peekp)
+    "Match tokens of a particular type.
 
    A token matches under the following conditions:
 
@@ -903,35 +904,35 @@
    If the match fails then the failure indicator is either TYPE or (TYPE
    VALUE), depending on whether a VALUE was specified."
 
-  (once-only (type value peekp)
-    (with-gensyms (tokty tokval)
-      `(let ((,tokty ,(parser-token-type context))
-	     (,tokval ,(parser-token-value context)))
-	 (if ,(if (eq type t)
-		  `(not (eq ,tokty :eof))
-		  (flet ((check-value (cond)
-			   (if valuep
-			       `(and ,cond (equal ,tokval ,value))
-			       cond)))
-		    (if (constantp type)
-			(check-value `(eql ,tokty ,type))
-			`(if (eq ,type t)
-			     (not (eq ,tokty :eof))
-			     ,(check-value `(eql ,tokty ,type))))))
-	     ,(let* ((result `(values ,tokval t ,(if (constantp peekp)
-						     (not peekp)
-						     `(not ,peekp))))
-		     (step (parser-step context)))
-		    (cond ((not (constantp peekp))
-			   `(multiple-value-prog1 ,result
-			      (unless ,peekp ,step)))
-			  (peekp
-			   result)
-			  (t
-			   `(multiple-value-prog1 ,result
-			      ,step))))
-	     (values (list ,(if valuep `(list ,type ,value) type))
-		     nil nil))))))
+    (once-only (type value peekp)
+      (with-gensyms (tokty tokval)
+	`(let ((,tokty ,(parser-token-type context))
+	       (,tokval ,(parser-token-value context)))
+	   (if ,(if (eq type t)
+		    `(not (eq ,tokty :eof))
+		    (flet ((check-value (cond)
+			     (if valuep
+				 `(and ,cond (equal ,tokval ,value))
+				 cond)))
+		      (if (constantp type)
+			  (check-value `(eql ,tokty ,type))
+			  `(if (eq ,type t)
+			       (not (eq ,tokty :eof))
+			       ,(check-value `(eql ,tokty ,type))))))
+	       ,(let* ((result `(values ,tokval t ,(if (constantp peekp)
+						       (not peekp)
+						       `(not ,peekp))))
+		       (step (parser-step context)))
+		      (cond ((not (constantp peekp))
+			     `(multiple-value-prog1 ,result
+				(unless ,peekp ,step)))
+			    (peekp
+			     result)
+			    (t
+			     `(multiple-value-prog1 ,result
+				,step))))
+	       (values (list ,(if valuep `(list ,type ,value) type))
+		       nil nil)))))))
 
 (defmethod expand-parser-spec ((context token-parser-context) spec)
   (if (atom spec)