Commit e8f02dea authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

3.0.1.5: Move TRAVERSE to backward-interface. Tweak convenience method generation.

parent 5f73d4d7

action.lisp

+14 −11
Original line number Diff line number Diff line
@@ -44,16 +44,20 @@ 
           (keyp (equal (last formals) '(&key)))

           (formals-no-key (if keyp (butlast formals) formals))

           (len (length formals-no-key))

           (prefix (subseq formals 0 (- len 2)))

           (operation (nth (- len 2) formals))

           (component (nth (- len 1) formals))

           (operation 'operation)

           (component 'component)

           (opix (position operation formals))

           (coix (position component formals))

           (prefix (subseq formals 0 opix))

           (suffix (subseq formals (1+ coix) len))

           (more-args (when keyp `(&rest ,rest &key &allow-other-keys))))

      (assert (and (integerp opix) (integerp coix) (= coix (1+ opix))))

      (flet ((next-method (o c)

               (if keyp

                   `(apply ',function ,@prefix ,o ,c ,rest)

                   `(,function ,@prefix ,o ,c))))

                   `(apply ',function ,@prefix ,o ,c ,@suffix ,rest)

                   `(,function ,@prefix ,o ,c ,@suffix))))

        `(progn

           (defmethod ,function (,@prefix (,operation symbol) ,component ,@more-args)

           (defmethod ,function (,@prefix (,operation symbol) component ,@suffix ,@more-args)

             (if ,operation

                 ,(next-method

                   (if operation-initargs ;backward-compatibility with ASDF1's operate. Yuck.
@@ -61,14 +65,13 @@ 
                       `(make-operation ,operation))

                   `(or (find-component () ,component) ,if-no-component))

                 ,if-no-operation))

           (defmethod ,function (,@prefix (,operation operation) ,component ,@more-args)

           (defmethod ,function (,@prefix (,operation operation) ,component ,@suffix ,@more-args)

             (if (typep ,component 'component)

                 (error "No defined method for ~S on ~/asdf-action:format-action/"

                        ',function (cons ,operation ,component))

                 (let ((,found (find-component () ,component)))

                   (if ,found

                 (if-let (,found (find-component () ,component))

                    ,(next-method operation found)

                       ,if-no-component)))))))))

                    ,if-no-component))))))))





;;;; self-description

asdf.asd

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
  :licence "MIT"

  :description "Another System Definition Facility"

  :long-description "ASDF builds Common Lisp software organized into defined systems."

  :version "3.0.1.4" ;; to be automatically updated by make bump-version

  :version "3.0.1.5" ;; to be automatically updated by make bump-version

  :depends-on ()

  #+asdf3 :encoding #+asdf3 :utf-8

  ;; For most purposes, asdf itself specially counts as a builtin system.

backward-interface.lisp

+15 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
  (:recycle :asdf/backward-interface :asdf)

  (:use :uiop/common-lisp :uiop :asdf/upgrade

   :asdf/component :asdf/system :asdf/find-system :asdf/operation :asdf/action

   :asdf/lisp-action :asdf/operate :asdf/output-translations)

   :asdf/lisp-action :asdf/plan :asdf/operate :asdf/output-translations)

  (:export

   #:*asdf-verbose*

   #:operation-error #:compile-error #:compile-failed #:compile-warned

   #:error-component #:error-operation

   #:error-component #:error-operation #:traverse

   #:component-load-dependencies

   #:enable-asdf-binary-locations-compatibility

   #:operation-forced
@@ -62,7 +62,19 @@ We recommend you use ASDF:SYSTEM-SOURCE-FILE instead 
for a mostly compatible replacement that we're supporting,

or even ASDF:SYSTEM-SOURCE-DIRECTORY or ASDF:SYSTEM-RELATIVE-PATHNAME

if that's whay you mean." ;;)

    (system-source-file x)))

    (system-source-file x))



  (defgeneric* (traverse) (operation component &key &allow-other-keys)

    (:documentation

     "Generate and return a plan for performing OPERATION on COMPONENT.



The plan returned is a list of dotted-pairs. Each pair is the CONS

of ASDF operation object and a COMPONENT object. The pairs will be

processed in order by OPERATE."))

  (define-convenience-action-methods traverse (operation component &key))



  (defmethod traverse ((o operation) (c component) &rest keys &key plan-class &allow-other-keys)

    (plan-actions (apply 'make-plan plan-class o c keys))))





;;;; ASDF-Binary-Locations compatibility

header.lisp

+1 −1
Original line number Diff line number Diff line 
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-

;;; This is ASDF 3.0.1.4: Another System Definition Facility.

;;; This is ASDF 3.0.1.5: Another System Definition Facility.

;;;

;;; Feedback, bug reports, and patches are all welcome:

;;; please mail to <asdf-devel@common-lisp.net>.

interface.lisp

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
  ;; TODO: automatically generate interface with reexport?

  (:export

   #:defsystem #:find-system #:locate-system #:coerce-name

   #:oos #:operate #:traverse #:perform-plan #:sequential-plan

   #:oos #:operate #:make-plan #:perform-plan #:sequential-plan

   #:system-definition-pathname #:with-system-definitions

   #:search-for-system-definition #:find-component #:component-find-path

   #:compile-system #:load-system #:load-systems
@@ -75,6 +75,7 @@ 
   #:module-components ; backward-compatibility

   #:operation-on-warnings #:operation-on-failure ; backward-compatibility

   #:component-property ; backward-compatibility

   #:traverse ; backward-compatibility



   #:system-description

   #:system-long-description