(language ghil def) becomes (language ghil)

* module/language/Makefile.am:
* module/language/ghil/Makefile.am:
* module/language/ghil.scm:
* module/language/ghil/compile-glil.scm:
* module/language/ghil/spec.scm:
* module/language/glil/Makefile.am:
* module/language/glil.scm:
* module/language/glil/compile-objcode.scm:
* module/language/glil/spec.scm:
* module/language/scheme/inline.scm:
* module/language/scheme/translate.scm:
* module/oop/goops.scm: Rename (language ghil def) and (language glil
  def) to not have the "def". They're nicer names.

module/language/Makefile.am

@@ -1 +1,4 @@
 SUBDIRS=scheme ghil glil objcode value
+SOURCES=ghil.scm glil.scm
+modpath = language
+include $(top_srcdir)/am/guilec

module/language/ghil.scm

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

module/language/ghil/Makefile.am

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

module/language/ghil/compile-glil.scm

@@ -21,8 +21,8 @@
 
 (define-module (language ghil compile-glil)
   #:use-syntax (system base syntax)
-  #:use-module (language glil def)
-  #:use-module (language ghil def)
+  #:use-module (language glil)
+  #:use-module (language ghil)
   #:use-module (ice-9 common-list)
   #:export (compile-glil))
 

module/language/ghil/spec.scm

@@ -22,8 +22,8 @@
 (define-module (language ghil spec)
   #:use-module (system base language)
   #:use-module (language glil spec)
-  #:use-module (language glil def)
-  #:use-module (language ghil def)
+  #:use-module (language glil)
+  #:use-module (language ghil)
   #:use-module (language ghil compile-glil)
   #:export (ghil))
 

module/language/glil.scm

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

module/language/glil/Makefile.am

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

module/language/glil/compile-objcode.scm

@@ -21,7 +21,7 @@
 
 (define-module (language glil compile-objcode)
   #:use-syntax (system base syntax)
-  #:use-module (language glil def)
+  #:use-module (language glil)
   #:use-module (system vm instruction)
   #:use-module (system vm objcode)
   #:use-module ((system vm program) #:select (make-binding))

module/language/glil/spec.scm

@@ -22,7 +22,7 @@
 (define-module (language glil spec)
   #:use-module (system base language)
   #:use-module (language objcode spec)
-  #:use-module (language glil def)
+  #:use-module (language glil)
   #:use-module (language glil compile-objcode)
   #:export (glil))
 

module/language/scheme/inline.scm

@@ -21,7 +21,7 @@
 
 (define-module (language scheme inline)
   #:use-module (system base syntax)
-  #:use-module (language ghil def)
+  #:use-module (language ghil)
   #:use-module (srfi srfi-16)
   #:export (*inline-table* define-inline try-inline try-inline-with-env))
 
@@ -57,8 +57,8 @@
   `(set! (@ (language scheme inline) *inline-table*)
          (assq-set! (@ (language scheme inline) *inline-table*)
                     ,sym
-                    (let ((make-ghil-inline (@ (language ghil def) make-ghil-inline))
-                          (make-ghil-quote (@ (language ghil def) make-ghil-quote))
+                    (let ((make-ghil-inline (@ (language ghil) make-ghil-inline))
+                          (make-ghil-quote (@ (language ghil) make-ghil-quote))
                           (try-inline (@ (language scheme inline) try-inline)))
                       (case-lambda
                        ,@(let lp ((in clauses) (out '()))

module/language/scheme/translate.scm

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

module/oop/goops.scm

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