rework modules

3 files changed, 15 insertions, 1 deletions

diff --git a/environment.scm b/environment.scm
index 2444059..5906a1d 100644
--- a/environment.scm
+++ b/environment.scm
@@ -1,4 +1,9 @@
-(include "prelude/primitives.scm")
+(define-module (environment)
+               #: export (lookup-variable-value
+                           setup-environment))
+
+(add-to-load-path ".")
+(use-modules (prelude/primitives))
 
 ;;; env
 (define (enclosing-env environ) (cdr environ))
diff --git a/util/alist.scm b/util/alist.scm
index 4e19440..6bc0bda 100644
--- a/util/alist.scm
+++ b/util/alist.scm
@@ -1,3 +1,7 @@
+(define-module (util/alist)
+               #: export (lookup-assoc-list
+                           is-elem-assoc-list))
+
 (define (is-elem-assoc-list key assoc-list)
   (cond
     [(null? assoc-list) #f]
diff --git a/util/table.scm b/util/table.scm
index 7cc68e8..efb9613 100644
--- a/util/table.scm
+++ b/util/table.scm
@@ -1,3 +1,8 @@
+(define-module (util/table)
+               #: export (make-table
+                           lookup
+                           table-insert!))
+
 (define (make-table)
   (list '*table*))