infix: Make delim's requiredp argument optional rather than keyword.

This makes the code rather less messy, I think.

diff --git a/infix.lisp b/infix.lisp
index a0d320de2acd853f557bd6d08b7ebfca24049343..73fc3391433f043b88c9761aa51c0b980cf8788f 100644 (file)
--- a/infix.lisp
+++ b/infix.lisp
@@ -356,9 +356,9 @@ (defmacro defpostfix (op prec &body body)
 ;;;--------------------------------------------------------------------------
 ;;; Infrastructure for operator definitions.
 
 ;;;--------------------------------------------------------------------------
 ;;; Infrastructure for operator definitions.
 

-(defun delim (delim &key (requiredp t))
+(defun delim (delim &optional (requiredp t))

   "Parse DELIM, and read the next token.  Returns t if the DELIM was found,
   "Parse DELIM, and read the next token.  Returns t if the DELIM was found,

-   or nil if not (and requiredp was nil)."
+   or nil if not (and REQUIREDP was nil)."

   (cond ((eq *token* delim) (get-token) t)
        (requiredp (error "expected `~(~A~)'; found ~S" delim *token*))
        (t nil)))
   (cond ((eq *token* delim) (get-token) t)
        (requiredp (error "expected `~(~A~)'; found ~S" delim *token*))
        (t nil)))


@@ -413,7 +413,7 @@ (defun parse-expr-list ()
   (let ((stuff nil))
     (loop
       (push (parse-infix 0) stuff)
   (let ((stuff nil))
     (loop
       (push (parse-infix 0) stuff)

-      (unless (delim '|,| :requiredp nil)
+      (unless (delim '|,| nil)

        (return)))
     (nreverse stuff)))
 
        (return)))
     (nreverse stuff)))
 


@@ -425,7 +425,7 @@ (defun parse-ident-list ()
         (error "expected symbol; found ~S" *token*))
       (push *token* stuff)
       (get-token)
         (error "expected symbol; found ~S" *token*))
       (push *token* stuff)
       (get-token)

-      (unless (delim '|,| :requiredp nil)
+      (unless (delim '|,| nil)

        (return)))
     (nreverse stuff)))
 
        (return)))
     (nreverse stuff)))
 


@@ -648,18 +648,18 @@      (default-get-token)
                    (get-token)
                    (when (eq *token* '|)|)
                      (go done))
                    (get-token)
                    (when (eq *token* '|)|)
                      (go done))

-                   (delim '|,| :requiredp nil)
+                   (delim '|,| nil)

                    (go loop))
                   ((symbolp *token*)
                    (let ((name *token*))
                      (get-token)
                    (go loop))
                   ((symbolp *token*)
                    (let ((name *token*))
                      (get-token)

-                     (if (delim '= :requiredp nil)
+                     (if (delim '= nil)

                          (push (list name (parse-infix 0)) args)
                          (push name args))))
                   (t
                    (push *token* args)
                    (get-token)))
                          (push (list name (parse-infix 0)) args)
                          (push name args))))
                   (t
                    (push *token* args)
                    (get-token)))

-            (when (delim '|,| :requiredp nil)
+            (when (delim '|,| nil)

               (go loop))
           done)))
       (delim '|)|)
               (go loop))
           done)))
       (delim '|)|)


@@ -667,7 +667,7 @@        (default-get-token)
 
 (defun parse-func-name ()
   "Parse a function name and return its Lisp equivalent."
 
 (defun parse-func-name ()
   "Parse a function name and return its Lisp equivalent."

-  (cond ((delim '|(| :requiredp nil)
+  (cond ((delim '|(| nil)

         (prog1 (parse-infix) (delim '|)|)))
        (t (prog1 *token* (get-token)))))
         
         (prog1 (parse-infix) (delim '|)|)))
        (t (prog1 *token* (get-token)))))
         


@@ -692,7 +692,7 @@ (defun do-fletlike (kind)
       (push `(,(parse-func-name) ,(parse-lambda-list)
               ,@(strip-progn (parse-infix 0)))
            clauses)
       (push `(,(parse-func-name) ,(parse-lambda-list)
               ,@(strip-progn (parse-infix 0)))
            clauses)

-      (unless (delim '|,| :requiredp nil)
+      (unless (delim '|,| nil)

        (return)))
     (delim 'in)
     (pushval `(,kind ,(nreverse clauses) ,@(strip-progn (parse-infix 0))))))
        (return)))
     (delim 'in)
     (pushval `(,kind ,(nreverse clauses) ,@(strip-progn (parse-infix 0))))))