From eda296dc681e984c992b6c731848731432b55e7f Mon Sep 17 00:00:00 2001 From: Robert Dodier Date: Thu, 16 Feb 2023 09:53:14 -0800 Subject: [PATCH] Change name of argument for macros implementing :lisp and :lisp-quiet, to avoid name collision. Macro argument was L before, and EVAL is called by LISP-EVAL and LISP-QUIET, so if there is already a symbol L in sight, it will get mixed up with the argument. Example: :lisp (defvar l nil) :lisp (loop for x in '(1 2 3) do (push x l)) :lisp l yields (3 2 1) now, but it yielded (L) before. Same goes for :lisp-quiet. --- src/mdebug.lisp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mdebug.lisp b/src/mdebug.lisp index 5cd5f969c..defbbc901 100644 --- a/src/mdebug.lisp +++ b/src/mdebug.lisp @@ -633,11 +633,11 @@ Command Description~%~ "usage: :info :bkpt -- show breakpoints")))) "Print information about item") -(defmacro lisp-quiet (&rest l) +(defmacro lisp-quiet (&rest l-lisp-quiet) (if (not (string= *mread-prompt* "")) (setq *lisp-quiet-suppressed-prompt* *mread-prompt*)) (setq *mread-prompt* "") - (eval (cons 'progn l)) + (eval (cons 'progn l-lisp-quiet)) nil) (def-break :lisp-quiet 'lisp-quiet @@ -646,13 +646,13 @@ Command Description~%~ (def-break :lisp 'lisp-eval "Evaluate the lisp form following on the line") -(defmacro lisp-eval (&rest l) +(defmacro lisp-eval (&rest l-lisp-eval) (if (string= *mread-prompt* "") (setq *mread-prompt* *lisp-quiet-suppressed-prompt*)) - (dolist (v (multiple-value-list (eval (cons 'progn l)))) + (dolist (v-lisp-eval (multiple-value-list (eval (cons 'progn l-lisp-eval)))) (fresh-line *standard-output*) - (princ v))) + (princ v-lisp-eval))) (def-break :delete #'(lambda (&rest l) (iterate-over-bkpts l :delete) (values)) "Delete all breakpoints, or if arguments are supplied delete the -- 2.11.4.GIT