diff --git a/collects/net/base64-sig.rkt b/collects/net/base64-sig.rkt index 11fa936..21d2aa9 100644 --- a/collects/net/base64-sig.rkt +++ b/collects/net/base64-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature base64-encode-stream base64-decode-stream diff --git a/collects/net/base64-unit.rkt b/collects/net/base64-unit.rkt index 01970ef..8fc1d28 100644 --- a/collects/net/base64-unit.rkt +++ b/collects/net/base64-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require "base64-sig.ss") +(require "base64-sig.rkt") (import) (export base64^) diff --git a/collects/net/cgi-sig.rkt b/collects/net/cgi-sig.rkt index 958dea5..8e54485 100644 --- a/collects/net/cgi-sig.rkt +++ b/collects/net/cgi-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature ;; -- exceptions raised -- (struct cgi-error ()) diff --git a/collects/net/cgi-unit.rkt b/collects/net/cgi-unit.rkt index 00c916e..295836e 100644 --- a/collects/net/cgi-unit.rkt +++ b/collects/net/cgi-unit.rkt @@ -1,5 +1,5 @@ -#lang scheme/unit -(require "cgi-sig.ss" "uri-codec.ss") +#lang racket/unit +(require "cgi-sig.rkt" "uri-codec.rkt") (import) (export cgi^) diff --git a/collects/net/cookie-sig.rkt b/collects/net/cookie-sig.rkt index 5c492cd..34cbaa4 100644 --- a/collects/net/cookie-sig.rkt +++ b/collects/net/cookie-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature cookie-name? cookie-value? diff --git a/collects/net/cookie-unit.rkt b/collects/net/cookie-unit.rkt index dd33424..397d458 100644 --- a/collects/net/cookie-unit.rkt +++ b/collects/net/cookie-unit.rkt @@ -1,5 +1,5 @@ ;;; -;;; ---- HTTP cookies library +;;; ---- HTTP cookies library ;;; Time-stamp: <03/04/25 10:50:05 noel> ;;; ;;; Copyright (C) 2002 by Francisco Solsona. @@ -48,9 +48,9 @@ ;; ;; You should think of this procedures as a `format' for cookies. -#lang scheme/unit +#lang racket/unit -(require srfi/13/string srfi/14/char-set "cookie-sig.ss") +(require srfi/13/string srfi/14/char-set "cookie-sig.rkt") (import) (export cookie^) @@ -323,4 +323,4 @@ (define (valid-path? v) (and (string? v) (rfc2109:value? v))) -;;; cookie-unit.ss ends here +;;; cookie-unit.rkt ends here diff --git a/collects/net/dns-sig.rkt b/collects/net/dns-sig.rkt index 3801be5..c97c295 100644 --- a/collects/net/dns-sig.rkt +++ b/collects/net/dns-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature dns-get-address dns-get-name diff --git a/collects/net/dns-unit.rkt b/collects/net/dns-unit.rkt index 8a52d76..9c0d175 100644 --- a/collects/net/dns-unit.rkt +++ b/collects/net/dns-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require "dns-sig.ss" scheme/system scheme/udp) +(require "dns-sig.rkt" racket/system racket/udp) (import) (export dns^) diff --git a/collects/net/head-sig.rkt b/collects/net/head-sig.rkt index 60c5f3e..698dc3d 100644 --- a/collects/net/head-sig.rkt +++ b/collects/net/head-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature empty-header validate-header diff --git a/collects/net/head-unit.rkt b/collects/net/head-unit.rkt index d5b82b9..8f18233 100644 --- a/collects/net/head-unit.rkt +++ b/collects/net/head-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require mzlib/date mzlib/string "head-sig.ss") +(require racket/date racket/string "head-sig.rkt") (import) (export head^) diff --git a/collects/net/imap-sig.rkt b/collects/net/imap-sig.rkt index b8e896d..9fb6784 100644 --- a/collects/net/imap-sig.rkt +++ b/collects/net/imap-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature imap-port-number imap-connection? diff --git a/collects/net/imap-unit.rkt b/collects/net/imap-unit.rkt index b0800eb..b9a7b83 100644 --- a/collects/net/imap-unit.rkt +++ b/collects/net/imap-unit.rkt @@ -1,8 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require scheme/tcp - "imap-sig.ss" - "private/rbtree.ss") +(require racket/tcp "imap-sig.rkt" "private/rbtree.rkt") (import) (export imap^) diff --git a/collects/net/mime-sig.rkt b/collects/net/mime-sig.rkt index 4ef359e..5737f21 100644 --- a/collects/net/mime-sig.rkt +++ b/collects/net/mime-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature ;; -- exceptions raised -- (struct mime-error () #:omit-constructor) diff --git a/collects/net/mime-unit.rkt b/collects/net/mime-unit.rkt index 032bb50..fee2e9f 100644 --- a/collects/net/mime-unit.rkt +++ b/collects/net/mime-unit.rkt @@ -1,5 +1,5 @@ ;;; -;;; ---- MIME support +;;; ---- MIME support ;;; ;;; Copyright (C) 2002 by PLT. ;;; Copyright (C) 2001 by Wish Computing. @@ -27,14 +27,11 @@ ;; Commentary: MIME support for PLT Scheme: an implementation of ;; rfc2045, rfc2046, rfc2047, rfc2048, and rfc2049. -#lang scheme/unit +#lang racket/unit -(require "mime-sig.ss" - "qp-sig.ss" - "base64-sig.ss" - "head-sig.ss" - "mime-util.ss" - scheme/port) +(require "mime-sig.rkt" "qp-sig.rkt" "base64-sig.rkt" "head-sig.rkt" + "mime-util.rkt" + racket/port) (import base64^ qp^ head^) (export mime^) diff --git a/collects/net/nntp-sig.rkt b/collects/net/nntp-sig.rkt index 6de1b55..eb14817 100644 --- a/collects/net/nntp-sig.rkt +++ b/collects/net/nntp-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature (struct communicator (sender receiver server port)) connect-to-server connect-to-server* disconnect-from-server diff --git a/collects/net/nntp-unit.rkt b/collects/net/nntp-unit.rkt index 655b84e..408f0a9 100644 --- a/collects/net/nntp-unit.rkt +++ b/collects/net/nntp-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require scheme/tcp "nntp-sig.ss") +(require racket/tcp "nntp-sig.rkt") (import) (export nntp^) diff --git a/collects/net/pop3-sig.rkt b/collects/net/pop3-sig.rkt index 81abb47..03cc804 100644 --- a/collects/net/pop3-sig.rkt +++ b/collects/net/pop3-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature (struct communicator (sender receiver server port state)) connect-to-server connect-to-server* disconnect-from-server diff --git a/collects/net/pop3-unit.rkt b/collects/net/pop3-unit.rkt index c4f0603..204a0c0 100644 --- a/collects/net/pop3-unit.rkt +++ b/collects/net/pop3-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require scheme/tcp "pop3-sig.ss") +(require racket/tcp "pop3-sig.rkt") (import) (export pop3^) diff --git a/collects/net/qp-sig.rkt b/collects/net/qp-sig.rkt index 26a76e5..7c07d57 100644 --- a/collects/net/qp-sig.rkt +++ b/collects/net/qp-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature ;; -- exceptions raised -- (struct qp-error () #:omit-constructor) diff --git a/collects/net/qp-unit.rkt b/collects/net/qp-unit.rkt index b824619..8cbc457 100644 --- a/collects/net/qp-unit.rkt +++ b/collects/net/qp-unit.rkt @@ -1,5 +1,5 @@ ;;; -;;; ---- Quoted Printable Implementation +;;; ---- Quoted Printable Implementation ;;; ;;; Copyright (C) 2002 by PLT. ;;; Copyright (C) 2001 by Francisco Solsona. @@ -26,9 +26,9 @@ ;; ;; Commentary: -#lang scheme/unit +#lang racket/unit -(require "qp-sig.ss") +(require "qp-sig.rkt") (import) (export qp^) @@ -162,4 +162,4 @@ (vector-set! hex-bytes (+ 10 i) (+ i 65)) (loop (add1 i)))) -;;; qp-unit.ss ends here +;;; qp-unit.rkt ends here diff --git a/collects/net/sendmail-sig.rkt b/collects/net/sendmail-sig.rkt index 6be4a48..d026418 100644 --- a/collects/net/sendmail-sig.rkt +++ b/collects/net/sendmail-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature send-mail-message/port send-mail-message diff --git a/collects/net/sendmail-unit.rkt b/collects/net/sendmail-unit.rkt index 87cec7b..bca94df 100644 --- a/collects/net/sendmail-unit.rkt +++ b/collects/net/sendmail-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require mzlib/process "sendmail-sig.ss") +(require racket/system "sendmail-sig.rkt") (import) (export sendmail^) diff --git a/collects/net/smtp-sig.rkt b/collects/net/smtp-sig.rkt index 59fe8eb..a81062b 100644 --- a/collects/net/smtp-sig.rkt +++ b/collects/net/smtp-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature smtp-sending-server smtp-send-message diff --git a/collects/net/smtp-unit.rkt b/collects/net/smtp-unit.rkt index 9c14319..fae6c4b 100644 --- a/collects/net/smtp-unit.rkt +++ b/collects/net/smtp-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/unit +#lang racket/unit -(require scheme/tcp "base64.ss" "smtp-sig.ss") +(require racket/tcp "base64.rkt" "smtp-sig.rkt") (import) (export smtp^) @@ -9,9 +9,8 @@ (define debug-via-stdio? #f) -(define (log . args) - ;; (apply printf args) - (void)) +;; (define log printf) +(define log void) (define (starts-with? l n) (and (>= (string-length l) (string-length n)) diff --git a/collects/net/uri-codec-sig.rkt b/collects/net/uri-codec-sig.rkt index b19780f..6c5a85a 100644 --- a/collects/net/uri-codec-sig.rkt +++ b/collects/net/uri-codec-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature uri-encode uri-decode diff --git a/collects/net/uri-codec-unit.rkt b/collects/net/uri-codec-unit.rkt index a59162e..42a2ff3 100644 --- a/collects/net/uri-codec-unit.rkt +++ b/collects/net/uri-codec-unit.rkt @@ -15,7 +15,7 @@ See more in PR8831. ;;; -;;; ---- En/Decode URLs and form-urlencoded data +;;; ---- En/Decode URLs and form-urlencoded data ;;; Time-stamp: <03/04/25 10:31:31 noel> ;;; ;;; Copyright (C) 2002 by Noel Welsh. @@ -86,13 +86,9 @@ See more in PR8831. ;; Draws inspiration from encode-decode.scm by Kurt Normark and a code ;; sample provided by Eli Barzilay -#lang scheme/unit +#lang racket/unit -(require mzlib/match - mzlib/string - mzlib/list - mzlib/etc - "uri-codec-sig.ss") +(require racket/match racket/string racket/list "uri-codec-sig.rkt") (import) (export uri-codec^) @@ -151,7 +147,7 @@ See more in PR8831. (let ([encoding-table (build-vector ascii-size number->hex-string)] [decoding-table (build-vector ascii-size values)]) (for-each (match-lambda - [(orig . enc) + [(cons orig enc) (vector-set! encoding-table (char->integer orig) (string enc)) @@ -188,17 +184,16 @@ See more in PR8831. ;; vector string -> string (define (decode table str) (define internal-decode - (match-lambda [() (list)] - [(#\% (? hex-digit? char1) (? hex-digit? char2) . rest) + (match-lambda [(list) (list)] + [(list* #\% (? hex-digit? char1) (? hex-digit? char2) rest) ;; This used to consult the table again, but I think that's ;; wrong. For example %2b should produce +, not a space. (cons (string->number (string char1 char2) 16) (internal-decode rest))] - [((? ascii-char? char) . rest) - (cons - (vector-ref table (char->integer char)) - (internal-decode rest))] - [(char . rest) + [(cons (? ascii-char? char) rest) + (cons (vector-ref table (char->integer char)) + (internal-decode rest))] + [(cons char rest) (append (bytes->list (string->bytes/utf-8 (string char))) (internal-decode rest))])) @@ -292,4 +287,4 @@ See more in PR8831. s)) s))) -;;; uri-codec-unit.ss ends here +;;; uri-codec-unit.rkt ends here diff --git a/collects/net/url-sig.rkt b/collects/net/url-sig.rkt index dd77c5f..c09482a 100644 --- a/collects/net/url-sig.rkt +++ b/collects/net/url-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature get-pure-port get-impure-port diff --git a/collects/net/url-unit.rkt b/collects/net/url-unit.rkt index 1efa32b..c5479ca 100644 --- a/collects/net/url-unit.rkt +++ b/collects/net/url-unit.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit ;; To do: ;; Handle HTTP/file errors. @@ -11,11 +11,11 @@ ;; "impure" = they have text waiting ;; "pure" = the MIME headers have been read -(require scheme/port scheme/string - "url-structs.ss" - "uri-codec.ss" - "url-sig.ss" - "tcp-sig.ss") +(require racket/port racket/string + "url-structs.rkt" + "uri-codec.rkt" + "url-sig.rkt" + "tcp-sig.rkt") (import tcp^) (export url^)