.

original commit: a7432874af0d8e8175b449832d45abee2b42fb99

collects/mzlib/awk.ss

@@ -1,7 +1,7 @@
 
 (module awk mzscheme
 
-  (export awk match:start match:end match:substring regexp-exec)
+  (provide awk match:start match:end match:substring regexp-exec)
 
   (define-syntax awk
     (lambda (stx)

collects/mzlib/class.ss

@@ -2,7 +2,7 @@
 ;; Object system, same as MzScheme version 103 and earlier
 
 (module class mzscheme
-  (import-for-syntax mzscheme)
+  (require-for-syntax mzscheme)
 
   (define-struct obj (class slots))
   (define-struct class (name
@@ -945,11 +945,7 @@
 	       (list interface-expr ...)
 	       '(var ...)))))])))
 
-  (export-indirect compose-class
-		   compose-interface
-		   undefined needs-init)
-
-  (export class class* class*/names
+  (provide class class* class*/names
 	  class-asi class*-asi
 	  interface
 	  make-object object? is-a? subclass? class? interface?

collects/mzlib/cmdline.ss

@@ -496,6 +496,6 @@
 		 [else
 		  (done args r-acc)])))))]))
 
-  (export command-line parse-command-line))
+  (provide command-line parse-command-line))
 
 

collects/mzlib/compat.ss

@@ -1,12 +1,11 @@
 
 (module compat mzscheme
-  (import "list.ss")
+  (require "list.ss")
 
-  (export real-time
+  (provide real-time
 	  1+ 1-
 	  >=? <=? >? <? =?
 	  flush-output-port
-	  bound?
 	  sort
 	  gentemp
 	  atom?
@@ -31,8 +30,6 @@
     (lambda (less-than? l)
       (mergesort l less-than?)))
 
-  (define bound? defined?)
-
   (define flush-output-port flush-output)
 
   (define real-time current-milliseconds)

collects/mzlib/date.ss

@@ -1,9 +1,9 @@
 
 (module date mzscheme
 
-  (import "list.ss")
+  (require "list.ss")
 
-  (export date->string
+  (provide date->string
 	  date-display-format
 	  find-seconds
 	  

collects/mzlib/deflate.ss

@@ -10,11 +10,11 @@
 
 (module deflate mzscheme
 
-  (export deflate 
+  (provide deflate 
 	  gzip-through-ports
 	  gzip)
 
-  (import "unit.ss")
+  (require "unit.ss")
 
   (define-syntax INSERT_STRING 
     (lambda (stx)

collects/mzlib/etc.ss

@@ -1,9 +1,9 @@
 
 (module etc mzscheme
-  (import "spidey.ss")
-  (import-for-syntax (lib "kerncase.ss" "syntax"))
+  (require "spidey.ss")
+  (require-for-syntax (lib "kerncase.ss" "syntax"))
 
-  (export true false
+  (provide true false
 	  boolean=? symbol=?
 	  char->string
 	  identity

collects/mzlib/file.ss

@@ -1,5 +1,5 @@
 (module file mzscheme
-  (export find-relative-path
+  (provide find-relative-path
 	  explode-path
 	  normalize-path
 	  build-absolute-path
@@ -17,7 +17,7 @@
 	  with-output-to-file*
 	  call-with-output-file*)
 
-  (import "list.ss")
+  (require "list.ss")
 
   (define build-relative-path
     (lambda (p . args)

collects/mzlib/include.ss

@@ -100,9 +100,9 @@
 		 stx
 		 (quote-syntax here)))))))))
 
-  (export include))
+  (provide include))
 
 		 
 			   
 	      
-		     
+		     

collects/mzlib/inflate.ss

@@ -1,7 +1,7 @@
 
 (module inflate mzscheme
 
-  (export inflate 
+  (provide inflate 
 	  gunzip-through-ports
 	  gunzip)
 

collects/mzlib/list.ss

@@ -1,8 +1,8 @@
 
 (module list mzscheme
-  (import "spidey.ss")
+  (require "spidey.ss")
 
-  (export set-first!
+  (provide set-first!
 	  first
 	  second
 	  third

collects/mzlib/match.ss

@@ -97,9 +97,9 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (module match mzscheme
-  (import-for-syntax "private/mkmatch.ss")
+  (require-for-syntax "private/mkmatch.ss")
 
-  (export
+  (provide
    match
    match-lambda
    match-lambda*
@@ -107,8 +107,6 @@
    match-let
    match-let*)
 
- (export-indirect  match:error)
-
  (define match:version "Version 1.10mz, Feb 5, 1996")
 
  (define-struct (exn:misc:match struct:exn:misc) (value))
@@ -290,4 +288,4 @@
 	 (gendefine (map (lambda (p) (:ucall parse-pattern p)) (syntax pat))
 		    (syntax exp)
 		    stx)
-	 stx (quote-syntax here))]))))
+	 stx (quote-syntax here))]))))

collects/mzlib/math.ss

@@ -4,7 +4,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (module math mzscheme
-  (export e 
+  (provide e 
 	  pi 
 	  square
 	  sgn conjugate

collects/mzlib/pretty.ss

@@ -71,9 +71,9 @@
 ;; print-line parameter 8/18/97
 
 (module pretty mzscheme
-   (import)
+   (require)
 
-   (export pretty-print
+   (provide pretty-print
 	   pretty-display
 	   pretty-print-columns
 	   pretty-print-depth

collects/mzlib/private/sigmatch.ss

@@ -1,7 +1,7 @@
 
 (module sigmatch mzscheme
 
-  (import "../unit.ss")
+  (require "../unit.ss")
 
   (define (hash-sig src-sig table)
     (and (vector? src-sig)
@@ -130,4 +130,4 @@
 			       exact? who src-context dest-context)
 	(raise-type-error 'verify-signature-match "signature" dest-sig))))
 
-  (export verify-signature-match))
+  (provide verify-signature-match))

collects/mzlib/private/sigutil.ss

@@ -2,9 +2,9 @@
 (module sigutil mzscheme
   ;; Used by signedunit.ss 
 
-  (import "sigmatch.ss")
-  (import "../exstruct.ss")
-  (import "../unit.ss")
+  (require "sigmatch.ss")
+  (require "../exstruct.ss")
+  (require "../unit.ss")
 
   (define-struct signature (name    ; sym
 			    src     ; sym
@@ -953,7 +953,7 @@
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  (export parse-unit
+  (provide parse-unit
 	  parse-compound-unit
 	  parse-invoke-vars
 

collects/mzlib/private/unitidmap.ss

@@ -18,6 +18,6 @@
 	    sstx
 	    set!-stx)])))))
 
-  (export make-id-mapper))
+  (provide make-id-mapper))
 
     

collects/mzlib/shared.ss

@@ -1,10 +1,9 @@
 
 (module shared mzscheme
 
-  (export shared)
+  (provide shared)
 
   (define undefined (letrec ([x x]) x))
-  (export-indirect undefined)
   
   (define-syntax shared
     (lambda (stx)
@@ -97,4 +96,4 @@
 		...))))]))))
 
 				    
-	 
+	 

collects/mzlib/string.ss

@@ -1,6 +1,6 @@
 
 (module string mzscheme
-  (export string-lowercase!
+  (provide string-lowercase!
 	  string-uppercase!
 	  eval-string
 	  read-from-string

collects/mzlib/thread.ss

@@ -1,8 +1,8 @@
 
 (module thread mzscheme
-  (import "spidey.ss")
+  (require "spidey.ss")
 
-  (export consumer-thread
+  (provide consumer-thread
 	  merge-input
 	  with-semaphore
 	  semaphore-wait-multiple

collects/mzlib/trace.ss

@@ -8,15 +8,9 @@
 ;   of a trace, the behavior is not well-defined.
 
 (module trace mzscheme
-  (import "pretty.ss")
+  (require "pretty.ss")
 
-  (export trace untrace)
-
-  (export-indirect -:trace-level -:trace-print-args 
-		   -:trace-print-results
-		   -:trace-table
-		   -:make-traced-entry -:traced-entry-original-proc
-		   -:traced-entry-trace-proc)
+  (provide trace untrace)
 
   (define max-dash-space-depth 10)
   (define number-nesting-depth 6)

collects/mzlib/transcr.ss

@@ -1,6 +1,6 @@
 
 (module transcr mzscheme
-  (export (rename -transcript-on transcript-on)
+  (provide (rename -transcript-on transcript-on)
 	  (rename -transcript-off transcript-off))
 
   (define-values (-transcript-on -transcript-off)

collects/mzlib/unit.ss

@@ -2,7 +2,7 @@
 ;; Unit system
 
 (module unit mzscheme
-  (import-for-syntax (lib "kerncase.ss" "syntax")
+  (require-for-syntax (lib "kerncase.ss" "syntax")
 		     "private/unitidmap.ss")
 
   (define undefined (letrec ([x x]) x))
@@ -683,9 +683,7 @@
 	  [(_ exports unit) 
 	   (syntax (do-define-values/invoke-unit #t exports unit #f () orig))]))))
   
-  (export-indirect make-unit check-unit undefined unit-go
-		   check-expected-interface)
-  (export unit compound-unit invoke-unit unit?
+  (provide unit compound-unit invoke-unit unit?
 	  exn:unit? struct:exn:unit make-exn:unit
 
 	  define-values/invoke-unit

collects/mzlib/unitsig.ss

@@ -1,12 +1,12 @@
 
 (module unitsig mzscheme
-  (import "exstruct.ss")
-  (import "unit.ss")
-  (import "private/sigmatch.ss")
+  (require "exstruct.ss")
+  (require "unit.ss")
+  (require "private/sigmatch.ss")
 
-  (import-for-syntax "private/sigutil.ss")
-  (import-for-syntax "private/sigmatch.ss")
-  (import-for-syntax (lib "kerncase.ss" "syntax"))
+  (require-for-syntax "private/sigutil.ss")
+  (require-for-syntax "private/sigmatch.ss")
+  (require-for-syntax (lib "kerncase.ss" "syntax"))
 
   (define-struct/export unit/sig (unit imports exports))
 
@@ -284,29 +284,27 @@
 	  [(_ signame unit)
 	   (syntax (do-define-values/invoke-unit/sig #t signame unit #f () orig))]))))
 
-  (define-syntax export-signature-elements
+  (define-syntax provide-signature-elements
     (lambda (stx)
       (with-syntax ([orig stx])
 	(syntax-case stx ()
 	  [(_ signame)
-	   (let ([sig (get-sig 'export-signature-elements stx #f (syntax signame))])
+	   (let ([sig (get-sig 'provide-signature-elements stx #f (syntax signame))])
 	     (let ([flattened (flatten-signature #f sig)])
 	       (with-syntax ([flattened (map (lambda (x) (datum->syntax x #f (syntax signame)))
 					     flattened)])
 		 (syntax
-		  (export . flattened)))))]))))
+		  (provide . flattened)))))]))))
   
-  (export-indirect verify-linkage-signature-match)
-
-  (export define-signature
-	  let-signature
-          unit/sig
-          compound-unit/sig
-	  invoke-unit/sig
-	  unit->unit/sig
-	  signature->symbols
-	  
-	  define-values/invoke-unit/sig
-	  global-define-values/invoke-unit/sig
-	  export-signature-elements))
+  (provide define-signature
+	   let-signature
+	   unit/sig
+	   compound-unit/sig
+	   invoke-unit/sig
+	   unit->unit/sig
+	   signature->symbols
+	   
+	   define-values/invoke-unit/sig
+	   global-define-values/invoke-unit/sig
+	   provide-signature-elements))
 

collects/net/base64-sig.ss

@@ -1,8 +1,8 @@
 
 (module base64-sig mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (export net:base64^)
+  (provide net:base64^)
 
   (define-signature net:base64^
     (base64-encode-stream

collects/net/base64-unit.ss

@@ -1,11 +1,11 @@
 
 
 (module base64-unit mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (import "base64-sig.ss")
+  (require "base64-sig.ss")
 
-  (export net:base64@)
+  (provide net:base64@)
   (define net:base64@
     (unit/sig net:base64^
       (import)

collects/net/head-sig.ss

@@ -1,8 +1,8 @@
 
 (module head-sig mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (export net:head^)
+  (provide net:head^)
   (define-signature net:head^
     (empty-header
      validate-header

collects/net/head-unit.ss

@@ -1,10 +1,10 @@
 
 (module head-unit mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (import "head-sig.ss")
+  (require "head-sig.ss")
 
-  (export net:head@)
+  (provide net:head@)
   (define net:head@
     (unit/sig net:head^
       (import)

collects/net/imap-sig.ss

@@ -1,9 +1,9 @@
 
 
 (module imap-sig mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (export net:imap^)
+  (provide net:imap^)
   (define-signature net:imap^
     (imap-port-number
 

collects/net/imap-unit.ss

@@ -1,10 +1,10 @@
 
 (module imap-unit mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (import "imap-sig.ss")
+  (require "imap-sig.ss")
   
-  (export net:imap@)
+  (provide net:imap@)
   (define net:imap@
     (unit/sig net:imap^
       (import)

collects/net/smtp-sig.ss

@@ -1,8 +1,8 @@
 
 (module smtp-sig mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (export net:smtp^)
+  (provide net:smtp^)
   (define-signature net:smtp^
     (smtp-send-message
      smtp-sending-end-of-message)))

collects/net/smtp-unit.ss

@@ -1,10 +1,10 @@
 
 (module smtp-unit mzscheme
-  (import (lib "unitsig.ss"))
+  (require (lib "unitsig.ss"))
 
-  (import "smtp-sig.ss")
+  (require "smtp-sig.ss")
 
-  (export net:smtp@)
+  (provide net:smtp@)
   (define net:smtp@
     (unit/sig net:smtp^
       (import)