From b8ada6ed89f5c1b9012e1af775b704d7bde3de79 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 31 May 2001 09:55:45 +0000 Subject: [PATCH] . original commit: ff2007861946fba7f259a489f7d42c78b3be00af --- collects/mzlib/class.ss | 6 +++--- collects/mzlib/include.ss | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/collects/mzlib/class.ss b/collects/mzlib/class.ss index 4c6c70d..fedac3f 100644 --- a/collects/mzlib/class.ss +++ b/collects/mzlib/class.ss @@ -1440,8 +1440,8 @@ (loop (cdr l) (remq (caar l) names))] [else (cons (car l) (loop (cdr l) names))])) null)]) - ;; In 'stop or 'list mode, make sure no by-name arguments are left over - (when (memq (class-init-mode c) '(stop list)) + ;; In 'list mode, make sure no by-name arguments are left over + (when (eq? 'list (class-init-mode c)) (unless (or (null? leftovers) (not (ormap car leftovers))) (unused-args-error o (filter car leftovers)))) @@ -1454,7 +1454,7 @@ (obj-error 'make-object "superclass already initialized by class initialization~a" (for-class (class-name c)))) (set! inited? #t) - (let ([named-args (if (not (eq? 'normal (class-init-mode c))) + (let ([named-args (if (eq? 'list (class-init-mode c)) ;; all old args must have been used up new-named-args ;; Normal mode: merge leftover keyword-based args with new ones diff --git a/collects/mzlib/include.ss b/collects/mzlib/include.ss index c368887..2ed1981 100644 --- a/collects/mzlib/include.ss +++ b/collects/mzlib/include.ss @@ -55,6 +55,7 @@ stx c-file))]) (open-input-file c-file))]) + (port-count-lines! p) ;; Read expressions from file (let ([content (let loop ()