From 773527cc8e1465299dece6834d9d79b97a57825c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 13 Sep 2001 22:42:56 +0000 Subject: [PATCH] . original commit: 1f7dc0cfc45cda4d181a049246dd720cc135d67d --- collects/mzlib/private/sigutil.ss | 15 ++++++++------- collects/net/cgi-unit.ss | 4 ++-- collects/net/nntp-unit.ss | 18 +++++++++--------- collects/net/pop3-unit.ss | 24 ++++++++++++------------ collects/net/sendmail-unit.ss | 2 +- collects/net/url-unit.ss | 2 +- 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/collects/mzlib/private/sigutil.ss b/collects/mzlib/private/sigutil.ss index b992f72..4b3b27c 100644 --- a/collects/mzlib/private/sigutil.ss +++ b/collects/mzlib/private/sigutil.ss @@ -159,13 +159,14 @@ [fields (syntax->list (syntax (field ...)))] [omissions (syntax->list (syntax (omission ...)))]) (unless (or (identifier? name) - (syntax-case name () - [(name super) - (and (identifier? (syntax name)) - (identifier? (syntax super)))] - [_else #f])) + ;; >>> disabled the `(name super)' case for now <<< + (and #f (syntax-case name () + [(name super) + (and (identifier? (syntax name)) + (identifier? (syntax super)))] + [_else #f]))) (syntax-error who expr - "struct name is not an identifier or a parenthesized name--super sequence of identifiers" + "struct name is not an identifier" ;; " or a parenthesized name--super sequence of identifiers" name)) (for-each (lambda (fld) @@ -409,7 +410,7 @@ (apply append (map (lambda (s) - (make-struct-stx-decls (list s) + (make-struct-stx-decls s (if signame (format "~a~a:" (or prefix "") diff --git a/collects/net/cgi-unit.ss b/collects/net/cgi-unit.ss index 6771755..9a0deac 100644 --- a/collects/net/cgi-unit.ss +++ b/collects/net/cgi-unit.ss @@ -21,12 +21,12 @@ ;; chars : list (char) ;; -- gives the suffix which is invalid, not including the `%' - (define-struct (incomplete-%-suffix struct:cgi-error) (chars)) + (define-struct (incomplete-%-suffix cgi-error) (chars)) ;; char : char ;; -- an invalid character in a hex string - (define-struct (invalid-%-suffix struct:cgi-error) (char)) + (define-struct (invalid-%-suffix cgi-error) (char)) ;; -------------------------------------------------------------------- diff --git a/collects/net/nntp-unit.ss b/collects/net/nntp-unit.ss index 0bb25c2..7b99ce4 100644 --- a/collects/net/nntp-unit.ss +++ b/collects/net/nntp-unit.ss @@ -24,15 +24,15 @@ ;; group : string ;; article : number - (define-struct (nntp struct:exn) ()) - (define-struct (unexpected-response struct:nntp) (code text)) - (define-struct (bad-status-line struct:nntp) (line)) - (define-struct (premature-close struct:nntp) (communicator)) - (define-struct (bad-newsgroup-line struct:nntp) (line)) - (define-struct (non-existent-group struct:nntp) (group)) - (define-struct (article-not-in-group struct:nntp) (article)) - (define-struct (no-group-selected struct:nntp) ()) - (define-struct (article-not-found struct:nntp) (article)) + (define-struct (nntp exn) ()) + (define-struct (unexpected-response nntp) (code text)) + (define-struct (bad-status-line nntp) (line)) + (define-struct (premature-close nntp) (communicator)) + (define-struct (bad-newsgroup-line nntp) (line)) + (define-struct (non-existent-group nntp) (group)) + (define-struct (article-not-in-group nntp) (article)) + (define-struct (no-group-selected nntp) ()) + (define-struct (article-not-found nntp) (article)) ;; signal-error : ;; (exn-args ... -> exn) x format-string x values ... -> diff --git a/collects/net/pop3-unit.ss b/collects/net/pop3-unit.ss index 4505726..05066a5 100644 --- a/collects/net/pop3-unit.ss +++ b/collects/net/pop3-unit.ss @@ -20,16 +20,16 @@ (define-struct communicator (sender receiver server port state)) - (define-struct (pop3 struct:exn) ()) - (define-struct (cannot-connect struct:pop3) ()) - (define-struct (username-rejected struct:pop3) ()) - (define-struct (password-rejected struct:pop3) ()) - (define-struct (not-ready-for-transaction struct:pop3) (communicator)) - (define-struct (not-given-headers struct:pop3) (communicator message)) - (define-struct (illegal-message-number struct:pop3) (communicator message)) - (define-struct (cannot-delete-message struct:exn) (communicator message)) - (define-struct (disconnect-not-quiet struct:pop3) (communicator)) - (define-struct (malformed-server-response struct:pop3) (communicator)) + (define-struct (pop3 exn) ()) + (define-struct (cannot-connect pop3) ()) + (define-struct (username-rejected pop3) ()) + (define-struct (password-rejected pop3) ()) + (define-struct (not-ready-for-transaction pop3) (communicator)) + (define-struct (not-given-headers pop3) (communicator message)) + (define-struct (illegal-message-number pop3) (communicator message)) + (define-struct (cannot-delete-message exn) (communicator message)) + (define-struct (disconnect-not-quiet pop3) (communicator)) + (define-struct (malformed-server-response pop3) (communicator)) ;; signal-error : ;; (exn-args ... -> exn) x format-string x values ... -> @@ -69,8 +69,8 @@ (define default-pop-port-number 110) (define-struct server-responses ()) - (define-struct (+ok struct:server-responses) ()) - (define-struct (-err struct:server-responses) ()) + (define-struct (+ok server-responses) ()) + (define-struct (-err server-responses) ()) (define +ok (make-+ok)) (define -err (make--err)) diff --git a/collects/net/sendmail-unit.ss b/collects/net/sendmail-unit.ss index 922e576..0b8841b 100644 --- a/collects/net/sendmail-unit.ss +++ b/collects/net/sendmail-unit.ss @@ -10,7 +10,7 @@ (unit/sig net:sendmail^ (import) - (define-struct (no-mail-recipients struct:exn) ()) + (define-struct (no-mail-recipients exn) ()) (define sendmail-search-path '("/usr/lib" "/usr/sbin")) diff --git a/collects/net/url-unit.ss b/collects/net/url-unit.ss index b32de9c..a3d7b71 100644 --- a/collects/net/url-unit.ss +++ b/collects/net/url-unit.ss @@ -19,7 +19,7 @@ (unit/sig net:url^ (import) - (define-struct (url-exception struct:exn) ()) + (define-struct (url-exception exn) ()) ;; This is commented out; it's here for debugging. ;; It used to be outside the unit.