Eliminate FILENAME->COMPILED-OBJECT and the call to it in

LOAD-PACKAGE-SET.  LOAD will do the right thing when a built-in
object is available, and will also update debugging pathnames.

diff --git a/v7/src/runtime/packag.scm b/v7/src/runtime/packag.scm
index 8c2e7520f1d51e811bb86afe0cd875f40b93fb89..050b584b83a52525a774504fed01e05b97e43dea 100644 (file)
--- a/v7/src/runtime/packag.scm
+++ b/v7/src/runtime/packag.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: packag.scm,v 14.59 2008/02/10 06:14:12 cph Exp $
+$Id: packag.scm,v 14.60 2008/08/24 23:34:31 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -183,12 +183,7 @@ USA.
                   (lookup-option 'ALTERNATE-PACKAGE-LOADER options))
                  (load-component
                   (lambda (name environment)
-                    (let ((value (filename->compiled-object dir name)))
-                      (if value
-                          (begin
-                            (purify (load/purification-root value))
-                            (scode-eval value environment))
-                          (load name environment 'DEFAULT #t))))))
+                    (load name environment 'DEFAULT #t))))
              (if alternate-loader
                  (alternate-loader load-component options)
                  (begin
@@ -215,16 +210,6 @@ USA.
                                       ((UNIX) "unx")
                                       (else "unk"))))
    "pkd"))
-
-(define (filename->compiled-object directory name)
-  (let ((pathname (merge-pathnames name directory)))
-    (let ((value (built-in-object-file pathname)))
-      (if (and value (not load/suppress-loading-message?))
-         (write-notification-line
-          (lambda (port)
-            (write-string "Initialized " port)
-            (write (enough-namestring pathname) port))))
-      value)))
 \f
 (define-integrable (make-package-file tag version descriptions loads)
   (vector tag version descriptions loads))