diff --git a/collects/net/cgi.ss b/collects/net/cgi.ss index 317331028c..21a9ae0502 100644 --- a/collects/net/cgi.ss +++ b/collects/net/cgi.ss @@ -1,11 +1,8 @@ - (module cgi mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "cgi-sig.ss" + "cgi-unit.ss") - (require "cgi-sig.ss") - (require "cgi-unit.ss") + (define-values/invoke-unit/infer cgi@) - (define-values/invoke-unit/sig net:cgi^ - net:cgi@) - - (provide-signature-elements net:cgi^)) + (provide-signature-elements cgi^)) diff --git a/collects/net/cookie.ss b/collects/net/cookie.ss index b9f4ceeafc..146b158521 100644 --- a/collects/net/cookie.ss +++ b/collects/net/cookie.ss @@ -1,9 +1,8 @@ (module cookie mzscheme - (require (lib "unitsig.ss") + (require (lib "unit.ss") "cookie-sig.ss" "cookie-unit.ss") - (provide-signature-elements net:cookie^) + (provide-signature-elements cookie^) - (define-values/invoke-unit/sig net:cookie^ - cookie@)) \ No newline at end of file + (define-values/invoke-unit/infer cookie@)) \ No newline at end of file diff --git a/collects/net/dns.ss b/collects/net/dns.ss index 44ad9cda6c..773702596f 100644 --- a/collects/net/dns.ss +++ b/collects/net/dns.ss @@ -1,11 +1,8 @@ - (module dns mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "dns-sig.ss" + "dns-unit.ss") - (require "dns-sig.ss") - (require "dns-unit.ss") + (define-values/invoke-unit/infer dns@) - (define-values/invoke-unit/sig net:dns^ - net:dns@) - - (provide-signature-elements net:dns^)) + (provide-signature-elements dns^)) diff --git a/collects/net/ftp.ss b/collects/net/ftp.ss index 4fbe7ff0a1..89d451eb30 100644 --- a/collects/net/ftp.ss +++ b/collects/net/ftp.ss @@ -1,11 +1,8 @@ - (module ftp mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "ftp-sig.ss" + "ftp-unit.ss") - (require "ftp-sig.ss") - (require "ftp-unit.ss") + (define-values/invoke-unit/infer ftp@) - (define-values/invoke-unit/sig net:ftp^ - net:ftp@) - - (provide-signature-elements net:ftp^)) + (provide-signature-elements ftp^)) diff --git a/collects/net/imap.ss b/collects/net/imap.ss index b7560362c7..9483e1ce70 100644 --- a/collects/net/imap.ss +++ b/collects/net/imap.ss @@ -1,13 +1,10 @@ - (module imap mzscheme - (require (lib "unitsig.ss") - (lib "contract.ss")) - - (require "imap-sig.ss" + (require (lib "unit.ss") + (lib "contract.ss") + "imap-sig.ss" "imap-unit.ss") - (define-values/invoke-unit/sig net:imap^ - net:imap@) + (define-values/invoke-unit/infer imap@) (provide/contract [imap-get-hierarchy-delimiter (imap-connection? . -> . bytes?)] diff --git a/collects/net/mime.ss b/collects/net/mime.ss index aa58c2b24b..939d22fc5e 100644 --- a/collects/net/mime.ss +++ b/collects/net/mime.ss @@ -27,9 +27,8 @@ ;; Commentary: (module mime mzscheme - (require (lib "unitsig.ss")) - - (require "mime-sig.ss" + (require (lib "unit.ss") + "mime-sig.ss" "mime-unit.ss" "qp-sig.ss" "qp.ss" @@ -38,11 +37,15 @@ "head-sig.ss" "head.ss") - (define-values/invoke-unit/sig net:mime^ - net:mime@ - #f - net:base64^ net:qp^ net:head^) + (define-unit-from-context base64@ base64^) + (define-unit-from-context qp@ qp^) + (define-unit-from-context head@ head^) - (provide-signature-elements net:mime^)) + (define-compound-unit/infer mime@2 (import) (export mime^) + (link base64@ qp@ head@ mime@)) + + (define-values/invoke-unit/infer mime@2) + + (provide-signature-elements mime^)) ;;; mime.ss ends here \ No newline at end of file diff --git a/collects/net/nntp.ss b/collects/net/nntp.ss index 57b2b25c4d..4fca3dd120 100644 --- a/collects/net/nntp.ss +++ b/collects/net/nntp.ss @@ -1,11 +1,8 @@ - (module nntp mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "nntp-sig.ss" + "nntp-unit.ss") - (require "nntp-sig.ss") - (require "nntp-unit.ss") + (define-values/invoke-unit/infer nntp@) - (define-values/invoke-unit/sig net:nntp^ - net:nntp@) - - (provide-signature-elements net:nntp^)) + (provide-signature-elements nntp^)) diff --git a/collects/net/pop3.ss b/collects/net/pop3.ss index e625094901..86b8d8e7b3 100644 --- a/collects/net/pop3.ss +++ b/collects/net/pop3.ss @@ -1,14 +1,11 @@ - (module pop3 mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "pop3-sig.ss" + "pop3-unit.ss") - (require "pop3-sig.ss") - (require "pop3-unit.ss") + (define-values/invoke-unit/infer pop3@) - (define-values/invoke-unit/sig net:pop3^ - net:pop3@) - - (provide-signature-elements net:pop3^)) + (provide-signature-elements pop3^)) #| diff --git a/collects/net/qp.ss b/collects/net/qp.ss index 5c050b4e13..aacf091c4a 100644 --- a/collects/net/qp.ss +++ b/collects/net/qp.ss @@ -26,14 +26,12 @@ ;; Commentary: (module qp mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "qp-sig.ss" + "qp-unit.ss") - (require "qp-sig.ss") - (require "qp-unit.ss") + (define-values/invoke-unit/infer qp@) - (define-values/invoke-unit/sig net:qp^ - net:qp@) - - (provide-signature-elements net:qp^)) + (provide-signature-elements qp^)) ;;; qp.ss ends here \ No newline at end of file diff --git a/collects/net/sendmail.ss b/collects/net/sendmail.ss index 0bb3dbb22e..49f0715afa 100644 --- a/collects/net/sendmail.ss +++ b/collects/net/sendmail.ss @@ -1,11 +1,8 @@ - (module sendmail mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "sendmail-sig.ss" + "sendmail-unit.ss") - (require "sendmail-sig.ss") - (require "sendmail-unit.ss") + (define-values/invoke-unit/infer sendmail@) - (define-values/invoke-unit/sig net:sendmail^ - net:sendmail@) - - (provide-signature-elements net:sendmail^)) + (provide-signature-elements sendmail^)) diff --git a/collects/net/smtp.ss b/collects/net/smtp.ss index 3f4cebcc8c..14f5a51bfc 100644 --- a/collects/net/smtp.ss +++ b/collects/net/smtp.ss @@ -1,11 +1,8 @@ - (module smtp mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss") + "smtp-sig.ss" + "smtp-unit.ss") - (require "smtp-sig.ss") - (require "smtp-unit.ss") + (define-values/invoke-unit/infer smtp@) - (define-values/invoke-unit/sig net:smtp^ - net:smtp@) - - (provide-signature-elements net:smtp^)) + (provide-signature-elements smtp^)) diff --git a/collects/net/ssl-tcp-unit.ss b/collects/net/ssl-tcp-unit.ss index e4cc3df183..51aec28936 100644 --- a/collects/net/ssl-tcp-unit.ss +++ b/collects/net/ssl-tcp-unit.ss @@ -1,6 +1,6 @@ (module ssl-tcp-unit mzscheme (provide make-ssl-tcp@) - (require (lib "unitsig.ss") + (require (lib "unit.ss") "tcp-sig.ss" (lib "mzssl.ss" "openssl") (lib "etc.ss")) @@ -8,9 +8,10 @@ (define (make-ssl-tcp@ server-cert-file server-key-file server-root-cert-files server-suggest-auth-file client-cert-file client-key-file client-root-cert-files) - (unit/sig net:tcp^ + (unit (import) - + (export tcp^) + (define ctx (ssl-make-client-context)) (when client-cert-file (ssl-load-certificate-chain! ctx client-cert-file)) diff --git a/collects/net/tcp-redirect.ss b/collects/net/tcp-redirect.ss index 5df9d328e0..cadcbd4378 100644 --- a/collects/net/tcp-redirect.ss +++ b/collects/net/tcp-redirect.ss @@ -1,7 +1,7 @@ (module tcp-redirect mzscheme (provide tcp-redirect) - (require (lib "unitsig.ss") + (require (lib "unit.ss") (lib "async-channel.ss") (lib "etc.ss") "tcp-sig.ss") @@ -24,9 +24,9 @@ ; : (listof nat) -> (unit/sig () -> net:tcp^) (define tcp-redirect (opt-lambda (redirected-ports [redirected-address "127.0.0.1"]) - (unit/sig net:tcp^ + (unit (import) - + (export tcp^) ; : (make-pipe-listener nat (channel (cons iport oport))) (define-struct pipe-listener (port channel)) diff --git a/collects/net/tcp-sig.ss b/collects/net/tcp-sig.ss index 28dbbd2aa5..7b36fbd7c9 100644 --- a/collects/net/tcp-sig.ss +++ b/collects/net/tcp-sig.ss @@ -1,9 +1,5 @@ -(module tcp-sig mzscheme - (provide net:tcp^) - (require (lib "unitsig.ss")) - - (define-signature net:tcp^ - (tcp-abandon-port +(module tcp-sig (lib "a-signature.ss") + tcp-abandon-port tcp-accept tcp-accept/enable-break tcp-accept-ready? @@ -12,4 +8,4 @@ tcp-connect tcp-connect/enable-break tcp-listen - tcp-listener?))) \ No newline at end of file + tcp-listener?) \ No newline at end of file diff --git a/collects/net/tcp-unit.ss b/collects/net/tcp-unit.ss index d786c8b5bd..0973a6efce 100644 --- a/collects/net/tcp-unit.ss +++ b/collects/net/tcp-unit.ss @@ -1,34 +1,7 @@ (module tcp-unit mzscheme (provide tcp@) - (require (lib "unitsig.ss") - "tcp-sig.ss") - - ; Okay, this file looks retarded. Something is clearly wrong. - - - (define raw:tcp-abandon-port tcp-abandon-port) - (define raw:tcp-accept tcp-accept) - (define raw:tcp-accept/enable-break tcp-accept/enable-break) - (define raw:tcp-accept-ready? tcp-accept-ready?) - (define raw:tcp-addresses tcp-addresses) - (define raw:tcp-close tcp-close) - (define raw:tcp-connect tcp-connect) - (define raw:tcp-connect/enable-break tcp-connect/enable-break) - (define raw:tcp-listen tcp-listen) - (define raw:tcp-listener? tcp-listener?) - - (define tcp@ - (unit/sig net:tcp^ - (import) - - (define tcp-abandon-port raw:tcp-abandon-port) - (define tcp-accept raw:tcp-accept) - (define tcp-accept/enable-break raw:tcp-accept/enable-break) - (define tcp-accept-ready? raw:tcp-accept-ready?) - (define tcp-addresses raw:tcp-addresses) - (define tcp-close raw:tcp-close) - (define tcp-connect raw:tcp-connect) - (define tcp-connect/enable-break raw:tcp-connect/enable-break) - (define tcp-listen raw:tcp-listen) - (define tcp-listener? raw:tcp-listener?) - ))) \ No newline at end of file + + (require (lib "unit.ss") + "tcp-sig.ss") + + (define-unit-from-context tcp@ tcp^))