Ignore:
Timestamp:
01/30/11 18:55:48 (11 years ago)
Author:
ehuelsmann
Message:

Revert r13190: Detect loops in autoloads and requires.

Note: This commit broke trunk; reverting restores it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/require.lisp

    r13190 r13193  
    3737  t)
    3838
    39 (defun module-provide-system (module)
     39(defun module-provide-system (module) 
    4040  (let ((*readtable* (copy-readtable nil)))
    41     (handler-case
     41    (handler-case 
    4242        (load-system-file (string-downcase (string module)))
    43       (t (e)
     43      (t (e) 
    4444        (unless (and (typep e 'error)
    4545                     (search "Failed to find loadable system file"
    4646                             (format nil "~A" e)))
    47           (format *error-output* "Failed to require  ~A because '~A'~%"
     47          (format *error-output* "Failed to require  ~A because '~A'~%" 
    4848                  module e))
    4949        nil))))
    50 
     50   
    5151(defvar *module-provider-functions* nil)
    52 (defvar *requires-in-progress* nil)
    5352
    5453(defun require (module-name &optional pathnames)
    5554  (unless (member (string module-name) *modules* :test #'string=)
    56     (unless (member (string module-name) *requires-in-progress*
    57                     :test #'string=)
    58       (error "Circularity detected while requiring ~A; ~
    59               nesting list: ~S." module-name *requires-in-progress*))
    60     (let ((saved-modules (copy-list *modules*))
    61           (*requires-in-progress* (cons (string module-name)
    62                                         *requires-in-progress*)))
     55    (let ((saved-modules (copy-list *modules*)))
    6356      (cond (pathnames
    6457             (unless (listp pathnames) (setf pathnames (list pathnames)))
Note: See TracChangeset for help on using the changeset viewer.