From b20f81b7811a12c10eec1ee9f7a042758439e58f Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Sat, 12 Aug 2006 03:22:56 +0000
Subject: [PATCH] opt-lambda -> define/kw

svn: r4032
---
 collects/mzlib/tar.ss | 15 +++++++--------
 collects/mzlib/zip.ss | 25 ++++++++++++-------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/collects/mzlib/tar.ss b/collects/mzlib/tar.ss
index d5f6cdaa11..d690e33f6b 100644
--- a/collects/mzlib/tar.ss
+++ b/collects/mzlib/tar.ss
@@ -1,5 +1,5 @@
 (module tar mzscheme
-  (require (lib "deflate.ss") (lib "file.ss") (lib "etc.ss"))
+  (require (lib "deflate.ss") (lib "file.ss") (lib "kw.ss"))
 
   (define tar-block-size 512)
   (define tar-name-length 100)
@@ -119,13 +119,12 @@
   ;; tar-write : (listof relative-path) ->
   ;; writes a tar file to current-output-port
   (provide tar->output)
-  (define tar->output 
-    (opt-lambda (files [out (current-output-port)])
-      (parameterize ([current-output-port out])
-        (let* ([buf (new-block)] [entry (tar-one-entry buf)])
-          (for-each entry files)
-          ;; two null blocks end-marker
-          (write-bytes buf) (write-bytes buf)))))
+  (define/kw (tar->output files #:optional [out (current-output-port)])
+    (parameterize ([current-output-port out])
+      (let* ([buf (new-block)] [entry (tar-one-entry buf)])
+        (for-each entry files)
+        ;; two null blocks end-marker
+        (write-bytes buf) (write-bytes buf))))
 
   ;; tar : output-file paths ->
   (provide tar)
diff --git a/collects/mzlib/zip.ss b/collects/mzlib/zip.ss
index e476eb6b5c..5b1d36384c 100644
--- a/collects/mzlib/zip.ss
+++ b/collects/mzlib/zip.ss
@@ -1,7 +1,7 @@
 ;; A modification of Dave Herman's zip module
 
 (module zip mzscheme
-  (require (lib "deflate.ss") (lib "file.ss") (lib "etc.ss"))
+  (require (lib "deflate.ss") (lib "file.ss") (lib "kw.ss"))
 
   ;; ===========================================================================
   ;; DATA DEFINITIONS
@@ -246,19 +246,18 @@
   ;; zip-write : (listof relative-path) ->
   ;; writes a zip file to current-output-port
   (provide zip->output)
-  (define zip->output 
-    (opt-lambda (files [out (current-output-port)])
-      (parameterize ([current-output-port out])
-        (let* ([seekable? (seekable-port? (current-output-port))]
-               [headers ; note: MzScheme's `map' is always left-to-right
-                (map (lambda (file)
-                       (zip-one-entry (build-metadata file) seekable?))
-                     files)])
-          (when (zip-verbose)
-            (fprintf (current-error-port) "zip: writing headers...\n"))
-          (write-central-directory headers))
+  (define/kw (zip->output files #:optional [out (current-output-port)])
+    (parameterize ([current-output-port out])
+      (let* ([seekable? (seekable-port? (current-output-port))]
+             [headers ; note: MzScheme's `map' is always left-to-right
+              (map (lambda (file)
+                     (zip-one-entry (build-metadata file) seekable?))
+                   files)])
         (when (zip-verbose)
-          (fprintf (current-error-port) "zip: done.\n")))))
+          (fprintf (current-error-port) "zip: writing headers...\n"))
+        (write-central-directory headers))
+      (when (zip-verbose)
+        (fprintf (current-error-port) "zip: done.\n"))))
 
   ;; zip : output-file paths ->
   (provide zip)