source: branches/1.1.x/src/org/armedbear/lisp/require.lisp @ 14297

Last change on this file since 14297 was 14297, checked in by Mark Evenson, 8 years ago

Backport r14296.

Constrain the logic for when CL:REQUIRE pushes symbols to CL:*MODULES*.

A REQUIRE of ABCL-CONTRIB for an instance of the implementation that
cannot locate the contrib binary artifact as being in the same
directory as the location of the ABCL system jar by
SYS:FIND-SYSTEM-JAR now raises an error.

Fixes #275.

  • Property svn:eol-style set to native
  • Property svn:keywords set to Id
File size: 3.3 KB
Line 
1;;; require.lisp
2;;;
3;;; Copyright (C) 2003-2005 Peter Graves
4;;; $Id: require.lisp 14297 2012-12-06 09:26:37Z mevenson $
5;;;
6;;; This program is free software; you can redistribute it and/or
7;;; modify it under the terms of the GNU General Public License
8;;; as published by the Free Software Foundation; either version 2
9;;; of the License, or (at your option) any later version.
10;;;
11;;; This program is distributed in the hope that it will be useful,
12;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
13;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14;;; GNU General Public License for more details.
15;;;
16;;; You should have received a copy of the GNU General Public License
17;;; along with this program; if not, write to the Free Software
18;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19;;;
20;;; As a special exception, the copyright holders of this library give you
21;;; permission to link this library with independent modules to produce an
22;;; executable, regardless of the license terms of these independent
23;;; modules, and to copy and distribute the resulting executable under
24;;; terms of your choice, provided that you also meet, for each linked
25;;; independent module, the terms and conditions of the license of that
26;;; module.  An independent module is a module which is not derived from
27;;; or based on this library.  If you modify this library, you may extend
28;;; this exception to your version of the library, but you are not
29;;; obligated to do so.  If you do not wish to do so, delete this
30;;; exception statement from your version.
31
32(in-package #:system)
33
34;;; PROVIDE, REQUIRE (from SBCL)
35(defun provide (module-name)
36  (pushnew (string module-name) *modules* :test #'string=)
37  t)
38
39(defun module-provide-system (module) 
40  (let ((*readtable* (copy-readtable nil)))
41    (handler-case
42        (progn 
43          (load-system-file (string-downcase (string module)))
44          (provide module))
45      (t (e) 
46        (unless (and (typep e 'error)
47                     (search "Failed to find loadable system file"
48                             (format nil "~A" e)))
49          (format *error-output* "Failed to require  ~A because '~A'~%" 
50                  module e))
51        nil))))
52
53   
54(defvar *module-provider-functions* nil)
55
56(defun require (module-name &optional pathnames)
57  (unless (member (string module-name) *modules* :test #'string=)
58    (let ((saved-modules (copy-list *modules*)))
59      (cond               
60;;; Since these are files packaged with the system we ensure that
61;;; PROVIDE has been called unless the module has other dependencies
62;;; that must be satisfied to be loaded, which is currently only the
63;;; case with 'abcl-contrib'.
64        (pathnames
65         (unless (listp pathnames) (setf pathnames (list pathnames)))
66         (dolist (x pathnames)
67           (load x))
68         (unless (string-equal module-name "abcl-contrib")
69           (provide module-name)))
70;;; Responsibility for actually calling PROVIDE up to module provider
71;;; function
72        (t
73         (unless (some (lambda (p) (funcall p module-name))
74                           (append (list #'module-provide-system)
75                                   sys::*module-provider-functions*))
76               (error "Don't know how to ~S ~A." 'require module-name))))
77      (set-difference *modules* saved-modules))))
78
Note: See TracBrowser for help on using the repository browser.