Fix typos in `psyntax'.

* module/ice-9/psyntax.scm (lambda*-formals): Fix argument count in
  `rest' invocations.
  [pred]: Fix argument count in `syntax->datum' invocation.

diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index 1dc6469..f2d3dfc 100644 (file)
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -628,8 +628,8 @@
                                                              #{a\ 483}#
                                                              #{b\ 484}#)
                                                       (eq? (syntax->datum
-                                                             #{a\ 483}#
-                                                             #:rest)))
+                                                             #{a\ 483}#)
+                                                           #:rest))
                                                     #{tmp\ 481}#)
                                              #f)
                                          (apply (lambda (#{x\ 485}#
@@ -639,9 +639,8 @@
                                                     #{b\ 487}#
                                                     #{req\ 475}#
                                                     #{opt\ 476}#
-                                                    #f
                                                     #{kw\ 477}#
-                                                    #{x\ 485}#))
+                                                    #f))
                                                 #{tmp\ 481}#)
                                          ((lambda (#{tmp\ 488}#)
                                             (if (if #{tmp\ 488}#
@@ -657,9 +656,8 @@
                                                          #{b\ 492}#
                                                          #{req\ 475}#
                                                          #{opt\ 476}#
-                                                         #f
                                                          #{kw\ 477}#
-                                                         #{x\ 491}#))
+                                                         #f))
                                                      #{tmp\ 488}#)
                                               ((lambda (#{else\ 493}#)
                                                  (syntax-violation
@@ -1250,7 +1248,8 @@
                                                                              #{opt\ 496}#
                                                                              (cons #t
                                                                                    (reverse
-                                                                                     #{rkey\ 497}#))))
+                                                                                     #{rkey\ 497}#))
+                                                                             #f))
                                                                          #{tmp\ 535}#)
                                                                   ((lambda (#{tmp\ 542}#)
                                                                      (if (if #{tmp\ 542}#
@@ -1272,7 +1271,8 @@
                                                                                   #{opt\ 496}#
                                                                                   (cons #t
                                                                                         (reverse
-                                                                                          #{rkey\ 497}#))))
+                                                                                          #{rkey\ 497}#))
+                                                                                  #f))
                                                                               #{tmp\ 542}#)
                                                                        ((lambda (#{tmp\ 547}#)
                                                                           (if (if #{tmp\ 547}#

diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index 6fcc9b0..b1c09f8 100644 (file)
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -1664,10 +1664,10 @@
          (pred #'b req opt (cons #t (reverse rkey))))
         ((aok a b) (and (eq? (syntax->datum #'aok) #:allow-other-keys)
                         (eq? (syntax->datum #'a) #:rest))
-         (rest #'b req opt (cons #t (reverse rkey))))
+         (rest #'b req opt (cons #t (reverse rkey)) #f))
         ((aok . r) (and (eq? (syntax->datum #'aok) #:allow-other-keys)
                         (id? #'r))
-         (rest #'r req opt (cons #t (reverse rkey))))
+         (rest #'r req opt (cons #t (reverse rkey)) #f))
         ((a . b) (eq? (syntax->datum #'a) #:predicate)
          (pred #'b req opt (cons #f (reverse rkey))))
         ((a b) (eq? (syntax->datum #'a) #:rest)
@@ -1680,10 +1680,10 @@
     (define (pred args req opt kw)
       (syntax-case args ()
         ((x) (check req opt #f kw #'x))
-        ((x a b) (eq? (syntax->datum #'a #:rest))
-         (rest #'b req opt #f kw #'x))
+        ((x a b) (eq? (syntax->datum #'a) #:rest)
+         (rest #'b req opt kw #f))
         ((x . b) (id? #'b)
-         (rest #'b req opt #f kw #'x))
+         (rest #'b req opt kw #f))
         (else
          (syntax-violation 'lambda* "invalid argument list following #:predicate"
                            orig-args args))))