[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] Fix thinko in src/interp/vmlisp.lisp
From: |
Gabriel Dos Reis |
Subject: |
[Axiom-developer] Fix thinko in src/interp/vmlisp.lisp |
Date: |
Sat, 30 Jun 2007 18:02:41 -0500 (CDT) |
Hi,
This thinko while caugh while building build-improvements with
SBCL. The error is that the value of abs(N) should not be part
of the arguments to error() and should be computed separately.
Fixed thusly.
Applied to build-improvements.
Will apply silver SF/SVN shortly.
-- Gaby
2007-06-30 Gabriel Dos Reis <address@hidden>
* vmlisp.lisp.pamphlet (MACRO-MISSINGARGS): Fix thinko.
*** vmlisp.lisp.pamphlet (revision 22145)
--- vmlisp.lisp.pamphlet (local)
*************** can be restored.
*** 1855,1867 ****
(defun MACRO-MISSINGARGS (NAME ignore N)
(declare (ignore ignore))
(setq MACERRORCOUNT (+ 1 (eval 'MACERRORCOUNT)))
! (error (concatenate 'string (symbol-name NAME) " requires "
! (if (minusp N) "at least " "exactly ")
! (setq N (abs N))
! (case N (0 "no") (1 "one") (2 "two") (3 "three")
! (4 "four") (5 "five") (6 "six")
! (t (princ-to-string N)))
! (if (eq n 1) " argument," " arguments,"))))
(defun MACERR (MESSAGE &rest ignore)
(declare (ignore ignore))
--- 1855,1867 ----
(defun MACRO-MISSINGARGS (NAME ignore N)
(declare (ignore ignore))
(setq MACERRORCOUNT (+ 1 (eval 'MACERRORCOUNT)))
! (let ((nargs (abs N)))
! (error (concatenate 'string (symbol-name NAME) " requires "
! (if (minusp N) "at least " "exactly ")
! (case N (0 "no") (1 "one") (2 "two") (3 "three")
! (4 "four") (5 "five") (6 "six")
! (t (princ-to-string nargs)))
! (if (eq nargs 1) " argument," " arguments,")))))
(defun MACERR (MESSAGE &rest ignore)
(declare (ignore ignore))
- [Axiom-developer] Fix thinko in src/interp/vmlisp.lisp,
Gabriel Dos Reis <=