>From c1c4deb251c38220b8efddd76202684a4b2c5abf Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Tue, 8 Mar 2016 19:11:07 +0100 Subject: [PATCH] Make ##sys#find-extension return the full path Return the whole path including the extension to avoid any ambiguity. Fixes #133. Signed-off-by: Evan Hanson --- eval.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eval.scm b/eval.scm index 320e696..e87285d 100644 --- a/eval.scm +++ b/eval.scm @@ -1188,12 +1188,12 @@ (let ((rp (##sys#repository-path))) (define (check path) (let ((p0 (string-append path "/" p))) - (and (or (and rp - (not ##sys#dload-disabled) - (##sys#fudge 24) ; dload? - (file-exists? (##sys#string-append p0 ##sys#load-dynamic-extension))) - (file-exists? (##sys#string-append p0 source-file-extension)) ) - p0) ) ) + (or (and rp + (not ##sys#dload-disabled) + (##sys#fudge 24) ; dload? + (file-exists? (##sys#string-append p0 ##sys#load-dynamic-extension))) + (file-exists? (##sys#string-append p0 source-file-extension)) + (file-exists? p0)))) (let loop ((paths (##sys#append (if ##sys#setup-mode '(".") '()) (if rp (list rp) '()) @@ -1202,7 +1202,7 @@ (and (pair? paths) (let ((pa (##sys#slot paths 0))) (or (check pa) - (loop (##sys#slot paths 1)) ) ) ) ) ) ) )) + (loop (##sys#slot paths 1)))))))))) (define ##sys#loaded-extensions '()) -- 2.7.0