>From bcda11d5cbe80f10b1e60efcb939248ab0c66edf Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sun, 10 Aug 2014 15:27:36 +0200
Subject: [PATCH 04/19] compiler-modules: Convert compiler-syntax to a module

---
 batch-driver.scm       |    4 ++--
 compiler-namespace.scm |    2 --
 compiler-syntax.scm    |   13 +++++++++++--
 rules.make             |    5 +++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/batch-driver.scm b/batch-driver.scm
index 7b263b4..b00fa13 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -30,7 +30,7 @@
 (declare
   (unit batch-driver)
   (uses extras data-structures files srfi-1
-	lfa2) )
+	lfa2 compiler-syntax) )
 
 ;; TODO: Remove these once everything's converted to modules
 (include "private-namespace")
@@ -44,7 +44,7 @@
   
 (import (except chicken put! get quit syntax-error) scheme
 	extras data-structures files srfi-1
-	lfa2)
+	lfa2 compiler-syntax)
 
 (include "tweaks")
 
diff --git a/compiler-namespace.scm b/compiler-namespace.scm
index 4a66a49..2a1d56c 100644
--- a/compiler-namespace.scm
+++ b/compiler-namespace.scm
@@ -61,7 +61,6 @@
  compiler-cleanup-hook
  compiler-source-file
  compiler-syntax-enabled
- compiler-syntax-statistics
  compute-database-statistics
  constant-form-eval
  constant-table
@@ -251,7 +250,6 @@
  put!
  qnode
  quit
- r-c-s
  read/source-info
  real-name
  real-name-table
diff --git a/compiler-syntax.scm b/compiler-syntax.scm
index db28e68..030e918 100644
--- a/compiler-syntax.scm
+++ b/compiler-syntax.scm
@@ -25,10 +25,18 @@
 
 
 (declare 
-  (unit compiler-syntax) )
-
+  (unit compiler-syntax)
+  (uses srfi-1 data-structures) )
 
+;; TODO: Remove these once everything's converted to modules
+(include "private-namespace")
 (include "compiler-namespace")
+
+(module compiler-syntax
+    (compiler-syntax-statistics)
+
+(import chicken scheme srfi-1 data-structures)
+
 (include "tweaks.scm")
 
 
@@ -312,3 +320,4 @@
 			       (,f ,zvar (##sys#slot ,lstvar 0)))
 			      ,zvar))))
       x))
+)
\ No newline at end of file
diff --git a/rules.make b/rules.make
index e29669b..1fb783d 100644
--- a/rules.make
+++ b/rules.make
@@ -492,11 +492,12 @@ endef
 $(foreach lib, $(SETUP_API_OBJECTS_1),\
           $(eval $(call declare-emitted-import-lib-dependency,$(lib))))
 
-$(foreach lib, batch-driver lfa2,\
+$(foreach lib, batch-driver lfa2 compiler-syntax,\
           $(eval $(call declare-emitted-import-lib-dependency,$(lib))))
 
 chicken.c: chicken.scm batch-driver.import.scm batch-driver.scm
-batch-driver.c: batch-driver.scm lfa2.import.scm lfa2.scm
+batch-driver.c: batch-driver.scm lfa2.import.scm lfa2.scm \
+		compiler-syntax.scm compiler-syntax.import.scm
 
 define profile-flags
 $(if $(filter $(basename $(1)),$(PROFILE_OBJECTS)),-profile)
-- 
1.7.10.4