~ chicken-core (chicken-5) f94b6850756c55cfedf9034d48b9b01ce6a60d06
commit f94b6850756c55cfedf9034d48b9b01ce6a60d06 Author: Evan Hanson <evhan@foldling.org> AuthorDate: Fri Feb 13 17:06:45 2015 +1300 Commit: Evan Hanson <evhan@foldling.org> CommitDate: Fri Feb 13 17:06:45 2015 +1300 Import regardless of features when interpreted This causes import libraries to be loaded into interpreted code whether or not the associated feature has already been registered, which is necessary now that the core units are modules and thus may require aliasing even when their libraries are already loaded. diff --git a/eval.scm b/eval.scm index 2b6882d8..d0fe5bf2 100644 --- a/eval.scm +++ b/eval.scm @@ -1310,10 +1310,10 @@ (##sys#syntax-error-hook 'require-extension "invalid SRFI number" n))) (define (doit id impid) (cond ((or (memq id builtin-features) - (if comp? - (memq id builtin-features/compiled) - (##sys#feature? id) ) ) - (values (impform '(##core#undefined) impid #t) #t id) ) + (and comp? (memq id builtin-features/compiled))) + (values (impform '(##core#undefined) impid #t) #t id)) + ((and (not comp?) (##sys#feature? id)) + (values (impform '(##core#undefined) impid #f) #t id)) ((memq id ##sys#core-library-modules) (values (impformTrap