expander: fix internal procedure-shape check

Author: mflatt

racket/src/expander/compile/side-effect.rkt

@@ -327,7 +327,13 @@
       (and (pair? (correlated-e expr))
            (eq? 'lambda (car (correlated-e expr)))
            (or (not arity)
-               (= arity (length (correlated->list (cadr (correlated->list expr)))))))))
+               (let loop ([args (cadr (correlated->list expr))]
+                          [arity arity])
+                 (cond
+                   [(correlated? args) (loop (correlated-e args) arity)]
+                   [(null? args) (zero? arity)]
+                   [(pair? args) (loop (cdr args) (sub1 arity))]
+                   [else (not (negative? arity))]))))))
 
 (define (arity-includes? a n)
   (or (equal? a n)

racket/src/expander/expand/module.rkt

@@ -34,7 +34,6 @@
          "../eval/top.rkt"
          "../eval/module.rkt"
          "cross-phase.rkt"
-         "../syntax/debug.rkt"
          "parsed.rkt"
          "expanded+parsed.rkt"
          "append.rkt"

racket/src/expander/host/correlate.rkt

@@ -85,7 +85,7 @@
      [(pair? e) (cons (car e) (loop (cdr e)))]
      [(null? e) null]
      [(syntax? e) (loop (syntax-e e))]
-     [else (error 'correlate->list "not a list")])))
+     [else (error 'correlated->list "not a list")])))
 
 (define (correlated->datum e)
   (datum-map e (lambda (tail? d)