Changeset 12447 for trunk/abcl/src/org/armedbear/lisp/require.lisp

Timestamp:

02/11/10 12:03:56 (14 years ago)

Author:

Mark Evenson

Message:

REQUIRE now searches for ASDF systems.

If ASDF is loaded via (REQUIRE 'ASDF), all subsequent invocations of
REQUIRE will search for a loadable ASDF system definitions if the
default resolver mechanism fails.

SYS::*MODULE-PROVIDER-FUNCTIONS* now contains a customizable list of
module provider functions. Such a function takes a single argument of
the module that should be resolved and loaded. There is a builtin
resolver #'SYS::MODULE-PROVIDE-SYSTEM that implicitly called before
any functions in this variable.

File:

• trunk/abcl/src/org/armedbear/lisp/require.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/require.lisp

@@ -37 +37 @@
   t)
 
+(defun module-provide-system (module) 
+  (let ((*readtable* (copy-readtable nil)))
+    (handler-case 
+        (load-system-file (string-downcase (string module)))
+      (t (e) 
+        (unless (and (typep e 'error)
+                     (search "Failed to find loadable system file"
+                             (format nil "~A" e)))
+          (format *error-output* "Failed to require  ~A because '~A'~%" 
+                  module e))
+        nil))))
+    
+(defvar *module-provider-functions* nil)
+
 (defun require (module-name &optional pathnames)
   (unless (member (string module-name) *modules* :test #'string=)
@@ -45 +59 @@
                (load x)))
             (t
-             (let ((*readtable* (copy-readtable nil)))
-               (load-system-file (string-downcase (string module-name))))))
+             (unless (some (lambda (p) (funcall p module-name))
+                           (append (list #'module-provide-system)
+                                 sys::*module-provider-functions*))
+               (error "Don't know how to ~S ~A." 'require module-name))))
       (set-difference *modules* saved-modules))))
+