Commit b4cd5eed authored by Marco Antoniotti's avatar Marco Antoniotti 💬
Browse files

Some changes to improve handling of foreign systems and remove some irritants for SBCL.

parent aa3c7933
Loading
Loading
Loading
Loading
+51 −5
Changes for defsystem.lisp: 51 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2703,8 +2703,19 @@ D
(declaim (ftype (function (list) t) file-list-size))
(declaim (ftype (function (component list t &optional boolean) t)
                operate-on-system-structured-dependency))
(declaim (ftype (function (component) t) component-load-time))
(declaim (ftype (function (t) t) component-load-time))
#|
(declaim (ftype (function ((or string
			       pathname
			       foreign-system
			       component))
			  t)
                component-load-time))
|#
(declaim (ftype (function (t t) t) (setf component-load-time)))
#|
(declaim (ftype (function (t component) t) (setf component-load-time)))
|#


;;; Component Structure
@@ -3071,6 +3082,7 @@ D
      )
    ))


;;; asdf-compile-fun

(defun asdf-compile-fun (asdf-sys-component
@@ -3847,7 +3859,7 @@ used with caution.")
;;; 20050824 MA
;;;
;;; 20220204 MA; This is buggy as it ovverides the defaults if the
;;; slots are not given in the DEFSYSTEM form, need to fi it!
;;; slots are not given in the DEFSYSTEM form, need to fix it!

(defun preprocess-component-definition (definition-body)
  `(list* ,@(loop for slot in *component-evaluated-slots*
@@ -4522,8 +4534,8 @@ while we busy-wait. If 0, skips call to SLEEP.")
      ((or (setq peek (listen input-stream))
           (< (+ start timeout) (internal-real-time-in-seconds)))
       (when peek
         ;; was read-char-no-hang
         (read-char input-stream eof-error-p eof-value)))
         ;; Back to READ-CHAR-NO-HANG
         (read-char-no-hang input-stream eof-error-p eof-value)))
    (unless (zerop *sleep-amount*)
      (sleep *sleep-amount*))))

@@ -5118,7 +5130,41 @@ characters."
                            ;; (or (eq force :all) (eq force t))

                            (find (canonicalize-system-name system)
                                  *modules* :test #'string-equal))
                                  *modules*
				  :test #'string-equal))

                 (operate-on-system system operation :force force))
               )

	      ;; Is the system "foreign"?  I.e., can it be found using
	      ;; FIND-FOREIGN-SYSTEM?

	      ((and *operations-propagate-to-subsystems*
                    (not (listp system))
		    (or (stringp system) (symbolp system))
                    ;; The subsystem is a foreign defined system.
                    (find-foreign-system (string-downcase system)
					 :errorp nil))

               ;; Call OOS on it. Since *system-dependencies-delayed* is
               ;; T, the :depends-on slot is filled with the names of
               ;; systems, not defstructs.
               ;; Aside from system, operation, force, for everything else
               ;; we rely on the globals.

               (unless (and *providing-blocks-load-propagation*

                            ;; If *providing-blocks-load-propagation* is T,
                            ;; the system dependency must not exist in the
                            ;; *modules* for it to be loaded. Note that
                            ;; the dependencies are implicitly systems.

                            (find operation '(load :load) :test #'eq) ; Already loaded.
                            ;; (or (eq force :all) (eq force t))

                            (find (canonicalize-system-name system)
                                  *modules*
				  :test #'string-equal))

                 (operate-on-system system operation :force force))
               )