From: Chris Hanson Date: Sun, 15 Apr 2007 15:42:20 +0000 (+0000) Subject: Back out last change; shouldn't be necessary with change to compiler. X-Git-Tag: 20090517-FFI~651 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7b4ca30e0da2cdaaad0642ba8224c77704fb0c5d;p=mit-scheme.git Back out last change; shouldn't be necessary with change to compiler. --- diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm index f64311b8a..f7ba1b96b 100644 --- a/v7/src/runtime/load.scm +++ b/v7/src/runtime/load.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: load.scm,v 14.89 2007/04/15 07:49:50 riastradh Exp $ +$Id: load.scm,v 14.90 2007/04/15 15:42:20 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -95,7 +95,7 @@ USA. (let ((kernel (lambda (filename last-file?) (receive (pathname loader) - (find-pathname filename load/default-types #t) + (find-pathname filename load/default-types) (with-eval-unit (pathname->uri pathname) (lambda () (let ((load-it @@ -118,7 +118,7 @@ USA. (define (fasload filename #!optional suppress-loading-message?) (receive (pathname loader) - (find-pathname filename fasload/default-types #f) + (find-pathname filename fasload/default-types) (loader pathname (if (default-object? suppress-loading-message?) load/suppress-loading-message? @@ -164,7 +164,7 @@ USA. (fluid-let ((load/default-find-pathname-with-type find-latest-file)) (apply fasload args))) -(define (find-pathname filename default-types built-in?) +(define (find-pathname filename default-types) (let ((pathname (merge-pathnames filename)) (find-loader (lambda (extension) @@ -180,8 +180,7 @@ USA. find-pathname (list filename default-types)) default-types)))) - (cond ((and built-in? - (built-in-object-file pathname)) + (cond ((built-in-object-file pathname) => (lambda (value) (values pathname ((find-loader #f) value))))