.

original commit: 4542ec9421e720ec245d675e2ba5357c92071334

collects/mzlib/awk.ss

@@ -1,6 +1,9 @@
 
-(require-library "refer.ss")
+(begin-elaboration-time 
+ (require-library "invoke.ss"))
 
-(begin-elaboration-time (invoke-open-unit (require-relative-library "awkr.ss")))
+(begin-elaboration-time 
+ (define-values/invoke-unit (awk) 
+   (require-relative-library "awkr.ss")))
 
 (define-macro awk awk)

collects/mzlib/cmdline.ss

@@ -1,7 +1,9 @@
 
-
 (require-library "cmdlineu.ss")
 
-(invoke-open-unit/sig mzlib:command-line@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:command-line^ mzlib:command-line@ #f)
 
 (require-library "cmdlinem.ss")

collects/mzlib/compat.ss

@@ -2,6 +2,10 @@
 (require-library "compatu.ss")
 (require-library "functio.ss")
 
-(invoke-open-unit/sig mzlib:compat@
-		      #f
-		      mzlib:function^)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:compat^
+  mzlib:compat@
+  #f
+  mzlib:function^)

collects/mzlib/date.ss

@@ -2,9 +2,10 @@
 (require-library "dateu.ss")
 (require-library "functio.ss")
 
-(invoke-open-unit/sig mzlib:date@
-		      #f
-		      mzlib:function^)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
 
-
- 
+(define-values/invoke-unit/sig mzlib:date^
+  mzlib:date@
+  #f
+  mzlib:function^)

collects/mzlib/file.ss

@@ -3,7 +3,11 @@
 (require-library "functio.ss")
 (require-library "string.ss")
 
-(invoke-open-unit/sig mzlib:file@
-		      #f
-		      mzlib:string^
-		      mzlib:function^)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:file^
+  mzlib:file@
+  #f
+  mzlib:string^
+  mzlib:function^)

collects/mzlib/inflate.ss

@@ -2,6 +2,10 @@
 
 (require-library "inflateu.ss")
 
-(invoke-open-unit/sig mzlib:inflate@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:inflate^
+  mzlib:inflate@)
 
  

collects/mzlib/match.ss

@@ -1,9 +1,13 @@
 
-(require-library "refer.ss")
+(begin-elaboration-time 
+ (require-library "invoke.ss"))
 
 (begin-elaboration-time
- (invoke-open-unit
-  (require-library "matchr.ss")))
+ (define-values/invoke-unit (match:set-error 
+			     match:set-error-control match:error-control-param
+			     match:error match match-lambda match-lambda* 
+			     match-letrec match-let match-let*)
+   (require-library "matchr.ss")))
 
 (define-macro match match)
 (define-macro match-lambda match-lambda)

collects/mzlib/math.ss

@@ -1,4 +1,8 @@
 
 (require-library "mathu.ss")
 
-(invoke-open-unit/sig mzlib:math@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:math^
+  mzlib:math@)

collects/mzlib/pretty.ss

@@ -1,5 +1,10 @@
 
 (require-library "prettyu.ss")
 
-(invoke-open-unit/sig mzlib:pretty-print@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:pretty-print^
+  mzlib:pretty-print@)
+
 

collects/mzlib/shared.ss

@@ -1,10 +1,13 @@
 
-(require-library "refer.ss")
-(require-library "functios.ss")
+(begin-elaboration-time 
+ (require-library "functios.ss"))
+
+(begin-elaboration-time 
+ (require-library "invoke.ss"))
 
 (begin-elaboration-time
- (invoke-open-unit
-  (require-library "sharedr.ss")))
+ (define-values/invoke-unit (shared)
+   (require-library "sharedr.ss")))
 
 (define-macro shared shared)
 

collects/mzlib/string.ss

@@ -1,5 +1,9 @@
 
 (require-library "stringu.ss")
 
-(invoke-open-unit/sig mzlib:string@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:string^
+  mzlib:string@)
 

collects/mzlib/thread.ss

@@ -1,7 +1,8 @@
 
-
 (require-library "threadu.ss")
 
-(invoke-open-unit/sig mzlib:thread@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
 
- 
+(define-values/invoke-unit/sig mzlib:thread^
+  mzlib:thread@)

collects/mzlib/trace.ss

@@ -244,18 +244,21 @@
 
 )))
 
+(begin-elaboration-time 
+ (require-library "invoke.ss"))
+
 (begin-elaboration-time
- (invoke-open-unit/sig
-  (compound-unit/sig
-   (import)
+ (define-values/invoke-unit/sig mzlib:trace^
+   (compound-unit/sig
+    (import)
     (link
-      (PRETTY : mzlib:pretty-print^
-	(mzlib:pretty-print@))
-      (TRACE : mzlib:trace^
-	(mzlib:trace@ PRETTY)))
+     (PRETTY : mzlib:pretty-print^
+	     (mzlib:pretty-print@))
+     (TRACE : mzlib:trace^
+	    (mzlib:trace@ PRETTY)))
     (export
-      (open TRACE)))
-  #f))
+     (open TRACE)))
+   #f))
 
 (define-macro trace trace)
 (define-macro untrace untrace)

collects/mzlib/transcr.ss

@@ -1,5 +1,8 @@
 
-
 (require-library "transcru.ss")
 
-(invoke-open-unit/sig mzlib:transcript@)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:transcript^
+  mzlib:transcript@)

collects/mzlib/unitsig.ss

@@ -1,2 +0,0 @@
-
-;; Obsolete