move lang-specific modules, e.g. (system il compile) to (language ghil compile-glil)

* configure.in: Remove module/system/il directory.

* module/language/ghil/Makefile.am (SOURCES):
* module/language/ghil/compile-glil.scm (system):
* module/language/ghil/def.scm (language):
* module/language/ghil/spec.scm (language, ghil):
* module/language/glil/Makefile.am (SOURCES):
* module/language/glil/compile-objcode.scm (language):
* module/language/glil/def.scm (language):
* module/language/glil/spec.scm (language, compile):
* module/language/scheme/Makefile.am (SOURCES):
* module/language/scheme/inline.scm (system, define-inline):
* module/language/scheme/translate.scm (language): Move files, renaming
  the modules.

* module/oop/goops.scm (load-toplevel): Unfortunately the GHIL name
  leaked here. Patch it up.

* module/system/vm/Makefile.am (SOURCES): Remove assemble.scm.

configure.in

@@ -1553,7 +1553,6 @@ AC_CONFIG_FILES([
   module/system/Makefile
   module/system/base/Makefile
   module/system/vm/Makefile
-  module/system/il/Makefile
   module/system/repl/Makefile
   module/language/Makefile
   module/language/scheme/Makefile

module/language/ghil/Makefile.am

@@ -1,3 +1,3 @@
-SOURCES = spec.scm
+SOURCES = spec.scm def.scm compile-glil.scm
 modpath = language/ghil
 include $(top_srcdir)/am/guilec

module/language/ghil/compile-glil.scm

@@ -19,14 +19,14 @@
 
 ;;; Code:
 
-(define-module (system il compile)
+(define-module (language ghil compile-glil)
   #:use-syntax (system base syntax)
-  #:use-module (system il glil)
-  #:use-module (system il ghil)
+  #:use-module (language glil def)
+  #:use-module (language ghil def)
   #:use-module (ice-9 common-list)
-  #:export (compile))
+  #:export (compile-glil))
 
-(define (compile x e opts)
+(define (compile-glil x e opts)
   (if (memq #:O opts) (set! x (optimize x)))
   (values (codegen x)
           (and e (cons (car e) (cddr e)))))

module/language/ghil/def.scm

@@ -19,7 +19,7 @@
 
 ;;; Code:
 
-(define-module (system il ghil)
+(define-module (language ghil def)
   #:use-module (system base syntax)
   #:use-module (system base pmatch)
   #:use-module (ice-9 regex)

module/language/ghil/spec.scm

@@ -22,8 +22,9 @@
 (define-module (language ghil spec)
   #:use-module (system base language)
   #:use-module (language glil spec)
-  #:use-module (system il ghil)
-  #:use-module ((system il compile) #:select ((compile . compile-il)))
+  #:use-module (language glil def)
+  #:use-module (language ghil def)
+  #:use-module (language ghil compile-glil)
   #:export (ghil))
 
 (define (write-ghil exp . port)
@@ -40,5 +41,5 @@
   #:reader	read
   #:printer	write-ghil
   #:parser      parse
-  #:compilers   `((,glil . ,compile-il))
+  #:compilers   `((,glil . ,compile-glil))
   )

module/language/glil/Makefile.am

@@ -1,3 +1,3 @@
-SOURCES = spec.scm
+SOURCES = spec.scm def.scm compile-objcode.scm
 modpath = language/glil
 include $(top_srcdir)/am/guilec

module/language/glil/compile-objcode.scm

@@ -19,9 +19,9 @@
 
 ;;; Code:
 
-(define-module (system vm assemble)
+(define-module (language glil compile-objcode)
   #:use-syntax (system base syntax)
-  #:use-module (system il glil)
+  #:use-module (language glil def)
   #:use-module (system vm instruction)
   #:use-module (system vm objcode)
   #:use-module ((system vm program) #:select (make-binding))
@@ -30,9 +30,9 @@
   #:use-module (ice-9 common-list)
   #:use-module (srfi srfi-4)
   #:use-module ((srfi srfi-1) #:select (append-map))
-  #:export (preprocess codegen assemble))
+  #:export (preprocess codegen compile-objcode))
 
-(define (assemble glil env . opts)
+(define (compile-objcode glil env . opts)
   (codegen (preprocess glil #f) #t))
 
 

module/language/glil/def.scm

@@ -19,7 +19,7 @@
 
 ;;; Code:
 
-(define-module (system il glil)
+(define-module (language glil def)
   #:use-module (system base syntax)
   #:use-module (system base pmatch)
   #:export

module/language/glil/spec.scm

@@ -22,8 +22,8 @@
 (define-module (language glil spec)
   #:use-module (system base language)
   #:use-module (language objcode spec)
-  #:use-module (system il glil)
-  #:use-module (system vm assemble)
+  #:use-module (language glil def)
+  #:use-module (language glil compile-objcode)
   #:export (glil))
 
 (define (write-glil exp . port)
@@ -36,7 +36,7 @@
   (parse-glil x))
 
 (define (compile x e opts)
-  (values (assemble x e) e))
+  (values (compile-objcode x e) e))
 
 (define-language glil
   #:title	"Guile Lowlevel Intermediate Language (GLIL)"

module/language/scheme/Makefile.am

@@ -1,3 +1,3 @@
-SOURCES = translate.scm spec.scm
+SOURCES = translate.scm spec.scm inline.scm
 modpath = language/scheme
 include $(top_srcdir)/am/guilec

module/language/scheme/inline.scm

@@ -19,9 +19,9 @@
 
 ;;; Code:
 
-(define-module (system il inline)
+(define-module (language scheme inline)
   #:use-module (system base syntax)
-  #:use-module (system il ghil)
+  #:use-module (language ghil def)
   #:use-module (srfi srfi-16)
   #:export (*inline-table* define-inline try-inline try-inline-with-env))
 
@@ -54,12 +54,12 @@
      ((number? exp)
       `(make-ghil-quote #f #f ,exp))
      (else (error "bad consequent yall" exp))))
-  `(set! (@ (system il inline) *inline-table*)
-         (assq-set! (@ (system il inline) *inline-table*)
+  `(set! (@ (language scheme inline) *inline-table*)
+         (assq-set! (@ (language scheme inline) *inline-table*)
                     ,sym
-                    (let ((make-ghil-inline (@ (system il ghil) make-ghil-inline))
-                          (make-ghil-quote (@ (system il ghil) make-ghil-quote))
-                          (try-inline (@ (system il inline) try-inline)))
+                    (let ((make-ghil-inline (@ (language ghil def) make-ghil-inline))
+                          (make-ghil-quote (@ (language ghil def) make-ghil-quote))
+                          (try-inline (@ (language scheme inline) try-inline)))
                       (case-lambda
                        ,@(let lp ((in clauses) (out '()))
                            (if (null? in)

module/language/scheme/translate.scm

@@ -22,8 +22,8 @@
 (define-module (language scheme translate)
   #:use-module (system base pmatch)
   #:use-module (system base language)
-  #:use-module (system il ghil)
-  #:use-module (system il inline)
+  #:use-module (language ghil def)
+  #:use-module (language scheme inline)
   #:use-module (system vm objcode)
   #:use-module (ice-9 receive)
   #:use-module (ice-9 optargs)

module/oop/goops.scm

@@ -1061,7 +1061,7 @@
 (eval-case
  ((load-toplevel compile-toplevel)
   (use-modules ((language scheme translate) :select (define-scheme-translator))
-               ((system il ghil) :select (make-ghil-inline))
+               ((language ghil def) :select (make-ghil-inline))
                (system base pmatch))
 
   ;; unfortunately, can't use define-inline because these are primitive

module/system/Makefile.am

@@ -1 +1 @@
-SUBDIRS = base il vm repl
+SUBDIRS = base vm repl

module/system/il/Makefile.am

@@ -1,3 +0,0 @@
-SOURCES = glil.scm ghil.scm inline.scm compile.scm
-modpath = system/il
-include $(top_srcdir)/am/guilec

module/system/vm/Makefile.am

@@ -1,4 +1,4 @@
-SOURCES = assemble.scm conv.scm debug.scm \
+SOURCES = conv.scm debug.scm \
 	  disasm.scm frame.scm instruction.scm objcode.scm \
 	  profile.scm program.scm trace.scm vm.scm
 modpath = system/vm