andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boot-module: primitive-load hack

This commit is contained in:
Jan Nieuwenhuizen 2019-11-15 16:36:50 +01:00
parent 0a1a53be8b
commit 3b9281194f
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes/module/mes/boot-module.scm
View File

@ -1764,7 +1764,9 @@
(resolve-module dir-hint-module-name #f)
(and (not (autoload-done-or-in-progress? dir-hint name))
(let ((didit #f))
(define (load-file proc file)
;; FIXME: *undefined* here is a terrible hack; it switches
;; toplevel for defines.
(define (load-file *undefined* file)
(save-module-excursion (lambda () (primitive-load file)))
(set! didit #t))
(dynamic-wind

3
src/eval-apply.c
View File

@ -592,7 +592,8 @@ eval:
if (R1->car == cell_symbol_define || R1->car == cell_symbol_define_macro)
{
global_p = 0;
if (R0->car->car != cell_closure)
if (R0->car->car != cell_closure
|| R0->cdr->car->car == cell_undefined)
global_p = 1;
#if 0
else if (g_debug > 0)