diff options
-rw-r--r-- | module/system/base/compile.scm | 6 | ||||
-rw-r--r-- | module/system/base/language.scm | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/module/system/base/compile.scm b/module/system/base/compile.scm index 71f768ada..d5539753e 100644 --- a/module/system/base/compile.scm +++ b/module/system/base/compile.scm @@ -27,7 +27,6 @@ #:use-module (ice-9 optargs) #:use-module (ice-9 receive) #:export (syntax-error - *current-language* compiled-file-name compile-file compile-and-load @@ -61,11 +60,6 @@ ;;; Compiler ;;; -(define *current-language* (make-fluid)) -(fluid-set! *current-language* 'scheme) -(define (current-language) - (fluid-ref *current-language*)) - (define (call-once thunk) (let ((entered #f)) (dynamic-wind diff --git a/module/system/base/language.scm b/module/system/base/language.scm index 8d02cd204..31e77089f 100644 --- a/module/system/base/language.scm +++ b/module/system/base/language.scm @@ -28,7 +28,9 @@ language-joiner language-make-default-environment lookup-compilation-order lookup-decompilation-order - invalidate-compilation-cache! default-environment)) + invalidate-compilation-cache! default-environment + + *current-language* current-language)) ;;; @@ -102,3 +104,15 @@ "Return the default compilation environment for source language LANG." ((language-make-default-environment (if (language? lang) lang (lookup-language lang))))) + + + +;;; +;;; Current language +;;; + +(define *current-language* (make-fluid)) +(fluid-set! *current-language* 'scheme) + +(define (current-language) + (fluid-ref *current-language*)) |