- as an argument, until one of them returns non-NIL."
- (unless (member (string module-name) *modules* :test #'string=)
- (cond (pathnames
- (unless (listp pathnames) (setf pathnames (list pathnames)))
- ;; ambiguity in standard: should we try all pathnames in the
- ;; list, or should we stop as soon as one of them calls PROVIDE?
- (dolist (ele pathnames t)
- (load ele)))
- (t
- (unless (some (lambda (p) (funcall p module-name))
- sb!ext::*module-provider-functions*)
- (error "Don't know how to load ~A" module-name))))))
+ as an argument, until one of them returns non-NIL. User code is
+ responsible for calling PROVIDE to indicate a successful load of the
+ module."
+ (let ((name (string module-name)))
+ (when (member name *requiring* :test #'string=)
+ (require-error "~@<Could not ~S ~A: circularity detected. Please check ~
+ your configuration.~:@>" 'require module-name))
+ (let ((saved-modules (copy-list *modules*))
+ (*requiring* (cons name *requiring*)))
+ (unless (member name *modules* :test #'string=)
+ (cond (pathnames
+ (unless (listp pathnames) (setf pathnames (list pathnames)))
+ ;; ambiguity in standard: should we try all pathnames in the
+ ;; list, or should we stop as soon as one of them calls PROVIDE?
+ (dolist (ele pathnames t)
+ (load ele)))
+ (t
+ (unless (some (lambda (p) (funcall p module-name))
+ *module-provider-functions*)
+ (require-error "Don't know how to ~S ~A."
+ 'require module-name)))))
+ (set-difference *modules* saved-modules))))