From cb351eee091d19f51f77f8732383c0bbcf7f5d1c Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 1 Jun 2018 09:12:39 +0100 Subject: [PATCH] Repair current-ground-dataspace initialization, to allow override in e.g. graphical programs --- racket/syndicate/core-lang.rkt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/racket/syndicate/core-lang.rkt b/racket/syndicate/core-lang.rkt index cc06242..639ac0d 100644 --- a/racket/syndicate/core-lang.rkt +++ b/racket/syndicate/core-lang.rkt @@ -47,7 +47,10 @@ ;; the inclusion of (module+ syndicate-main) is because it seems that the appearance order ;; of module+ forms determines the mutual visibility. So syndicate-main is ensured to be the ;; first module+ and consequently the main submodule can require it. - #'(#%module-begin (syndicate-module () ((module+ syndicate-main) forms ...)))])) + #'(#%module-begin + (syndicate-module () ((module+ syndicate-main) + (module+ main (current-ground-dataspace run-ground)) + forms ...)))])) (define-syntax (syndicate-module stx) (syntax-parse stx @@ -91,8 +94,6 @@ (when (not activated?) (set! activated? #t) boot-actions))) - (module+ main - (current-ground-dataspace run-ground)) (module+ main (require (submod ".." syndicate-main)) ((current-ground-dataspace) (activate!))))])