May 2026 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][issue-497-describe-macro-with-arglist] 2 commits: Use common function for printing arglist
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch issue-497-describe-macro-with-arglist at cmucl / cmucl Commits: a0db1d64 by Raymond Toy at 2026-05-01T11:07:15-07:00 Use common function for printing arglist New function `print-function/macro-arglist` to print the arglist consistently between native compiled or byte-compiled funtions (macros). - - - - - 105f8c4a by Raymond Toy at 2026-05-01T11:13:07-07:00 Add tests for defmacro Tests that we can see the arglist macros. - - - - - 2 changed files: - src/code/describe.lisp - + tests/defmacro.lisp Changes: ===================================== src/code/describe.lisp ===================================== @@ -331,6 +331,20 @@ (:stream (format t "~&~S" name)) (:lisp (format t "~&~S" name))))))))) +;; Common function for printing the function or macro lambda-list. +(defun print-function/macro-arglist (kind args knownp) + (format t (intl:gettext "~&~@(~@[~A ~]arguments:~%~)") kind) + (cond ((not knownp) + (format t (intl:gettext " There is no argument information available."))) + ((or (null args) + (equal args "()")) + (write-string (intl:gettext " There are no arguments."))) + (t + (write-string " ") + (indenting-further *standard-output* 2 + (etypecase args + (string (write-string args)) + (list (prin1 args))))))) ;;; DESCRIBE-FUNCTION-COMPILED -- Internal ;;; @@ -339,15 +353,7 @@ ;;; (defun describe-function-compiled (x kind name) (let ((args (%function-arglist x))) - (format t (intl:gettext "~&~@(~@[~A ~]arguments:~%~)") kind) - (cond ((not args) - (format t (intl:gettext " There is no argument information available."))) - ((string= args "()") - (write-string (intl:gettext " There are no arguments."))) - (t - (write-string " ") - (indenting-further *standard-output* 2 - (write-string args))))) + (print-function/macro-arglist kind args (not (null args)))) (let ((name (or name (%function-name x)))) (desc-doc name 'function kind) @@ -356,25 +362,15 @@ (print-compiled-from (kernel:function-code-header x))) - -#+nil -(defun describe-function-byte-compiled (x kind name) - - (let ((name (or name (c::byte-function-name x)))) - (desc-doc name 'function kind) - (unless (eq kind :macro) - (describe-function-name name 'function))) - - (print-compiled-from (c::byte-function-component x))) - +;;; DESCRIBE-FUNCTION-BYTE-COMPILED -- Internal +;;; +;;; Describe a byte-compiled function. (defun describe-function-byte-compiled (x kind name) - (let ((name (or name (c::byte-function-name x)))) (when (eq kind :macro) - (let ((args (c::info :function :macro-arglist name))) - (when args - (format t (intl:gettext "~&~@(~@[~A ~]arguments:~%~)") kind) - (format t " ~S" args)))) + (multiple-value-bind (args knownp) + (c::info :function :macro-arglist name) + (print-function/macro-arglist kind args knownp))) (desc-doc name 'function kind) (unless (eq kind :macro) (describe-function-name name 'function))) ===================================== tests/defmacro.lisp ===================================== @@ -0,0 +1,78 @@ +;;; Tests for defmacro documention and location info + +(defpackage :defmacro-tests + (:use :cl :lisp-unit)) + +(in-package "DEFMACRO-TESTS") + +(defmacro issue.497.no-args () + `(list)) + +(defmacro issue.497.simple (a b) + `(list ,a ,b)) + +(defmacro issue.497.optional (a &optional (b 0)) + `(* ,a ,b)) + +(defmacro issue.497.body (name &body body) + `(progn ,name ,@body)) + +(defmacro issue.497.with-doc (a b) + "Build a list from two args" + `(list ,a ,b)) + +(define-test issue.497.macro-arglist-no-args + (:tag :issues) + (multiple-value-bind (value knownp) + (c::info :function :macro-arglist 'issue.497.no-args) + (assert-equal '() value) + (assert-true knownp))) + +(define-test issue.497.macro-arglist-simple + (:tag :issues) + (assert-equal '(a b) + (c::info :function :macro-arglist 'issue.497.simple))) + +(define-test issue.497.macro-arglist-optional + (:tag :issues) + (assert-equal '(a &optional (b 0)) + (c::info :function :macro-arglist 'issue.497.optional))) + +(define-test issue.497.macro-arglist-body + (:tag :issues) + (assert-equal '(name &body body) + (c::info :function :macro-arglist 'issue.497.body))) + +(define-test issue.497.macro-expands + (:tag :issues) + ;; Storing the lambda-list must not have broken the macro-function + (assert-equal '(list 1 2) + (macroexpand-1 '(issue.497.simple 1 2)))) + +(define-test issue.497.describe-runs-cleanly + (:tag :issues) + ;; describe must not error on these macros. + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.497.simple)))) + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.497.no-args)))) + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.497.with-doc)))) + ;; And on a byte-compiled macro from the build itself. + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'ext:letf*))))) + +(define-test issue.497.byte-compiled-macro-has-arglist + (:tag :issues) + ;; ext:letf* is byte-compiled (extensions.lisp is :byte-compile t) + ;; and is the canonical example from the bug report. Its arglist + ;; should be available now. + (multiple-value-bind (args winp) + (c::info :function :macro-arglist 'ext:letf*) + (assert-true winp) + (assert-true (consp args)))) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f049451bea794f946103c2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f049451bea794f946103c2… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl] Pushed new branch issue-497-describe-macro-with-arglist
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed new branch issue-497-describe-macro-with-arglist at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-497-describe-macro-… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #496: Fix undefined var in with-temporary-file
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 70889867 by Raymond Toy at 2026-04-30T21:51:21-07:00 Fix #496: Fix undefined var in with-temporary-file - - - - - 2e1198bc by Raymond Toy at 2026-04-30T21:51:21-07:00 Merge branch 'issue-496-with-temp-file-undefined-var' into 'master' Fix #496: Fix undefined var in with-temporary-file Closes #496 See merge request cmucl/cmucl!372 - - - - - 1 changed file: - src/code/extensions.lisp Changes: ===================================== src/code/extensions.lisp ===================================== @@ -653,7 +653,8 @@ (file-template (gensym "TEMP-PATH-")) (unique-filename (gensym "UNIQUE-FILENAME-"))) `(let ((,file-template (create-template ,directory ,prefix)) - ,unique-filename) + ,unique-filename + ,filename) (unwind-protect (let (,fd) (multiple-value-setq (,fd ,unique-filename) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/16d8365f8acd96d71f2b1c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/16d8365f8acd96d71f2b1c… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][issue-495-describe-deftypes] Fix comment about :source-location :defvar and deftype
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch issue-495-describe-deftypes at cmucl / cmucl Commits: a1a945f4 by Raymond Toy at 2026-04-30T20:08:04-07:00 Fix comment about :source-location :defvar and deftype The :source-location :defvar doesn't hold deftype source-location information anymore. It's in :source-location :deftype. - - - - - 1 changed file: - src/compiler/globaldb.lisp Changes: ===================================== src/compiler/globaldb.lisp ===================================== @@ -1171,7 +1171,7 @@ ;;; Used to record the source-location of definitions. Despite the ;;; type name of "defvar", this holds the location information for ;;; defvar, defparameter, and defconstant. It also has the source -;;; location for defstruct and deftype. +;;; location for defstruct. (define-info-class source-location) (define-info-type source-location defvar (or form-numbers null) nil) ;; This is used for define-condition. It could also be used for View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a1a945f4682a013bc92eb6a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a1a945f4682a013bc92eb6a… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][issue-495-describe-deftypes] Update release notes.
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch issue-495-describe-deftypes at cmucl / cmucl Commits: 049baee2 by Raymond Toy at 2026-04-30T17:47:24-07:00 Update release notes. - - - - - 1 changed file: - src/general-info/release-22a.md Changes: ===================================== src/general-info/release-22a.md ===================================== @@ -58,6 +58,7 @@ public domain. * #463: `double-double-float` is missing comparison operations between `double-double-float` and `double-float` * #474: Add functions to print and parse C-style hex floats. + * #495: Describe for deftype returns more information. * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/049baee2446349789ca3be2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/049baee2446349789ca3be2… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl] Pushed new branch issue-496-with-temp-file-undefined-var
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed new branch issue-496-with-temp-file-undefined-var at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-496-with-temp-file-… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][master] Remove extra trailing paren in tests/unix.lisp
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 16d8365f by Raymond Toy at 2026-04-30T17:17:00-07:00 Remove extra trailing paren in tests/unix.lisp - - - - - 1 changed file: - tests/unix.lisp Changes: ===================================== tests/unix.lisp ===================================== @@ -20,7 +20,7 @@ filename template)))) (when fd - (unix:unix-unlink filename))))) + (unix:unix-unlink filename)))) (define-test mkstemp.non-ascii-name-returned (:tag :issues) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/16d8365f8acd96d71f2b1c2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/16d8365f8acd96d71f2b1c2… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][issue-495-describe-deftypes] Clean up tests
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch issue-495-describe-deftypes at cmucl / cmucl Commits: 0fe285a4 by Raymond Toy at 2026-04-30T17:13:59-07:00 Clean up tests Be more careful with the lambda-list for the deftype with no args. Make sure the lambda-list is empty and that it was actually recorded. We don't need a temp file for the deftype for source-location. Just create a string that compile-from-stream can use. - - - - - 1 changed file: - tests/deftype.lisp Changes: ===================================== tests/deftype.lisp ===================================== @@ -25,8 +25,12 @@ (define-test issue.495.lambda-list (:tag :issues) - ;; lambda-list should be empty - (assert-false (c::info :type :lambda-list 'issue.495.no-args)) + ;; lambda-list should be empty. Make sure the lambda-list is NIL + ;; and that it was actually recorded. + (multiple-value-bind (result recorded-p) + (c::info :type :lambda-list 'issue.495.no-args) + (assert-equal nil result) + (assert-true recorded-p)) ;; lambda-list should match (assert-equal '(&optional low high) (c::info :type :lambda-list 'issue.495.optional)) @@ -72,15 +76,10 @@ ;; ;; Create a temp file that contains the deftype. Compile it and ;; load it into this lisp. - (ext:with-temporary-file (temp-file) - (with-open-file (s temp-file - :direction :io - :if-exists :supersede - :element-type 'character) - (format s "(in-package ~A)~%" (package-name *test-package*)) - (format s "(deftype issue.495.locn () 'integer)") - (file-position s 0) - (ext:compile-from-stream s))) + (with-input-from-string (s (format nil + "(in-package ~A)~%(deftype issue.495.locn () 'integer)" + (package-name *test-package*))) + (ext:compile-from-stream s)) ;; The source-location should be stored only in the :deftype, not ;; :defvar. (assert-true (c::info :source-location :deftype 'issue.495.locn)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0fe285a4b74c916b6ef6eef… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0fe285a4b74c916b6ef6eef… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0

[Git][cmucl/cmucl][issue-495-describe-deftypes] Add tests for the new defype stuff
by Raymond Toy (＠rtoy) 01 May '26

01 May '26

Raymond Toy pushed to branch issue-495-describe-deftypes at cmucl / cmucl Commits: b30b350c by Raymond Toy at 2026-04-30T17:01:36-07:00 Add tests for the new defype stuff Add tests for the following: * The lambda-list for a deftype is correct. * The docstring for the deftype is correctly returned. * The expander for the deftype returns the correct value. * `describe` produces a string for deftype, verifying that both `c::info` and `documentation` return a string. * The source-location for a deftype (compiled) is not empty. - - - - - 1 changed file: - + tests/deftype.lisp Changes: ===================================== tests/deftype.lisp ===================================== @@ -0,0 +1,87 @@ +;;; Tests for deftype documention and location info + +(defpackage :deftype-tests + (:use :cl :lisp-unit)) + +(in-package "DEFTYPE-TESTS") + +(eval-when (:compile-toplevel :load-toplevel :execute) + ;; Capture the package. + (defvar *test-package* *package*)) + +;; Various types for testing. +(deftype issue.495.no-args () + '(integer 0 10)) + +(deftype issue.495.optional (&optional low high) + `(float ,low ,high)) + +(deftype issue.495.required (low high) + `(integer ,low ,high)) + +(deftype issue.495.with-doc () + "A small non-negative integer." + '(integer 0 10)) + +(define-test issue.495.lambda-list + (:tag :issues) + ;; lambda-list should be empty + (assert-false (c::info :type :lambda-list 'issue.495.no-args)) + ;; lambda-list should match + (assert-equal '(&optional low high) + (c::info :type :lambda-list 'issue.495.optional)) + (assert-equal '(low high) + (c::info :type :lambda-list 'issue.495.required))) + +(define-test issue.495.doc + (:tag :issues) + ;; Test that the docstring is returned as expected. + (assert-equal "A small non-negative integer." + (documentation 'issue.495.with-doc 'type)) + (assert-equal "A small non-negative integer." + (c::info :type :documentation 'issue.495.with-doc))) + +(define-test issue.495.expander + (:tag :issues) + ;; Test that the type expander produces the expected output. + (assert-equal '(integer 0 10) + (funcall (c::info :type :expander 'issue.495.no-args) + '(issue.495.no-args))) + (assert-equal '(float * *) + (funcall (c::info :type :expander 'issue.495.optional) + '(issue.495.optional)))) + +(define-test issue.495.describe + (:tag :issues) + ;; Just make sure describe prints some string. We're not testing + ;; the contents of the string. + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.495.no-args)))) + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.495.optional)))) + (assert-true + (stringp (with-output-to-string (*standard-output*) + (describe 'issue.495.required))))) + +(define-test issue.495.source-location + (:tag :issues) + ;; The source-location info is non-NIL only if we compile the + ;; deftype form. + ;; + ;; Create a temp file that contains the deftype. Compile it and + ;; load it into this lisp. + (ext:with-temporary-file (temp-file) + (with-open-file (s temp-file + :direction :io + :if-exists :supersede + :element-type 'character) + (format s "(in-package ~A)~%" (package-name *test-package*)) + (format s "(deftype issue.495.locn () 'integer)") + (file-position s 0) + (ext:compile-from-stream s))) + ;; The source-location should be stored only in the :deftype, not + ;; :defvar. + (assert-true (c::info :source-location :deftype 'issue.495.locn)) + (assert-false (c::info :source-location :defvar 'issue.495.locn))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b30b350cc5408fc1281fbd2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b30b350cc5408fc1281fbd2… You're receiving this email because of your account on gitlab.common-lisp.net. Manage all notifications: https://gitlab.common-lisp.net/-/profile/notifications | Help: https://gitlab.common-lisp.net/help

1 0