~ chicken-core (chicken-5) bd1ddb1be0761317a16a000c19eb000987e07f60
commit bd1ddb1be0761317a16a000c19eb000987e07f60 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Sat Jun 18 22:33:21 2011 +0200 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Sat Jun 18 22:33:21 2011 +0200 fix for #578: require-extension must expand into import for core-units diff --git a/eval.scm b/eval.scm index a52d2660..864c209c 100644 --- a/eval.scm +++ b/eval.scm @@ -683,10 +683,8 @@ (let loop ([ids (##sys#strip-syntax (cadr x))]) (if (null? ids) '(##core#undefined) - (let-values ([(exp _) - (##sys#do-the-right-thing - (##sys#resolve-module-name (car ids) #f) - #f imp?)]) + (let-values (((exp _) + (##sys#do-the-right-thing (car ids) #f imp?))) `(##core#begin ,exp ,(loop (cdr ids))) ) ) ) e #f tf cntr se) ) ] @@ -1253,7 +1251,7 @@ (if comp? `(##core#declare (uses ,id)) `(##sys#load-library ',id #f) ) - impid #t) + impid #f) #t) ) ((memq id ##sys#explicit-library-modules) (let* ((info (##sys#extension-information id 'require-extension)) diff --git a/tests/syntax-tests.scm b/tests/syntax-tests.scm index c3ba70fa..b573b27b 100644 --- a/tests/syntax-tests.scm +++ b/tests/syntax-tests.scm @@ -929,3 +929,9 @@ `(print ,(+ (cadr x) 1))) (foo 3) + + +;; #578: "use" with import-specifier has no effect for internal modules on csi's top-level + +(use (prefix srfi-1 list-)) +takeTrap