From 9ff56d9e65fa9292ef09a8ca01abd825147b37ac Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 8 Jan 2009 19:24:47 +0100 Subject: [PATCH] (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 | 3 +++ module/language/{ghil/def.scm => ghil.scm} | 2 +- module/language/ghil/Makefile.am | 2 +- module/language/ghil/compile-glil.scm | 4 ++-- module/language/ghil/spec.scm | 4 ++-- module/language/{glil/def.scm => glil.scm} | 2 +- module/language/glil/Makefile.am | 2 +- module/language/glil/compile-objcode.scm | 2 +- module/language/glil/spec.scm | 2 +- module/language/scheme/inline.scm | 6 +++--- module/language/scheme/translate.scm | 2 +- module/oop/goops.scm | 2 +- 12 files changed, 18 insertions(+), 15 deletions(-) rename module/language/{ghil/def.scm => ghil.scm} (99%) rename module/language/{glil/def.scm => glil.scm} (99%) diff --git a/module/language/Makefile.am b/module/language/Makefile.am index f31a648d3..7f179676e 100644 --- a/module/language/Makefile.am +++ b/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 diff --git a/module/language/ghil/def.scm b/module/language/ghil.scm similarity index 99% rename from module/language/ghil/def.scm rename to module/language/ghil.scm index 969b66df4..5180073c2 100644 --- a/module/language/ghil/def.scm +++ b/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) diff --git a/module/language/ghil/Makefile.am b/module/language/ghil/Makefile.am index 004520ca1..2b505f604 100644 --- a/module/language/ghil/Makefile.am +++ b/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 diff --git a/module/language/ghil/compile-glil.scm b/module/language/ghil/compile-glil.scm index 707e079e1..ae68f1435 100644 --- a/module/language/ghil/compile-glil.scm +++ b/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)) diff --git a/module/language/ghil/spec.scm b/module/language/ghil/spec.scm index bd0824e04..1f346f071 100644 --- a/module/language/ghil/spec.scm +++ b/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)) diff --git a/module/language/glil/def.scm b/module/language/glil.scm similarity index 99% rename from module/language/glil/def.scm rename to module/language/glil.scm index 61af5d57a..7844ad3a8 100644 --- a/module/language/glil/def.scm +++ b/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 diff --git a/module/language/glil/Makefile.am b/module/language/glil/Makefile.am index f72d9344c..76c6846d4 100644 --- a/module/language/glil/Makefile.am +++ b/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 diff --git a/module/language/glil/compile-objcode.scm b/module/language/glil/compile-objcode.scm index 16f160293..5259ca0af 100644 --- a/module/language/glil/compile-objcode.scm +++ b/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)) diff --git a/module/language/glil/spec.scm b/module/language/glil/spec.scm index 64f014750..41ab0303f 100644 --- a/module/language/glil/spec.scm +++ b/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)) diff --git a/module/language/scheme/inline.scm b/module/language/scheme/inline.scm index 457ef0dd9..47fb6724f 100644 --- a/module/language/scheme/inline.scm +++ b/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 '())) diff --git a/module/language/scheme/translate.scm b/module/language/scheme/translate.scm index 100575552..0132ff755 100644 --- a/module/language/scheme/translate.scm +++ b/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) diff --git a/module/oop/goops.scm b/module/oop/goops.scm index 054d425ce..2f6625c3f 100644 --- a/module/oop/goops.scm +++ b/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 -- 2.20.1