clean up some syntax imports and exports

* module/system/base/syntax.scm (system): Don't re-export receive or
  and-let*; modules should explicitly import these if they want to. Don't
  export an empty stack-catch definition!

* module/system/repl/command.scm (system): Pull in and-let*.

* module/system/vm/disasm.scm (system): Don't import and-let*.

diff --git a/module/system/base/syntax.scm b/module/system/base/syntax.scm
index 4af70c0..7f23df6 100644 (file)
--- a/module/system/base/syntax.scm
+++ b/module/system/base/syntax.scm
@@ -20,10 +20,7 @@
 ;;; Code:
 
 (define-module (system base syntax)
-  :use-module (ice-9 receive)
-  :use-module (ice-9 and-let-star)
-  :export (stack-catch receive and-let*
-           %make-struct slot
+  :export (%make-struct slot
            %slot-1 %slot-2 %slot-3 %slot-4 %slot-5
            %slot-6 %slot-7 %slot-8 %slot-9
            list-fold)

diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm
index 802df5a..c0f05b4 100644 (file)
--- a/module/system/repl/command.scm
+++ b/module/system/repl/command.scm
@@ -32,7 +32,8 @@
   :autoload (system vm profile) (vm-profile)
   :use-module (ice-9 format)
   :use-module (ice-9 session)
-  :use-module (ice-9 documentation))
+  :use-module (ice-9 documentation)
+  :use-module (ice-9 and-let-star))
 
 \f
 ;;;

diff --git a/module/system/vm/disasm.scm b/module/system/vm/disasm.scm
index 9d0bb9c..3993008 100644 (file)
--- a/module/system/vm/disasm.scm
+++ b/module/system/vm/disasm.scm
@@ -26,7 +26,6 @@
   :use-module (ice-9 match)
   :use-module (ice-9 format)
   :use-module (ice-9 receive)
-  :use-module (ice-9 and-let-star)
   :export (disassemble-objcode disassemble-program disassemble-bytecode))
 
 (define (disassemble-objcode objcode . opts)