~ chicken-core (chicken-5) cba1b3bbcc83819957baa761e83c61c8eea35834
commit cba1b3bbcc83819957baa761e83c61c8eea35834 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Thu Oct 7 03:00:19 2010 -0400 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Thu Oct 7 03:00:19 2010 -0400 eval'd code should not load extensions from include-path (pointed out by Mario) diff --git a/NEWS b/NEWS index d9304195..9757af6f 100644 --- a/NEWS +++ b/NEWS @@ -23,10 +23,10 @@ - the deprecated `random-seed' function has been removed - parameters are now settable and can be modified using `set!' (SRFI-17) -- the impementation of overflow-detection for arithmetic operations +- the implementation of overflow-detection for arithmetic operations on fixnums have been replaced and now allow using the full 63-bit range of fixnums on 64-bit systems -- fixed serious inlining-bug (thanks to SVen Hartrumpf) +- fixed serious inlining-bug (thanks to Sen Hartrumpf) 4.6.1 diff --git a/batch-driver.scm b/batch-driver.scm index 65923f92..62809c9f 100644 --- a/batch-driver.scm +++ b/batch-driver.scm @@ -68,7 +68,10 @@ oname) ) ) ) ((memq 'to-stdout options) #f) (else (make-pathname #f (if filename (pathname-file filename) "out") "c")) ) ) - (ipath (map chop-separator (string-split (or (get-environment-variable "CHICKEN_INCLUDE_PATH") "") ";"))) + (ipath (map chop-separator + (string-split + (or (get-environment-variable "CHICKEN_INCLUDE_PATH") "") + ";"))) (opasses default-optimization-passes) (time0 #f) (time-breakdown #f) diff --git a/csi.scm b/csi.scm index c2d40c1b..cee0c8b1 100644 --- a/csi.scm +++ b/csi.scm @@ -955,7 +955,10 @@ EOF [batch (or script (member* '("-b" "-batch") args) eval?)] [quietflag (member* '("-q" "-quiet") args)] [quiet (or script quietflag eval?)] - [ipath (map chop-separator (string-split (or (get-environment-variable "CHICKEN_INCLUDE_PATH") "") ";"))] ) + [ipath (map chop-separator + (string-split + (or (get-environment-variable "CHICKEN_INCLUDE_PATH") "") + ";"))] ) (define (collect-options opt) (let loop ([opts args]) (cond [(member opt opts) diff --git a/eval.scm b/eval.scm index 0bbc84cb..32d71301 100644 --- a/eval.scm +++ b/eval.scm @@ -1122,7 +1122,7 @@ (and err? (##sys#error loc "cannot load core library" id)))) (else - (let ([id2 (##sys#find-extension p #t)]) + (let ([id2 (##sys#find-extension p #f)]) (cond (id2 (##sys#load id2 #f #f) (set! ##sys#loaded-extensions (cons p ##sys#loaded-extensions)) diff --git a/manual/Unit eval b/manual/Unit eval index 959aa336..f6e6b582 100644 --- a/manual/Unit eval +++ b/manual/Unit eval @@ -156,10 +156,7 @@ extension library and load it. If {{ID}} names a library-unit of the base system, then it is loaded via {{load-library}}. If no extension library is available for the given ID, then an attempt is made to load the file {{ID.so}} or {{ID.scm}} (in that order) -from one of the following locations: - -* the current include path, which defaults to the pathnames given in {{CHICKEN_INCLUDE_PATH}}. -* the current directory +in the current directory. {{ID}} should be a string or a symbol.Trap