From a83d90126a8032eb192c601a9d6eb78e57624be4 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sat, 5 Jan 2013 14:50:11 -0500 Subject: [PATCH] 2.26.54: allow creation of plans and operations with extra keys. Frob CLOS methods so &allow-other-keys. This makes POIU happy, and probably GBBopen, too. --- asdf.asd | 2 +- asdf.lisp | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/asdf.asd b/asdf.asd index 23df3eb8..4b08ae7c 100644 --- a/asdf.asd +++ b/asdf.asd @@ -14,7 +14,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.26.53" ;; to be automatically updated by bin/bump-revision + :version "2.26.54" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:file "asdf"))) diff --git a/asdf.lisp b/asdf.lisp index aef215f8..4bc5b034 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -1,5 +1,5 @@ ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- -;;; This is ASDF 2.26.53: Another System Definition Facility. +;;; This is ASDF 2.26.54: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. @@ -120,7 +120,7 @@ ;; "2.345.6" would be a development version in the official upstream ;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 - (asdf-version "2.26.53") + (asdf-version "2.26.54") (existing-asdf (find-class 'component nil)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) @@ -2127,9 +2127,9 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. ((original-initargs ;; for backward-compat -- used by GBBopen and swank (via operation-forced) :initform nil :initarg :original-initargs :accessor operation-original-initargs))) -(defmethod shared-initialize :after ((o operation) slot-names &rest initargs - &key force force-not system verbose) - (declare (ignorable slot-names force force-not system verbose)) +(defmethod initialize-instance :after ((o operation) &rest initargs + &key force force-not system verbose &allow-other-keys) + (declare (ignorable force force-not system verbose)) (unless (slot-boundp o 'original-initargs) (setf (operation-original-initargs o) initargs))) @@ -2271,9 +2271,8 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. (cons (list-to-hash-set (mapcar #'coerce-name x))) ((eql t) (list-to-hash-set (list (coerce-name system)))))) -(defmethod shared-initialize :after ((plan plan-traversal) slot-names - &key (force () fp) (force-not () fnp) system verbose) - (declare (ignorable slot-names verbose)) +(defmethod initialize-instance :after ((plan plan-traversal) + &key (force () fp) (force-not () fnp) system &allow-other-keys) (with-slots (forced forced-not) plan (when fp (setf forced (normalize-forced-systems force system))) (when fnp (setf forced-not (normalize-forced-systems force-not system))))) -- GitLab