diff --git a/asdf.asd b/asdf.asd index 52baf5b008e00c822e2d45f358459201f67d224e..1f30bd9a7d0534859f95ac8192b29644ec1ed543 100644 --- a/asdf.asd +++ b/asdf.asd @@ -74,7 +74,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.32.25" ;; to be automatically updated by make bump-version + :version "2.32.26" ;; 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. diff --git a/header.lisp b/header.lisp index 47a69dc24a52a652cf211c37b684aca52c537b6b..ca60428f2948f2904c92718b02a3b34d04804ff6 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.32.25: Another System Definition Facility. +;;; This is ASDF 2.32.26: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/test/test-utilities.script b/test/test-utilities.script index 0ce8eb373c2fb7d0aa7224f61ed63c52266fc312..3a02290699d004e1ee009a7547ff477a15144dd1 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -210,14 +210,15 @@ (assert (base-string-p (make-string 10 :element-type 'character)))) (defun basify (s) (coerce s 'base-string)) +(defun unbasify (s) (coerce s '(array character (*)))) ; on ECL, literals are base strings (!) #+non-base-chars-exist-p (progn (assert (not (base-string-p (make-string 10 :element-type 'character)))) - (assert (not (base-string-p "abc"))) + (assert (not (base-string-p (unbasify "abc")))) (assert (base-string-p (basify "abc"))) - (assert (not (base-string-p (strcat "a" NIL #\b "cd")))) + (assert (not (base-string-p (strcat "a" NIL #\b (unbasify "cd"))))) (assert (base-string-p (reduce/strcat (mapcar 'basify '("a" "b" NIL "cd"))))) (assert (base-string-p (strcat (basify "ab") (basify "cd")))) - (assert (not (base-string-p (strcat (basify "ab") #\c "d")))) + (assert (not (base-string-p (strcat (basify "ab") #\c (unbasify "d"))))) (assert (base-string-p (strcat (basify "ab") #\c #\d)))) diff --git a/test/test1.preferences b/test/test1.preferences deleted file mode 100644 index 2d6bfa639efaed8a30c486a9411cbecd880f82a9..0000000000000000000000000000000000000000 --- a/test/test1.preferences +++ /dev/null @@ -1,3 +0,0 @@ -(in-package :asdf-test) - -(setf *test6* :yes) diff --git a/uiop/lisp-build.lisp b/uiop/lisp-build.lisp index d25946b2fc0e576f46b03e25f0b83bd6f204cf40..e2e376db05afb83407543218d1536f7e76a19f72 100644 --- a/uiop/lisp-build.lisp +++ b/uiop/lisp-build.lisp @@ -231,10 +231,18 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when name)) (defun reify-function-name (function-name) (let ((name (or (first function-name) ;; defun: extract the name - (first (second function-name))))) ;; defmethod: keep gf name, drop method specializers + (let ((sec (second function-name))) + (or (and (atom sec) sec) ; scoped method: drop scope + (first sec)))))) ; method: keep gf name, drop method specializers (list name))) (defun unreify-function-name (function-name) function-name) + (defun nullify-non-literals (sexp) + (typecase sexp + ((or number character simple-string symbol pathname) sexp) + (cons (cons (nullify-non-literals (car sexp)) + (nullify-non-literals (cdr sexp)))) + (t nil))) (defun reify-deferred-warning (deferred-warning) (with-accessors ((warning-type ccl::compiler-warning-warning-type) (args ccl::compiler-warning-args) @@ -242,13 +250,10 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when (function-name ccl:compiler-warning-function-name)) deferred-warning (list :warning-type warning-type :function-name (reify-function-name function-name) :source-note (reify-source-note source-note) - :args (destructuring-bind (fun formals env) args - (declare (ignorable env)) - (list (unsymbolify-function-name fun) - (loop :for arg :in formals :collect - (typecase arg ;; notably preserve constant keyword arguments - ((or symbol number character simple-string pathname) arg))) - nil))))) + :args (destructuring-bind (fun &rest more) + args + (cons (unsymbolify-function-name fun) + (nullify-non-literals more)))))) (defun unreify-deferred-warning (reified-deferred-warning) (destructuring-bind (&key warning-type function-name source-note args) reified-deferred-warning @@ -257,8 +262,8 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when :function-name (unreify-function-name function-name) :source-note (unreify-source-note source-note) :warning-type warning-type - :args (destructuring-bind (fun . formals) args - (cons (symbolify-function-name fun) formals)))))) + :args (destructuring-bind (fun . more) args + (cons (symbolify-function-name fun) more)))))) #+(or cmu scl) (defun reify-undefined-warning (warning) ;; Extracting undefined-warnings from the compilation-unit diff --git a/upgrade.lisp b/upgrade.lisp index 1eb8df3a8508ed039360a41e9cbbc84251b906f5..6e03b159cbe1a5dc0799bd5a8f195425197955fa 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5. ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 - (asdf-version "2.32.25") + (asdf-version "2.32.26") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 86ba54c03533f6db3e4316f153cd620ae7154368..6975e7d904acd09a4e4c1b5268c09dbf55ea9443 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.25" +"2.32.26"