close Warning: Failed to sync with repository "(default)": database is locked; repository information may be out of date. Look in the Trac log for more information including mitigation strategies.

Ignore:
Timestamp:
05/13/10 16:47:44 (13 years ago)
Author:
Mark Evenson
Message:

Correct incorrect inclusion of changes in last commit.

File:
1 edited

Legend:

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

    r12676 r12677  
    3939(defun module-provide-system (module)
    4040  (let ((*readtable* (copy-readtable nil)))
    41        (handler-case
    42            (load-system-file (string-downcase (string module)))
    43          (t (e)
    44            (unless (and (typep e 'error)
    45                         (search "Failed to find loadable system file"
    46                                 (format nil "~A" e)))
    47              (format *error-output* "Failed to require  ~A because '~A'~%"
    48                      module e))
    49            nil))))
    50 
    51          ;;   (progn
    52          ;;     (format t "BEFORE~%")
    53          ;;     (load-system-file (string-downcase (string module)))
    54          ;;     (format t "AFTER~%"))
    55          ;; ((error (c)
    56          ;;   (progn
    57          ;;     (format t "MATCHED~%")
    58          ;;     ;; XXX It would be much better to detect an error
    59          ;;     ;; type rather than searching for a string, but
    60 
    61          ;;     ;; that's tricky as LOAD-SYSTEM-FILE is such an
    62          ;;     ;; early primitive.
    63          ;;     (when (search "Failed to find loadable system file"
    64          ;;                   (format nil "~A" c))
    65          ;;       (return-from module-provide-system (values nil c)))))))))
     41    (handler-case
     42        (load-system-file (string-downcase (string module)))
     43      (t (e)
     44        (unless (and (typep e 'error)
     45                     (search "Failed to find loadable system file"
     46                             (format nil "~A" e)))
     47          (format *error-output* "Failed to require  ~A because '~A'~%"
     48                  module e))
     49        nil))))
    6650   
    6751(defvar *module-provider-functions* nil)
     
    7862                           (append (list #'module-provide-system)
    7963                                 sys::*module-provider-functions*))
    80                (warn "Failed to require ~A." module-name))))
     64               (error "Don't know how to ~S ~A." 'require module-name))))
    8165      (set-difference *modules* saved-modules))))
    8266
Note: See TracChangeset for help on using the changeset viewer.