Menu
▾
▴
[Maxima-commits] CVS: maxima/src acall.lisp,1.7,1.8 algfac.lisp,1.2,1.3 algsys.lisp,1.3,1.4 ar.lisp,1.5,1.6 asum.lisp,1.7,1.8 bessel.lisp,1.29,1.30 buildq.lisp,1.2,1.3 cl-info.lisp,1.19,1.20 combin.lisp,1.5,1.6 comm.lisp,1.9,1.10 comm2.lisp,1.7,1.8 commac.lisp,1.21,1.22 compar.lisp,1.6,1.7 compat.lisp,1.5,1.6 cpoly.lisp,1.5,1.6 csimp.lisp,1.4,1.5 csimp2.lisp,1.7,1.8 db.lisp,1.3,1.4 defcal.lisp,1.2,1.3 defint.lisp,1.7,1.8 displa.lisp,1.14,1.15 displm.lisp,1.3,1.4 dskfn.lisp,1.5,1.6 evalw.lisp,1.2,1.3 fcall.lisp,1.7,1.8 float.lisp,1.13,1.14 fortra.lisp,1.2,1.3 hayat.lisp,1.4,1.5 hyp.lisp,1.9,1.10 inmis.lisp,1.3,1.4 intpol.lisp,1.3,1.4 laplac.lisp,1.2,1.3 letmac.lisp,1.5,1.6 limit.lisp,1.11,1.12 linnew.lisp,1.2,1.3 macdes.lisp,1.20,1.21 macsys.lisp,1.34,1.35 mactex.lisp,1.26,1.27 marray.lisp,1.4,1.5 mat.lisp,1.2,1.3 matcom.lisp,1.4,1.5 matrix.lisp,1.6,1.7 matrun.lisp,1.4,1.5 maxmac.lisp,1.5,1.6 mdefun.lisp,1.2,1.3 merror.lisp,1.7,1.8 mforma.lisp,1.4,1.5 mhayat.lisp,1.3,1.4 misc.lisp,1.2,1.3 mlisp.lisp,1.13,1.14 mload.lisp,1.18,1.19 mmacro.lisp,1.3,1.4 mrgmac.lisp,1.6,1.7 mstuff.lisp,1.5,1.6 mtrace.lisp,1.8,1.9 newdet.lisp,1.2,1.3 newinv.lisp,1.2,1.3 nisimp.lisp,1.2,1.3 nparse.lisp,1.20,1.21 nrat4.lisp,1.6,1.7 nregex.lisp,1.5,1.6 numer.lisp,1.4,1.5 numth.lisp,1.5,1.6 nusum.lisp,1.4,1.5 optim.lisp,1.3,1.4 option.lisp,1.3,1.4 outmis.lisp,1.6,1.7 pois2.lisp,1.2,1.3 pois3.lisp,1.2,1.3 polyrz.lisp,1.4,1.5 psolve.lisp,1.3,1.4 rat3a.lisp,1.5,1.6 rat3b.lisp,1.4,1.5 rat3c.lisp,1.6,1.7 rat3d.lisp,1.4,1.5 rat3e.lisp,1.7,1.8 ratout.lisp,1.6,1.7 result.lisp,1.4,1.5 risch.lisp,1.4,1.5 rombrg.lisp,1.3,1.4 schatc.lisp,1.5,1.6 series.lisp,1.3,1.4 server.lisp,1.8,1.9 set.lisp,1.3,1.4 simp.lisp,1.10,1.11 sin.lisp,1.8,1.9 solve.lisp,1.5,1.6 spgcd.lisp,1.4,1.5 sublis.lisp,1.2,1.3 suprv1.lisp,1.19,1.20 trans1.lisp,1.5,1.6 trans3.lisp,1.4,1.5 trans4.lisp,1.5,1.6 trans5.lisp,1.2,1.3 transl.lisp,1.9,1.10 transm.lisp,1.5,1.6 transq.lisp,1.5,1.6 transs.lisp,1.12,1.13 trgred.lisp,1.3,1.4 trmode.lisp,1.9,1.10 trpred.lisp,1.3,1.4 trutil.lisp,1.2,1.3 ufact.lisp,1.2,1.3 utils.lisp,1.4,1.5
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29506 Modified Files: acall.lisp algfac.lisp algsys.lisp ar.lisp asum.lisp bessel.lisp buildq.lisp cl-info.lisp combin.lisp comm.lisp comm2.lisp commac.lisp compar.lisp compat.lisp cpoly.lisp csimp.lisp csimp2.lisp db.lisp defcal.lisp defint.lisp displa.lisp displm.lisp dskfn.lisp evalw.lisp fcall.lisp float.lisp fortra.lisp hayat.lisp hyp.lisp inmis.lisp intpol.lisp laplac.lisp letmac.lisp limit.lisp linnew.lisp macdes.lisp macsys.lisp mactex.lisp marray.lisp mat.lisp matcom.lisp matrix.lisp matrun.lisp maxmac.lisp mdefun.lisp merror.lisp mforma.lisp mhayat.lisp misc.lisp mlisp.lisp mload.lisp mmacro.lisp mrgmac.lisp mstuff.lisp mtrace.lisp newdet.lisp newinv.lisp nisimp.lisp nparse.lisp nrat4.lisp nregex.lisp numer.lisp numth.lisp nusum.lisp optim.lisp option.lisp outmis.lisp pois2.lisp pois3.lisp polyrz.lisp psolve.lisp rat3a.lisp rat3b.lisp rat3c.lisp rat3d.lisp rat3e.lisp ratout.lisp result.lisp risch.lisp rombrg.lisp schatc.lisp series.lisp server.lisp set.lisp simp.lisp sin.lisp solve.lisp spgcd.lisp sublis.lisp suprv1.lisp trans1.lisp trans3.lisp trans4.lisp trans5.lisp transl.lisp transm.lisp transq.lisp transs.lisp trgred.lisp trmode.lisp trpred.lisp trutil.lisp ufact.lisp utils.lisp Log Message: Replaced all-caps words with lower-case versions where appropriate. KEYWORDS become `keywords'. Index: acall.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/acall.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- acall.lisp 4 Oct 2004 02:25:55 -0000 1.7 +++ acall.lisp 25 Nov 2004 02:35:59 -0000 1.8 @@ -64,7 +64,7 @@ ((t) (marrayref-gensub aarray ind1 inds)) (t - (merror "BUG: Non-handled array created. ~M" aarray)))) + (merror "Bug: Non-handled array created. ~M" aarray)))) #-cl ((si:equal-hash-table) (gethash (if inds (cons ind1 inds) inds) aarray)) @@ -100,7 +100,7 @@ ((flonum) (= val flounbound)) ((fixnum) (= val fixunbound)) ((t) (eq val munbound)) - (t (merror "BUG: Array pointer of unknown type: ~S" + (t (merror "Bug: Array pointer of unknown type: ~S" ap))) (arrfind `((,aarray ,aarray) ,ind1 ,@ (copy-rest-arg inds))) val))) @@ -126,12 +126,12 @@ (defmfun $arrayapply (ar inds) (or ($listp inds) - (merror "The second arg to ARRAYAPPLY must be a list.")) + (merror "The second arg to `arrayapply' must be a list.")) (apply #'marrayref ar (cdr inds))) (defmfun $arraysetapply (ar inds val) (or ($listp inds) - (merror "The second arg to ARRAYAPPLY must be a list.")) + (merror "The second arg to `arrayapply' must be a list.")) (apply #'marrayset val ar (cdr inds))) @@ -148,7 +148,7 @@ ((t) (marrayset-gensub val aarray ind1 inds)) (t - (merror "BUG: unhandled array type. ~M" aarray)))) + (merror "Bug: unhandled array type. ~M" aarray)))) #+cl ((hash-table #+lispm si:equal-hash-table) (setf (gethash (if (cdr all-inds) @@ -211,7 +211,7 @@ (defun list-ref (l indexl &optional set-flag val) (cond ((atom l) - (merror "ERROR-> tried to take part of an atom.")) + (merror "Error-> tried to take part of an atom.")) ((null (cdr indexl)) (let ((n (car indexl))) (cond ((and (integerp n) (plusp n) @@ -231,7 +231,7 @@ (cond (set-flag l) (t ret)))) (t - (merror "ERROR-> ~M bad part subscript." n))))) + (merror "Error-> ~M bad part subscript." n))))) (set-flag (list-ref (list-ref l `(,(car indexl))) (cdr indexl) @@ -331,7 +331,7 @@ (defmfun mapply-tr (fun list) (or ($listp list) - (merror "Second arg to APPLY was not a list:~%~M" list)) + (merror "Second arg to `apply' was not a list:~%~M" list)) (mapply1 fun (cdr list) '|the first arg to a translated APPLY| list)) @@ -446,7 +446,7 @@ ((aarray) (case (array-type aarray) ((flonum) (arraycall flonum aarray index)) - (t (merror "Bad type of array to call for FLOAT value: ~M" aarray)))) + (t (merror "Bad type of array to call for `float' value: ~M" aarray)))) (t (float (marrayref aarray index))))) @@ -455,7 +455,7 @@ ((aarray) (case (array-type aarray) ((flonum) (store (arraycall flonum aarray index) value)) - (t (merror "Bad type of array to set FLOAT into: ~M" aarray)))) + (t (merror "Bad type of array to set `float' into: ~M" aarray)))) (t (float (marrayset value aarray index))))) Index: algfac.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/algfac.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- algfac.lisp 4 Oct 2004 02:25:55 -0000 1.2 +++ algfac.lisp 25 Nov 2004 02:36:00 -0000 1.3 @@ -175,9 +175,9 @@ (declare(fixnum n i)) (setq fl (list f) n (cadr f)) loop (cond ((null fl)(cond((null nfl) - (cond ((= n (length ans))(setq trl* nil)(return ans))(t (merror "GFSPLIT"))))(t(setq fl nfl nfl nil i (f1+ i)))))) + (cond ((= n (length ans))(setq trl* nil)(return ans))(t (merror "`gfsplit'"))))(t(setq fl nfl nfl nil i (f1+ i)))))) (setq f (car fl) fl (cdr fl)) - (cond((> i mm*) (merror "GFSPLIT"))) + (cond((> i mm*) (merror "`gfsplit'"))) (comment (cond ((and (null modulus) (not alpha) (equal 2. (cadr f))) (setq ans (nconc ans (pfactorquad f))) @@ -198,7 +198,7 @@ (setq alc (painvmod (caddr tr)) tr (ptimes alc tr))) (t (setq alc 1.))) bk (cond ((pcoefp f) (return - (cond ((and(null f1)(null f2))(merror "WRONG TRACE"))(t (cons f1 f2))))) + (cond ((and(null f1)(null f2))(merror "Wrong trace"))(t (cons f1 f2))))) ((equal (cadr f) 1.) (return (cons (cons f f1) f2))) ((equal m modulus)(return (cons f1 (cons f f2))))) (setq trm (pdifference tr (ptimes m alc))) Index: algsys.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/algsys.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- algsys.lisp 18 Nov 2004 15:20:32 -0000 1.3 +++ algsys.lisp 25 Nov 2004 02:36:00 -0000 1.4 @@ -101,9 +101,9 @@ ;; (declare (special varxlist)) ;;?? (setq $%rnum_list (list '(mlist))) (cond ((not ($listp lhslist)) - (merror "Wrong type arg to ALGSYS:~%~M" lhslist)) + (merror "Wrong type arg to `algsys':~%~M" lhslist)) ((not ($listp varxlist)) - (merror "Wrong type arg to ALGSYS:~%~M" varxlist))) + (merror "Wrong type arg to `algsys':~%~M" varxlist))) ((lambda (tlhslist *tvarxlist* solnlist $ratprint $ratepsilon $keepfloat varlist genvar $ratfac $breakup $solvefactors *roots *failures *ivar* $polyfactor @@ -119,7 +119,7 @@ (setq *tvarxlist* (mapcar #'(lambda (q) (cond ((mnump q) - (merror "Unacceptable variable to ALGSYS:~%~M" + (merror "Unacceptable variable to `algsys':~%~M" q)) (t (caadr (ratf q))))) (cdr varxlist))) @@ -487,7 +487,7 @@ (defun callapprs (poly) (or (punivarp poly) - (merror "ALGSYS cannot solve - system too complicated.")) + (merror "`algsys' cannot solve - system too complicated.")) (let ($rootsquad $dispflag) (cond ($realonly (mapcar (function (lambda (q) @@ -507,7 +507,7 @@ (do ((tlhsl lhsl (cdr tlhsl))) (nil) (cond ((null tlhsl) (merror - "ALGSYS cannot solve - system too complicated.")) + "`algsys' cannot solve - system too complicated.")) ((pconstp (car tlhsl)) (return nil)) ((punivarp (car tlhsl)) (return (bakalevel (callapprs (car tlhsl)) Index: ar.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/ar.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ar.lisp 19 Oct 2004 12:04:36 -0000 1.5 +++ ar.lisp 25 Nov 2004 02:36:00 -0000 1.6 @@ -37,7 +37,7 @@ (case (ml-typep x) (array (array-element-type x)) (hash-table 'hash-table) - (cl:array (princ "confusion over ARRAY and CL:ARRAY") + (cl:array (princ "confusion over `array' and `cl:array'") (array-element-type x)) (otherwise @@ -83,7 +83,7 @@ :generator (car diml) :null the-null))) ('else - (merror "Array type of ~M is not recognized by MAKE_ARRAY" type)))) + (merror "Array type of ~M is not recognized by `make_array'" type)))) ('else (apply '*array nil (cdr ltype) diml))))) @@ -137,7 +137,7 @@ (array-dimension (marray-check a) n)) (defun marray-type-unknown (x) - (merror "BUG: Array of unhandled type: ~S" x)) + (merror "Bug: Array of unhandled type: ~S" x)) (defun marrayref-gensub (aarray ind1 inds) (case (marray-type aarray) Index: asum.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/asum.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- asum.lisp 23 Nov 2004 17:52:03 -0000 1.7 +++ asum.lisp 25 Nov 2004 02:36:00 -0000 1.8 @@ -269,7 +269,7 @@ (setq z (mapcar #'(lambda (q) (simpcheck q z)) (cdr x))) (let ((a (car z)) (b ($entier (cadr z))) (c (caddr z))) (cond ((and (fixnump b) (> b -1)) (gfact a b c)) - ((integerp b) (merror "Bad second argument to GENFACT: ~:M" b)) + ((integerp b) (merror "Bad second argument to `genfact': ~:M" b)) (t (eqtest (list '(%genfact) a (if (and (not (atom b)) (eq (caar b) '$entier)) @@ -349,7 +349,7 @@ (simplifya (sum-upper x) z))) (defun simpsum1 (exp i lo hi) - (cond ((not (symbolp i)) (merror "Improper index to SUM:~%~M" i)) + (cond ((not (symbolp i)) (merror "Improper index to `sum':~%~M" i)) ((equal lo hi) (mbinding ((list i) (list hi)) (meval exp))) ((and (atom exp) (not (eq exp i)) Index: bessel.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/bessel.lisp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- bessel.lisp 6 Oct 2004 14:46:39 -0000 1.29 +++ bessel.lisp 25 Nov 2004 02:36:00 -0000 1.30 @@ -402,7 +402,7 @@ ;; Bessel function of the first kind for real or complex arg and real ;; non-negative order. (defun $bessel ($arg $order) - "BESSEL(arg, order) = J[order](arg). This is deprecated. Use bessel_j(order,arg)" + "bessel(arg, order) = J[order](arg). This is deprecated. Use bessel_j(order,arg)" (cond ((not (bessel-numerical-eval-p $order $arg)) ;; Args aren't numeric. Return unevaluated. (list '(%bessel_j simp) $order $arg)) Index: buildq.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/buildq.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- buildq.lisp 4 Oct 2004 02:25:55 -0000 1.2 +++ buildq.lisp 25 Nov 2004 02:36:00 -0000 1.3 @@ -76,7 +76,7 @@ (defmspec $buildq (form) (setq form (cdr form)) (cond ((or (null (cdr form)) (cddr form)) - (merror "BUILDQ takes 2 args:~%~M" `(($buildq) ,@form))) + (merror "`buildq' takes 2 args:~%~M" `(($buildq) ,@form))) (t (mbuildq (car form) (cadr form))))) ;; this macro definition is NOT equivalent because of the way lisp macros @@ -94,13 +94,13 @@ ;; (NULL EXPRESSIONS) ;; (CDR EXPRESSIONS)) ;; (DISPLA `(($BUILDQ) ,VARLIST ,@EXPRESSIONS)) -;; (MERROR "BUILDQ takes 2 args")) +;; (MERROR "`buildq' takes 2 args")) ;; (T `(MBUILDQ ',VARLIST ',(CAR EXPRESSIONS))))) (defun mbuildq (varlist expression) (cond ((not ($listp varlist)) - (merror "First arg to BUILDQ not a list: ~M" varlist))) + (merror "First arg to `buildq' not a list: ~M" varlist))) (mbuildq-subst (mapcar #'(lambda (form) ; make a variable/value alist (cond ((symbolp form) @@ -109,7 +109,7 @@ (symbolp (cadr form))) (cons (cadr form) (meval (caddr form)))) (t - (merror "Illegal form in variable list--BUILDQ: ~M" + (merror "Illegal form in variable list--`buildq': ~M" form )))) (cdr varlist)) @@ -131,7 +131,7 @@ ; if the expression is a legal SPLICE, this clause is taken. ; a SPLICE should never occur here. It corresponds to `,@form - (merror "SPLICE used in illegal context: ~M" expression)) + (merror "`splice' used in illegal context: ~M" expression)) ((atom (caar expression)) (setq new-car (mbuildq-associate (caar expression) alist)) (cond ((eq new-car (caar expression)) @@ -197,6 +197,6 @@ (let ((match (assq (cadr expression) varlist))) (cond ((null match) () ) ((not ($listp (cdr match))) - (merror "~M returned ~M~%But SPLICE must return a list" + (merror "~M returned ~M~%But `splice' must return a list" expression (cdr match))) (t (cdr match)))))) Index: cl-info.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/cl-info.lisp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- cl-info.lisp 18 Oct 2004 22:25:56 -0000 1.19 +++ cl-info.lisp 25 Nov 2004 02:36:00 -0000 1.20 @@ -535,7 +535,7 @@ ;; This looks for the desired pattern. A typical entry ;; looks like ;; - ;; " - Function: PLOT2D <random stuff>" + ;; " - Function: plot2d <random stuff>" ;; ;; So we look for the beginning of a line, the string " - ;; ", followed by at least one letter or spaces and then a @@ -696,7 +696,7 @@ (format t "~&~a~a~a" *prompt-prefix* (if (zerop prompt-count) - "Enter space-separated numbers, ALL or NONE: " + "Enter space-separated numbers, `all' or `none': " "Still waiting: ") *prompt-suffix*)) Index: combin.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/combin.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- combin.lisp 18 Nov 2004 15:20:31 -0000 1.5 +++ combin.lisp 25 Nov 2004 02:36:00 -0000 1.6 @@ -538,7 +538,7 @@ (defmfun $cfdisrep (a) (cond ((not ($listp a)) - (merror "Arg to CFDISREP not a list: ~M" a)) + (merror "Arg to `cfdisrep' not a list: ~M" a)) ((null (cddr a)) (cadr a)) ((zerop (cadr a)) (list '(mexpt) (cfdisrep1 (cddr a)) -1)) @@ -1219,9 +1219,9 @@ (or (and (oldget op 'op) (not (eq op 'mfactorial))) (not (atom (cadr fun))) (not (= (length fun) 2)))))) - (merror "Bad argument to DEFTAYLOR:~%~M" fun)) + (merror "Bad argument to `deftaylor':~%~M" fun)) (when (oldget op 'sp2) - (mtell "~:M being redefined in DEFTAYLOR.~%" op)) + (mtell "~:M being redefined in `deftaylor'.~%" op)) (when param (setq series (subst 'sp2var param series))) (setq series (subsum '*index series)) (putprop op series 'sp2) @@ -1237,7 +1237,7 @@ (cond ((atom e) e) ((eq (caar e) '%sum) (if (null (smonop (cadr e) 'sp2var)) - (merror "Argument to DEFTAYLOR must be power series at 0.") + (merror "Argument to `deftaylor' must be power series at 0.") (subst *i (caddr e) e))) (t (recur-apply #'susum1 e)))) @@ -1252,13 +1252,13 @@ *var* (cdr (ratf v))) (cond ((or (null (cdr *var*)) (null (equal (cdar *var*) '(1 1)))) - (merror "Second arg to POLYDECOMP must be an atom")) + (merror "Second arg to `polydecomp' must be an atom")) (t (setq *var* (caar *var*)))) (cond ((or (pcoefp (cdr p)) (null (eq (cadr p) *var*))) (setq den (cdr p) p (car p))) - (t (merror "Cannot POLYDECOMP a rational function"))) + (t (merror "Cannot `polydecomp' a rational function"))) (cons '(mlist) (cond ((or (pcoefp p) (null (eq (car p) *var*))) Index: comm.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/comm.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- comm.lisp 1 Nov 2004 22:17:05 -0000 1.9 +++ comm.lisp 25 Nov 2004 02:36:00 -0000 1.10 @@ -225,7 +225,7 @@ nil)))))) (defmfun $depends n - (if (oddp n) (merror "DEPENDS takes an even number of arguments.")) + (if (oddp n) (merror "`depends' takes an even number of arguments.")) (do ((i 1 (f+ i 2)) (l)) ((> i n) (i-$dependencies (nreverse l))) (cond (($listp (arg i)) @@ -243,7 +243,7 @@ (dolist (z l) (cond ((atom z) (merror "Wrong format. Try F(X).")) ((or (eq (caar z) 'mqapply) (memq 'array (cdar z))) - (merror "Improper form for DEPENDS:~%~M" z)) + (merror "Improper form for `depends':~%~M" z)) (t (let ((y (mget (caar z) 'depends))) (mputprop (caar z) (setq y (union* (reverse (cdr z)) y)) @@ -256,7 +256,7 @@ (defmspec $gradef (l) (setq l (cdr l)) (let ((z (car l)) (n 0)) (cond ((atom z) - (if (not (= (length l) 3)) (merror "Wrong arguments to GRADEF")) + (if (not (= (length l) 3)) (merror "Wrong arguments to `gradef'")) (mputprop z (cons (cons (cadr l) (meval (caddr l))) (mget z '$atomgrad)) @@ -265,12 +265,12 @@ (add2lnc z $props) z) ((or (mopp1 (caar z)) (memq 'array (cdar z))) - (merror "Wrong arguments to GRADEF:~%~M" z)) + (merror "Wrong arguments to `gradef':~%~M" z)) ((prog2 (setq n (f- (length z) (length l))) (minusp n)) (wna-err '$gradef)) (t (do ((zl (cdr z) (cdr zl))) ((null zl)) (if (not (symbolp (car zl))) - (merror "Parameters to GRADEF must be names:~%~M" + (merror "Parameters to `gradef' must be names:~%~M" (car zl)))) (setq l (nconc (mapcar #'(lambda (x) (remsimp (meval x))) (cdr l)) @@ -304,7 +304,7 @@ ((null (cddr z)) (wna-err '$diff)) ((not (eq (ml-typep (caddr z)) 'fixnum)) (go noun)) ((minusp (setq count (caddr z))) - (merror "Improper count to DIFF:~%~M" count))) + (merror "Improper count to `diff':~%~M" count))) loop1(cond ((zerop count) (rplacd z (cdddr z)) (go loop2)) ((equal (setq exp (sdiff exp (cadr z))) 0) (return 0))) (setq count (f1- count)) @@ -586,7 +586,7 @@ (defmfun $dispform n (if (not (or (= n 1) (and (= n 2) (eq (arg 2) '$all)))) - (merror "Incorrect arguments to DISPFORM")) + (merror "Incorrect arguments to `dispform'")) (let ((e (arg 1))) (if (or (atom e) (atom (setq e (if (= n 1) (nformat e) (nformat-all e)))) @@ -803,7 +803,7 @@ (atomchk (setq u (specrepcheck u)) '$append nil) (if (or (not (alike1 op (mop u))) (not (eq arrp (if (memq 'array (cdar u)) t)))) - (merror "Arguments to APPEND are not compatible.")) + (merror "Arguments to `append' are not compatible.")) (margs u)) (listify n))))))) @@ -826,7 +826,7 @@ (defmfun $first (e) (atomchk (setq e (format1 e)) '$first nil) - (if (null (cdr e)) (merror "Argument to FIRST is empty.")) + (if (null (cdr e)) (merror "Argument to `first' is empty.")) (car (margs e))) ;; This macro is used to create functions second thru tenth. @@ -857,11 +857,11 @@ (cond ((= n 1)) ((not (= n 2)) (wna-err '$rest)) ((not (fixnump (arg 2))) - (merror "2nd argument to REST must be an integer:~%~M" + (merror "2nd argument to `rest' must be an integer:~%~M" (arg 2))) ((minusp (setq n (arg 2))) (setq n (f- n) revp t))) (if (< (length (margs m)) n) - (if $partswitch (return '$end) (merror "REST fell off end."))) + (if $partswitch (return '$end) (merror "`rest' fell off end."))) (setq fun (car m)) (if (eq (car fun) 'mqapply) (setq fun1 (cadr m) m (cdr m))) (setq m (cdr m)) @@ -875,7 +875,7 @@ (defmfun $last (e) (atomchk (setq e (format1 e)) '$last nil) - (if (null (cdr e)) (merror "Argument to LAST is empty.")) + (if (null (cdr e)) (merror "Argument to `last' is empty.")) (car (last e))) (defmfun $args (e) (atomchk (setq e (format1 e)) '$args nil) @@ -885,7 +885,7 @@ (cond ((= n 2) (setq n -1)) ((not (= n 3)) (wna-err '$delete)) ((or (not (fixnump (arg 3))) (minusp (setq n (arg 3)))) - (merror "Improper 3rd argument to DELETE:~%~M" (arg 3)))) + (merror "Improper 3rd argument to `delete':~%~M" (arg 3)))) (let ((x (arg 1)) (l (arg 2))) (atomchk (setq l (specrepcheck l)) '$delete t) (setq x (specrepcheck x) l (cons (delsimp (car l)) (copy-top-level (cdr l)))) @@ -901,11 +901,11 @@ (setq e (cond (($listp e) e) ((or $inflag (not ($ratp e))) (specrepcheck e)) (t ($ratdisrep e)))) - (cond ((symbolp e) (merror "LENGTH called on atomic symbol ~:M" e)) + (cond ((symbolp e) (merror "`length' called on atomic symbol ~:M" e)) ((or (numberp e) (eq (caar e) 'bigfloat)) (if (and (not $inflag) (mnegp e)) 1 - (merror "LENGTH called on number ~:M" e))) + (merror "`length' called on number ~:M" e))) ((or $inflag (not (memq (caar e) '(mtimes mexpt)))) (length (margs e))) ((eq (caar e) 'mexpt) (if (and (alike1 (caddr e) '((rat simp) 1 2)) $sqrtdispflag) 1 2)) Index: comm2.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/comm2.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- comm2.lisp 18 Nov 2004 15:20:31 -0000 1.7 +++ comm2.lisp 25 Nov 2004 02:36:00 -0000 1.8 @@ -406,7 +406,7 @@ (let (y x signy signx) (setq y (simpcheck (cadr e) z) x (simpcheck (caddr e) z)) (cond ((and (zerop1 y) (zerop1 x)) - (merror "ATAN2(0,0) has been generated.")) + (merror "atan2(0,0) has been generated.")) ( ;; float contagion (and (or (numberp x) (ratnump x)) ; both numbers (or (numberp y) (ratnump y)) ; ...but not bigfloats @@ -449,7 +449,7 @@ ((and (eq signx '$zero) (eq signy '$zero)) ;; Unfortunately, we'll rarely get here. For example, ;; assume(equal(x,0)) atan2(x,x) simplifies via the alike1 case above - (merror "ATAN2(0,0) has been generated.")) + (merror "atan2(0,0) has been generated.")) (t (eqtest (list '($atan2) y x) e))))) (defun atan2negp (e) (eq (asksign-p-or-n e) '$neg)) @@ -469,11 +469,11 @@ (defmspec $numerval (l) (setq l (cdr l)) (do ((l l (cddr l)) (x (ncons '(mlist simp)))) ((null l) x) - (cond ((null (cdr l)) (merror "NUMERVAL takes an even number of args")) + (cond ((null (cdr l)) (merror "`numerval' takes an even number of args")) ((not (symbolp (car l))) - (merror "~M must be atomic - NUMERVAL" (car l))) + (merror "~M must be atomic - `numerval'" (car l))) ((boundp (car l)) - (merror "~M is bound - NUMERVAL" (car l)))) + (merror "~M is bound - `numerval'" (car l)))) (mputprop (car l) (cadr l) '$numer) (add2lnc (car l) $props) (nconc x (ncons (car l))))) @@ -542,7 +542,7 @@ (defmfun scanmap1 n (let ((func (arg 1)) (arg2 (specrepcheck (arg 2))) newarg2) - (cond ((eq func '$rat) (merror "SCANMAP results must be in general representation.")) + (cond ((eq func '$rat) (merror "`scanmap' results must be in general representation.")) ((> n 2) (cond ((eq (arg 3) '$bottomup) (cond ((mapatom arg2) (funcer func (ncons arg2))) @@ -555,7 +555,7 @@ (margs arg2))))) arg2)))) ((> n 3) (wna-err '$scanmap)) - (t (merror "Only BOTTOMUP is an acceptable 3rd arg to SCANMAP.")))) + (t (merror "Only `bottomup' is an acceptable 3rd arg to `scanmap'.")))) ((mapatom arg2) (funcer func (ncons arg2))) (t (setq newarg2 (specrepcheck (funcer func (ncons arg2)))) (cond ((mapatom newarg2) newarg2) @@ -606,7 +606,7 @@ (improper-arg-err (car args) '$genmatrix)) ;(MEMQ NIL (MAPCAR #'(LAMBDA (U) (EQ (TYPEP U) 'FIXNUM)) (CDR ARGS))) (if (notevery #'fixnump (cdr args)) - (merror "Invalid arguments to GENMATRIX:~%~M" + (merror "Invalid arguments to `genmatrix':~%~M" (cons '(mlist) (cdr args)))) (let* ((header (list (car args) 'array)) (dim1 (cadr args)) @@ -616,7 +616,7 @@ (l (ncons '($matrix)))) (cond ((and (or (= dim1 0) (= dim2 0)) (= i 1) (= j 1))) ((or (> i dim1) (> j dim2)) - (merror "Invalid arguments to GENMATRIX:~%~M" + (merror "Invalid arguments to `genmatrix':~%~M" (cons '(mlist) args)))) (do ((i i (f1+ i))) ((> i dim1)) (nconc l (ncons (ncons '(mlist))))) (do ((i i (f1+ i)) (l (cdr l) (cdr l))) ((> i dim1)) @@ -625,11 +625,11 @@ l))) (defmfun $copymatrix (x) - (if (not ($matrixp x)) (merror "Argument not a matrix - COPYMATRIX:~%~M" x)) + (if (not ($matrixp x)) (merror "Argument not a matrix - `copymatrix':~%~M" x)) (cons (car x) (mapcar #'(lambda (x) (copy-top-level x)) (cdr x)))) (defmfun $copylist (x) - (if (not ($listp x)) (merror "Argument not a list - COPYLIST:~%~M" x)) + (if (not ($listp x)) (merror "Argument not a list - `copylist':~%~M" x)) (cons (car x) (copy-top-level (cdr x)))) ;;;; ADDROW @@ -638,27 +638,27 @@ (defmfun $addrow n (cond ((= n 0) (wna-err '$addrow)) - ((not ($matrixp (arg 1))) (merror "First argument to ADDROW must be a matrix")) + ((not ($matrixp (arg 1))) (merror "First argument to `addrow' must be a matrix")) ((= n 1) (arg 1)) (t (do ((i 2 (f1+ i)) (m (arg 1))) ((> i n) m) (setq m (addrow m (arg i))))))) (defmfun $addcol n (cond ((= n 0) (wna-err '$addcol)) - ((not ($matrixp (arg 1))) (merror "First argument to ADDCOL must be a matrix")) + ((not ($matrixp (arg 1))) (merror "First argument to `addcol' must be a matrix")) ((= n 1) (arg 1)) (t (do ((i 2 (f1+ i)) (m ($transpose (arg 1)))) ((> i n) ($transpose m)) (setq m (addrow m ($transpose (arg i)))))))) (defun addrow (m r) - (cond ((not (mxorlistp r)) (merror "Illegal argument to ADDROW or ADDCOL")) + (cond ((not (mxorlistp r)) (merror "Illegal argument to `addrow' or `addcol'")) ((and (cdr m) (or (and (eq (caar r) 'mlist) (not (= (length (cadr m)) (length r)))) (and (eq (caar r) '$matrix) (not (= (length (cadr m)) (length (cadr r)))) (prog2 (setq r ($transpose r)) (not (= (length (cadr m)) (length (cadr r)))))))) - (merror "Incompatible structure - ADDROW//ADDCOL"))) + (merror "Incompatible structure - `addrow'//`addcol'"))) (append m (if (eq (caar r) '$matrix) (cdr r) (ncons r)))) ;;;; ARRAYF @@ -667,7 +667,7 @@ (defmfun $arraymake (ary subs) (cond ((or (not ($listp subs)) (null (cdr subs))) - (merror "Wrong type argument to ARRAYMAKE:~%~M" subs)) + (merror "Wrong type argument to `arraymake':~%~M" subs)) ((eq (ml-typep ary) 'symbol) (cons (cons (getopr ary) '(array)) (cdr subs))) (t (cons '(mqapply array) (cons ary (cdr subs)))))) @@ -704,7 +704,7 @@ )) (t (let ((gen (mgetl sym '(hashar array))) ary1) - (cond ((null gen) (merror "Not an array - ARRAYINFO:~%~M" ary)) + (cond ((null gen) (merror "Not an array - `arrayinfo':~%~M" ary)) ((mfilep (cadr gen)) (i-$unstore (ncons ary)) (setq gen (mgetl ary '(hashar array))))) @@ -761,7 +761,7 @@ ;; (t (fsignal "Use_fast_arrays is true and the argument of arrayinfo is not a hash-table or an array")))) ;; (t ;; (LET ((GEN (MGETL (SETQ ARY (CAR ARY)) '(HASHAR ARRAY))) ARY1) -;; (COND ((NULL GEN) (MERROR "Not an array - ARRAYINFO:~%~M" ARY)) +;; (COND ((NULL GEN) (MERROR "Not an array - `arrayinfo':~%~M" ARY)) ;; ((MFILEP (CADR GEN)) ;; (I-$UNSTORE (NCONS ARY)) ;; (SETQ GEN (MGETL ARY '(HASHAR ARRAY))))) @@ -838,7 +838,7 @@ ;; (NOTYPE (ASCII-NUMBERP FIXNUM))) (defmfun $concat (&rest l) - (if (null l) (merror "CONCAT needs at least one argument.")) + (if (null l) (merror "`concat' needs at least one argument.")) (getalias (implode (cons (cond ((not (atom (car l)))) @@ -846,7 +846,7 @@ (t #\$)) (mapcan #'(lambda (x) (if (not (atom x)) - (merror "Argument to CONCAT not an atom: ~M" x)) + (merror "Argument to `concat' not an atom: ~M" x)) (string* x)) l))))) @@ -855,9 +855,9 @@ ;;(DEFMFUN $GETCHAR (X Y) ;; (LET ((N 0)) ;; (COND ((NOT (SYMBOLP X)) -;; (MERROR "1st argument to GETCHAR not a symbol: ~M" X)) +;; (MERROR "1st argument to `getchar' not a symbol: ~M" X)) ;; ((OR (NOT (FIXNUMP Y)) (NOT (> Y 0))) -;; (MERROR "Incorrect 2nd argument to GETCHAR: ~M" Y)) +;; (MERROR "Incorrect 2nd argument to `getchar': ~M" Y)) ;; ((char= (SETQ N (GETCHARN (FULLSTRIP1 X) Y)) 0) NIL) ;; ((char= (GETCHARN X 1) '#\&) (IMPLODE (LIST #\& N))) ;; ((ASCII-NUMBERP N) (f- (char-code N) (char-code #\0))) Index: commac.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/commac.lisp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- commac.lisp 23 Nov 2004 22:13:41 -0000 1.21 +++ commac.lisp 25 Nov 2004 02:36:00 -0000 1.22 @@ -189,7 +189,7 @@ ((symbolp name) (setf (symbol-array name) aarray) name) - (t (error "~S is illegal first arg for *ARRAY" name)))) + (t (error "~S is illegal first arg for *array" name)))) (defmacro array (name maclisp-type &rest dimlist) `(*array ',name ',maclisp-type ,@dimlist)) Index: compar.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/compar.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- compar.lisp 23 Nov 2004 16:35:03 -0000 1.6 +++ compar.lisp 25 Nov 2004 02:36:00 -0000 1.7 @@ -99,7 +99,7 @@ (defmfun $context flush flush ;Ignored - (merror "The CONTEXT function no longer exists.")) + (merror "The `context' function no longer exists.")) ;;; This "turns on" a context, making its facts visible. @@ -131,7 +131,7 @@ (defmfun $facts n (cond ((equal n 0) (facts1 $context)) ((equal n 1) (facts1 (arg n))) - (t (merror "FACTS takes zero or one argument only.")))) + (t (merror "`facts' takes zero or one argument only.")))) ;;(defun facts1 (con) ;; (contextmark) @@ -184,7 +184,7 @@ (defmspec $supcontext (x) (setq x (cdr x)) (cond ((null x) (merror "You must supply a name for the context.")) - ((caddr x) (merror "SUPCONTEXT takes either one or two arguments.")) + ((caddr x) (merror "`supcontext' takes either one or two arguments.")) ((not (symbolp (car x))) (nc-err)) ((memq (car x) $contexts) (merror "Context ~M already exists." (car x))) @@ -274,7 +274,7 @@ (t (isp (munformat patevalled))))) (defmfun pre-err (pat) - (merror "MACSYMA was unable to evaluate the predicate:~%~M" pat)) + (merror "`macsyma' was unable to evaluate the predicate:~%~M" pat)) (defun is-mnot (pred) (setq pred (mevalp pred)) @@ -324,7 +324,7 @@ ((eq 'mnot (caaar x)) (setq nl (cons (assume (meval (pred-reverse (cadar x)))) nl))) ((eq 'mor (caaar x)) - (merror "ASSUME: Macsyma is unable to handle assertions involving 'OR'.")) + (merror "`assume': Macsyma is unable to handle assertions involving `or'.")) ((eq (caaar x) 'mequal) (merror "ASSUME: = means syntactic equality in Macsyma. Maybe you want to use EQUAL.")) @@ -374,7 +374,7 @@ ((eq 'mnot (caaar x)) (setq nl (cons (forget (meval (pred-reverse (cadar x)))) nl))) ((eq 'mor (caaar x)) - (merror "MACSYMA is unable to handle assertions involving 'OR'.")) + (merror "Macsyma is unable to handle assertions involving `or'.")) (t (setq nl (cons (forget (meval (car x))) nl)))) (setq x (cdr x)))) @@ -534,7 +534,7 @@ ((and (null temp2) (null temp3)) temp1) ((and (null temp1) (null temp3)) temp2) (t (merror - "~%ASKSIGN: Internal error. See Maintainers."))))))) + "~%`asksign': Internal error. See Maintainers."))))))) (defun eps-coef-sign (exp epskind) (let ((eps-power ($lopow exp epskind)) eps-coef) @@ -554,7 +554,7 @@ (eq epskind '$zerob)))) '$pos) (t '$neg))) - (t (merror "~%ASKSIGN or SIGN: Insufficient information.~%")))) + (t (merror "~%`asksign' or `sign': Insufficient information.~%")))) (t (let ((deriv (sdiff exp epskind)) deriv-sign) (cond ((not (eq (setq deriv-sign ($asksign deriv)) '$zero)) (total-sign epskind deriv-sign)) @@ -563,7 +563,7 @@ (setq deriv-sign ($asksign deriv))) '$zero)) deriv-sign) - (t (merror "~%ASKSIGN or SIGN: Insufficient data.~%")))))))) + (t (merror "~%`asksign' or `sign': Insufficient data.~%")))))))) ;;; The above code does a partial Taylor series analysis of something ;;; that isn't a polynomial. @@ -698,7 +698,7 @@ ;; (setq x (infsimp x))))) ;; ; (setq x (infsimp* x)) ;; -;; (if (eq x '$UND) (if limitp '$PNZ (merror "SIGN called on UND."))) +;; (if (eq x '$`und') (if limitp '$PNZ (merror "`sign' called on `und'."))) ;; (prog (dum exp) ;; (setq dum (constp x) exp x) ;; (cond ((or (numberp x) (ratnump x))) @@ -739,7 +739,7 @@ (defun sign1 (x) (setq x (specrepcheck x)) (setq x (infsimp* x)) - (if (eq x '$und) (if limitp '$pnz (merror "SIGN called on UND."))) + (if (eq x '$und) (if limitp '$pnz (merror "`sign' called on `und'."))) (prog (dum exp) (setq dum (constp x) exp x) (cond ((or (numberp x) (ratnump x))) @@ -1074,14 +1074,14 @@ (defun sign-oddinc (x) (sign (cadr x))) (defun imag-err (x) - (if sign-imag-errp (merror "SIGN called on an imaginary argument:~%~M" x) + (if sign-imag-errp (merror "`sign' called on an imaginary argument:~%~M" x) (throw 'sign-imag-err t))) -(defun dbzs-err (x) (merror "Division by zero detected in SIGN:~%~M" x)) +(defun dbzs-err (x) (merror "Division by zero detected in `sign':~%~M" x)) (defmfun $featurep (e ind) (cond ((not (symbolp ind)) - (merror "~M is not a symbolic atom - FEATUREP." ind)) + (merror "~M is not a symbolic atom - `featurep'." ind)) ((eq ind '$integer) (maxima-integerp e)) ((eq ind '$noninteger) (nonintegerp e)) ((eq ind '$even) (mevenp e)) Index: compat.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/compat.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- compat.lisp 18 Nov 2004 15:20:31 -0000 1.5 +++ compat.lisp 25 Nov 2004 02:36:00 -0000 1.6 @@ -153,7 +153,7 @@ (case (length array-ref) (2 `(store-internal-1d ,@array-ref ,new-value)) (3 `(store-internal-2d ,@array-ref ,new-value)) - (otherwise (error "Cannot expand STORE for array reference ~S" array-ref)))))) + (otherwise (error "Cannot expand `store' for array reference ~S" array-ref)))))) @@ -177,13 +177,13 @@ (defun store-internal-1d (array-spec index new-value) (loop until (arrayp array-spec) do (cond ((symbolp array-spec) (setq array-spec (symbol-array array-spec))) - (t (error "STORE failed -- can't find array for ~S" array-spec)))) + (t (error "`store' failed -- can't find array for ~S" array-spec)))) (setf (aref array-spec index) new-value)) (defun store-internal-2d (array-spec i1 i2 new-value) (loop until (arrayp array-spec) do (cond ((symbolp array-spec) (setq array-spec (symbol-array array-spec))) - (t (error "STORE failed -- can't find array for ~S" array-spec)))) + (t (error "`store' failed -- can't find array for ~S" array-spec)))) (setf (aref array-spec i1 i2) new-value)) ) ;End PROGN 'COMPILE Index: cpoly.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/cpoly.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cpoly.lisp 4 Oct 2004 02:25:55 -0000 1.5 +++ cpoly.lisp 25 Nov 2004 02:36:00 -0000 1.6 @@ -140,7 +140,7 @@ (setq var (delq '$%i (cdr ($listofvars expr)))) (or var (setq var (list (gensym)))) (cond ((not (= (length var) 1.)) - (merror "ALLROOTS: polynomial not univariate: ~M" var)) + (merror "`allroots': polynomial not univariate: ~M" var)) ((setq var (car var)))) (setq expr ($rat expr '$%i var) res (reverse (car (cdddar expr)))) @@ -302,7 +302,7 @@ ((cons '(mlist) (nreverse res)))))))) (defun cpoly-err (expr) - (merror "ALLROOTS: not a polynomial:~%~M" expr)) + (merror "`allroots': not a polynomial:~%~M" expr)) (defun cpoly-sl (degree) ((lambda (logbas infin smalno are mre xx yy cosr sinr cr ci sr si tr Index: csimp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/csimp.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- csimp.lisp 18 Nov 2004 15:20:31 -0000 1.4 +++ csimp.lisp 25 Nov 2004 02:36:00 -0000 1.5 @@ -82,7 +82,7 @@ ((mplusp e) (setq e (cons '(mtimes) (cdr e)) k 0)) ((mtimesp e) (setq k 1)) (t - (merror "~M is an incorrect arg to PARTITION" e))) + (merror "~M is an incorrect arg to `partition'" e))) (setq e (partition e var1 k)) (return (list '(mlist simp) (car e) (cdr e))))) Index: csimp2.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/csimp2.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- csimp2.lisp 4 Oct 2004 02:25:55 -0000 1.7 +++ csimp2.lisp 25 Nov 2004 02:36:00 -0000 1.8 @@ -24,7 +24,7 @@ (oneargcheck x) (setq check x) (setq x (simpcheck (cadr x) z)) - (cond ((equal 0 x) (merror "PLOG(0) is undefined")) + (cond ((equal 0 x) (merror "plog(0) is undefined")) ((among var x) ;This is used in DEFINT. 1/19/81. -JIM (return (eqtest (list '(%plog) x) check)))) (newvar x) @@ -46,11 +46,11 @@ ((eq y '$neg) (return (add2 %p%i (simpln (list '(%log) (list '(mtimes) -1 x)) 1 nil)))) - (t (merror "PLOG(0) is undefined")))) + (t (merror "plog(0) is undefined")))) ((and (equal ($imagpart (setq z (div* x '$%i))) 0) (setq y ($asksign z))) (cond - ((equal y '$zero) (merror "PLOG(0) is undefined")) + ((equal y '$zero) (merror "plog(0) is undefined")) (t (cond ((eq y '$pos) (setq y 1)) ((eq y '$neg) (setq y -1))) (return (add2* (simpln (list '(%log) @@ -68,13 +68,13 @@ (cond ((equal i '$pos) (return (simplify half%pi))) ((equal i '$neg) (return (mul2 -1 (simplify half%pi)))) - (t (merror "ATAN(0//0) has been generated.")))) + (t (merror "atan(0//0) has been generated.")))) ((zerop1 i) (cond ((floatp r) (setq $numer t))) (setq r ($asksign r)) (cond ((equal r '$pos) (return 0)) ((equal r '$neg) (return (simplify '$%pi))) - (t (merror "ATAN(0//0) has been generated.")))) + (t (merror "atan(0//0) has been generated.")))) ((and (among '%cos r) (among '%sin i)) (setq var 'xz) (numden (div* r i)) @@ -148,7 +148,7 @@ (setq check x) (let ((u (simpcheck (cadr x) z)) (v (simpcheck (caddr x) z))) (cond ((or (zerop1 u) (zerop1 v)) - (if errorsw (throw 'errorsw t) (merror "Zero argument to BETA"))) + (if errorsw (throw 'errorsw t) (merror "Zero argument to `beta'"))) ((or (and (floatp u) (floatp v)) (and $numer (numberp u) (numberp v))) ($makegamma (list '($beta) u v))) @@ -186,7 +186,7 @@ ((integerp j) (cond ((greaterp j 0) (simpfact (list '(mfactorial) (sub1 j)) 1 nil)) (errorsw (throw 'errorsw t)) - (t (merror "GAMMA(~:M) is undefined" j)))) + (t (merror "gamma(~:M) is undefined" j)))) ($numer (gammafloat (fpcofrat j))) ((alike1 j '((rat) 1 2)) (list '(mexpt simp) '$%pi j)) @@ -247,21 +247,21 @@ ;;#+nil ;;(defun gammafloat (a) ;; (cond ((= a 1.0) 1.0) -;; ((= a 0.0) (merror "GAMMA(0.0) has been generated.")) +;; ((= a 0.0) (merror "gamma(0.0) has been generated.")) ;; ((and (> a 0.0) (> 1.0 a)) (gamma a)) ;; ((or (> a 34.82) (< a -34.12)) -;; (merror "GAMMA(~A) - arithmetic overflow" a)) +;; (merror "gamma(~A) - arithmetic overflow" a)) ;; (t (do-gammafloat a)))) ;; ;;(defun gammafloat (a) ;; (cond ((= a 1.0) 1.0) -;; ((= a 0.0) (merror "GAMMA(0.0) has been generated.")) +;; ((= a 0.0) (merror "gamma(0.0) has been generated.")) ;; ((and (> a 0.0) (> 1.0 a)) (gamma a)) ;; (t (condition-case () ;; (do-gammafloat a) ;; (dbg:floating-exponent-overflow -;; (merror "GAMMA(~A) - arithmetic overflow" a)))))) +;; (merror "gamma(~A) - arithmetic overflow" a)))))) ;;#+nil ;;(defun do-gammafloat (a) @@ -398,7 +398,7 @@ ((not (and (fixnump m) (fixnump n) (fixnump i) (fixnump j) (> m 0) (> n 0) (> i 0) (> j 0))) - (merror "Incorrect argument to EMATRIX:~%~M" + (merror "Incorrect argument to `ematrix':~%~M" (list '(mlist simp) m n i j) ))) loop (cond ((= m i) (setq row (onen j n var 0)) (go on)) ((zerop m) (return (cons '($matrix) (mxc ans))))) @@ -422,7 +422,7 @@ (if (not ($listp varl)) (improper-arg-err varl '$coefmatrix)) (dolist (v (cdr varl)) (if (and (not (atom v)) (memq (caar v) '(mplus mtimes))) - (merror "Improper variable to COEFMATRIX:~%~M" v))) + (merror "Improper variable to `coefmatrix':~%~M" v))) (setq eql (nreverse (mapcar #'meqhk (cdr eql))) varl (reverse (cdr varl))) loop1(if (null eql) (return (cons '($matrix) (mxc ans)))) @@ -444,7 +444,7 @@ (prog (row column vector matrix sym symvector) (cond ((or (not (fixnump rows)) (not (fixnump columns))) - (merror "ENTERMATRIX called with non-integer arguments"))) + (merror "`entermatrix' called with non-integer arguments"))) (setq row 0) (cond ((not (= rows columns)) (setq sym nil) (go oloop))) ;; QUEST(PRINC " Index: db.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/db.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- db.lisp 19 Oct 2004 12:04:36 -0000 1.3 +++ db.lisp 25 Nov 2004 02:36:00 -0000 1.4 @@ -387,7 +387,7 @@ (defmfun isp (pat) (cond ((truep pat)) ((falsep pat) nil) (t 'unknown))) (defmfun kindp (x y &aux #+lispm (default-cons-area working-storage-area )) - (if (not (symbolp x)) (merror "KINDP called on a non-symbolic atom.")) + (if (not (symbolp x)) (merror "`kindp' called on a non-symbolic atom.")) (clear) (beg x 1) (do ((p (dq+) (dq+))) ((null p)) Index: defcal.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/defcal.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defcal.lisp 4 Oct 2004 02:25:55 -0000 1.2 +++ defcal.lisp 25 Nov 2004 02:36:00 -0000 1.3 @@ -19,7 +19,7 @@ (memq '&optional l) (memq '&restv l) (memq '"e l)) - (maxima-error "Can't DEF-PROPL-CALL with non-subr arglist" l))) + (maxima-error "Can't `def-propl-call' with non-subr arglist" l))) (defvar use-subrcall #+cl nil Index: defint.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/defint.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- defint.lisp 15 Oct 2004 16:48:08 -0000 1.7 +++ defint.lisp 25 Nov 2004 02:36:00 -0000 1.8 @@ -193,10 +193,10 @@ (defmvar defintdebug () "If true Defint prints out debugging information") (defmvar integerl nil - "An integer-list for non-atoms found out to be INTEGERs") + "An integer-list for non-atoms found out to be `integer's") (defmvar nonintegerl nil - "A non-integer-list for non-atoms found out to be NONINTEGERs") + "A non-integer-list for non-atoms found out to be `noninteger's") (defun $defint (exp var ll ul) (let ((global-defint-assumptions ()) @@ -1326,7 +1326,7 @@ (return (list (car d) (f* -1 (cadr d)) (ptimes (cadr f) (caddr d))))) - (merror "Bug from PFRNUM in RESIDU"))) + (merror "Bug from `pfrnum' in `residu'"))) (defun partnum (n dl) (let ((n2 1) ans nl) @@ -2613,7 +2613,7 @@ (let ((order (ask-greateq ul ll))) (cond ((eq order '$yes)) ((eq order '$no) (let ((temp ul)) (setq ul ll ll temp))) - (t (merror "Incorrect limits given to DEFINT:~%~M" + (t (merror "Incorrect limits given to `defint':~%~M" (list '(mlist simp) ll ul))))) (if (not (equal ($imagpart place) 0)) '$no Index: displa.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/displa.lisp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- displa.lisp 22 Nov 2004 16:19:10 -0000 1.14 +++ displa.lisp 25 Nov 2004 02:36:01 -0000 1.15 @@ -72,7 +72,7 @@ ;;(defmvar $typeset nil ;; "Causes equations to be output in a typesetter readable form if t.") -(defmvar displayp nil "Is T when inside of DISPLA") +(defmvar displayp nil "Is T when inside of `displa'") ;; More messages which appear during the middle of display. Different ;; from those which appear during typein. MOREMSG and MOREFLUSH get @@ -1072,7 +1072,7 @@ '(#\space #.forward-slash-char #\P #.forward-slash-char)) (t (do ((l (cdr form) (cdr l))) ((null l)) (cond ((atom l) - (merror "~S has an atomic cdr - DISPLAY" form)) + (merror "~S has an atomic cdr - `display'" form)) ((setq form (checkrat (car l))) (return form))))))) @@ -1089,7 +1089,7 @@ (if (or (null bkpt) (eq result bkpt)) (merror "Expression is too wide to be displayed.")) (do ((l result (cdr l))) ((eq bkpt (cdr l)) (rplacd l nil)) - (if (null l) (merror "CHECKBREAK not found in DISPLAY"))) + (if (null l) (merror "`checkbreak' not found in `display'"))) (output bkpt 0) #-franz (let ((#.ttyoff (or #.ttyoff more-^w))) (mterpri)) @@ -1334,7 +1334,7 @@ ;;#-(OR CL ITS NIL) ;;(DEFUN OUTPUT-2D (RESULT W) ;; RESULT W ;Ignored. -;; (MERROR "OUTPUT-2D called on system without display support.")) +;; (MERROR "`output-2d' called on system without display support.")) ;;see +lispm below for cl fix. (defun draw-2d (dmstr row col) @@ -1388,7 +1388,7 @@ ;;#-(OR CL ITS NIL) ;;(DEFUN DRAW-2D (DMSTR ROW COL) ;; DMSTR ROW COL ;Ignored. -;; (MERROR "DRAW-2D called on system without display support.")) +;; (MERROR "`draw-2d' called on system without display support.")) ;; Crude line graphics. The interface to a graphics device is via the ;; functions LG-SET-POINT, LG-DRAW-VECTOR, LG-END-VECTOR and via the Index: displm.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/displm.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- displm.lisp 9 Oct 2004 13:54:39 -0000 1.3 +++ displm.lisp 25 Nov 2004 02:36:02 -0000 1.4 @@ -117,7 +117,7 @@ ((integerp x) (if rbp (setq lbp rbp)) (setq rbp x)) - (t (maxima-error "Random object in DISPLA-DEF form" x)))) + (t (maxima-error "Random object in `displa-def' form" x)))) (if l-dissym (setq l-dissym (if r-dissym Index: dskfn.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/dskfn.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- dskfn.lisp 4 Oct 2004 02:25:55 -0000 1.5 +++ dskfn.lisp 25 Nov 2004 02:36:02 -0000 1.6 @@ -114,7 +114,7 @@ (improper-arg-err u fn)))) #-franz (if (and storefl (eq (cadr file) '>)) - (merror "> as second filename has not been implemented for STORE.")) + (merror "> as second filename has not been implemented for `store'.")) #+pdp10 (if storefl (setq oint (nointerrupt 'tty))) (cond (dsksavep (setq filelist (cons file filelist))) (ofile (setq filelist1 (cons file filelist1)))) @@ -165,7 +165,7 @@ (when (> (cadr length) 30.) (mtell "~:M is ~A blocks big!" (car list) (cadr length)) (cond ((> (cadr length) 60.) - (mtell "You probably want to zl-DELETE it.")) + (mtell "You probably want to zl-delete it.")) ((> (cadr length) 50.) (mtell "Do you really want such a large file?"))))) (if maxima-error (let ((errset 'errbreak1)) (merror "Error in ~:M attempt" fn))) @@ -385,7 +385,7 @@ ; in proper sequence with the big mungeables. ; For this reason only they are output as EQ-forms. (let ((ary (cond ((and (eq ind 'array) (get item 'array)) rename) - ; This code handles "COMPLETE" arrays. + ; This code handles "complete" arrays. (t (fasprint t '(setq aaaaa (gensym))) 'aaaaa))) (dims (arraydims val)) val1) Index: evalw.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/evalw.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- evalw.lisp 4 Oct 2004 02:25:55 -0000 1.2 +++ evalw.lisp 25 Nov 2004 02:36:02 -0000 1.3 @@ -28,7 +28,7 @@ (cond ((or (< (length argl) 2) (not (or (atom (car argl)) ($listp (car argl))))) - (merror "Bad whens form to EVAL_WHEN~%~M" (car argl)))) + (merror "Bad whens form to `eval_when'~%~M" (car argl)))) (let ((demop #-maxii (if (and (eq (ml-typep $version) 'fixnum) (> $version 296.)) (caddr batconl) Index: fcall.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/fcall.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fcall.lisp 15 Oct 2004 16:48:08 -0000 1.7 +++ fcall.lisp 25 Nov 2004 02:36:02 -0000 1.8 @@ -64,7 +64,7 @@ (undefined . (undefined-warnp "The function was totaly undefined. Maybe you want to quote it.")) (punt-nil . (punt-nil-warnp - "If you want the value of the function name, use APPLY")) + "If you want the value of the function name, use `apply'")) (mfexpr . (mfexpr-warnedp "MFEXPRS should be loaded at translating time. Use of them in translated code (nay, any code!), is NOT recommened however."))))))) Index: float.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/float.lisp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- float.lisp 12 Nov 2004 17:02:22 -0000 1.13 +++ float.lisp 25 Nov 2004 02:36:02 -0000 1.14 @@ -101,9 +101,9 @@ (defmvar bigfloat%e '((bigfloat simp 56.) 48968212118944587. 2) "Bigfloat representation of %E") (defmvar bigfloat%pi '((bigfloat simp 56.) 56593902016227522. 2) - "Bigfloat representation of %PI") + "Bigfloat representation of %pi") (defmvar bigfloat%gamma '((bigfloat simp 56.) 41592772053807304. 0) - "Bigfloat representation of %GAMMA") + "Bigfloat representation of %gamma") ;; Internal specials ;; Number of bits of precision in the mantissa of newly created bigfloats. @@ -156,7 +156,7 @@ (defun fpprec1 (assign-var q) assign-var ; ignored (if (or (not (fixnump q)) (< q 1)) - (merror "Improper value for FPPREC:~%~M" q)) + (merror "Improper value for `fpprec':~%~M" q)) (setq fpprec (f+ 2 (haulong (expt 10. q))) bigfloatone ($bfloat 1) bigfloatzero ($bfloat 0) bfhalf (list (car bigfloatone) (cadr bigfloatone) 0) @@ -191,7 +191,7 @@ (setq l (cons (cons (caar l) (cons 'simp (cdar l))) (cdr l)))) (cond ((equal (cadr l) 0) (if (not (equal (caddr l) 0)) - (mtell "Warning - an incorrect form for 0.0B0 has been generated.")) + (mtell "Warning - an incorrect form for 0.0b0 has been generated.")) (list '|0| '|.| '|0| 'b '|0|)) (t ;; L IS ALWAYS POSITIVE FP NUMBER (let ((extradigs (fix (add1 (quotient (haulong (caddr l)) 3.32)))) @@ -255,7 +255,7 @@ (setq sign t y (fpration1 (cons (car x) (fpabs (cdr x))))) (rplaca y (times -1 (car y)))) (t (fpration1 x)))) - (cond ($ratprint (princ "RAT replaced ") + (cond ($ratprint (princ "`rat' replaced ") (cond (sign (princ "-"))) (princ (maknam (fpformat (cons (car x) (fpabs (cdr x)))))) (princ " by ") (princ (car exp)) (tyo #. forward-slash-char) (princ (cdr exp)) @@ -552,7 +552,7 @@ (defun fpatan2 (y x) ; ATAN(Y/X) from -PI to PI (cond ((equal (car x) 0) ; ATAN(INF), but what sign? - (cond ((equal (car y) 0) (merror "ATAN(0//0) has been generated.")) + (cond ((equal (car y) 0) (merror "atan(0//0) has been generated.")) ((minusp (car y)) (fpquotient (fppi) (intofp -2))) (t (fpquotient (fppi) (intofp 2))))) @@ -717,7 +717,7 @@ ;; A and B are each a list of a mantissa and an exponent. (defun fpquotient (a b) (cond ((equal (car b) 0) - (merror "PQUOTIENT by zero")) + (merror "`pquotient' by zero")) ((equal (car a) 0) '(0 0)) (t (list (fpround (quotient (fpshift (car a) (plus 3 fpprec)) @@ -1174,7 +1174,7 @@ (setq a ((lambda (fpprec) (cond (($bfloatp (car a)) (setq a ($bfloat (car a))) - (cond ((zerop (cadr a)) (merror "LOG(0.0B0) has been generated")) + (cond ((zerop (cadr a)) (merror "log(0.0b0) has been generated")) ((minusp (cadr a)) (setq minus t) (fplog (list (minus (cadr a)) (caddr a)))) (t (fplog (cdr a))))) @@ -1215,7 +1215,7 @@ (defun fplog (x) (prog (over two ans oldans term e sum) (if (not (greaterp (car x) 0)) - (merror "Non-positive argument to FPLOG")) + (merror "Non-positive argument to `fplog'")) (setq e (fpe) over (fpquotient (fpone) e) ans 0) Index: fortra.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/fortra.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fortra.lisp 4 Oct 2004 02:25:55 -0000 1.2 +++ fortra.lisp 25 Nov 2004 02:36:02 -0000 1.3 @@ -154,9 +154,9 @@ (defmfun $fortmx (name mat &optional (stream #-cl nil #+cl *standard-output*) &aux ($loadprint nil)) (cond ((not (symbolp name)) - (merror "~%First argument to FORTMX must be a symbol.")) + (merror "~%First argument to `fortmx' must be a symbol.")) ((not ($matrixp mat)) - (merror "Second argument to FORTMX not a matrix: ~M" mat))) + (merror "Second argument to `fortmx' not a matrix: ~M" mat))) (do ((mat (cdr mat) (cdr mat)) (i 1 (f1+ i))) ((null mat)) (declare (fixnum i)) (do ((m (cdar mat) (cdr m)) (j 1 (f1+ j))) ((null m)) Index: hayat.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/hayat.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hayat.lisp 18 Nov 2004 15:20:31 -0000 1.4 +++ hayat.lisp 25 Nov 2004 02:36:02 -0000 1.5 @@ -750,7 +750,7 @@ (defun psexpt (p n) (cond ((rczerop n) ;; p^0 (if (rczerop p) ;; 0^0 - (merror "~&Indeterminate form 0^0 generated inside PSEXPT~%") + (merror "~&Indeterminate form 0^0 generated inside `psexpt'~%") (rcone))) ;; Otherwise can let p^0 = 1 ((or (equal n (rcone)) (equal n (rcfone))) p) ;; p^1 cases ((pscoefp p) (rcexpt p n)) @@ -831,7 +831,7 @@ (when (infp tr) (if (rcintegerp s) (setq tr (e* s (le (last l)))) - (merror "Bad power series arg in PSEXPT"))) + (merror "Bad power series arg in `psexpt'"))) (when (infp tr) (setq tr (t-o-var (car varh)))) b (and (e> mr tr) (go end)) (setq kr inc ak l ma0 (pstimes (cons 1 m) linv) @@ -1156,7 +1156,7 @@ (defun lim-recip (lim) (or (cdr (assq lim '(($ZEROA . $INF) ($ZEROB . $MINF) ($INF . $ZEROA) ($MINF . $ZEROB)))) - (if (eq lim '$finite) (break "inverting $FINITE?") + (if (eq lim '$finite) (break "inverting $finite?") lim))) (defun lim-exp (lim) @@ -1257,7 +1257,7 @@ (setq pow (cadr expt) kernel (m^ kernel (m// pow)) g (prep1 kernel) pow (prep1 pow)) (unless (and (equal (cdr g) 1) (equal (cdar g) '(1 1))) - (break "Illegal kernel in ADJOIN-PVAR")) + (break "Illegal kernel in `adjoin-pvar'")) (setq g (caar g) kernel (get g 'disrep)))) (if (setq ans (key-var-pow g)) (cons (car ans) (e* pow (cdr ans))) @@ -1579,7 +1579,7 @@ (return (psplus lterm (pslog p)))) (when (pscoefp p) (unless (equal p (rcone)) - (merror "Internal TAYLOR MAXIMA-ERROR in PSLOG")) + (merror "Internal `taylor' maxima-error in `pslog'")) (return lterm)) (setq l (terms p) inc (psexpon-gcd l)) (if gt (setq l (zl-DELETE (last l) l)) @@ -1674,7 +1674,7 @@ (adjoin-tvar `((%LOG) ,(cadr var)))))) (if (equal (cadr var) '$%E) (setq logvar (taylor2 (caddr var))) - (break "Unhandled gvar in PSLOG-OF-GVAR"))))) + (break "Unhandled gvar in `pslog-of-gvar'"))))) (psplus (pslog (if c (pstimes c (ps-lc monom)) (ps-lc monom))) (pstimes (ps-le monom) logvar)))))) @@ -1689,7 +1689,7 @@ ((eq p '$%I) log%i) ((eq p '$%E) 1) ((equal p 0) - (merror "Log(0) generated while TAYLOR expanding ~M" + (merror "Log(0) generated while `taylor' expanding ~M" last-exp)) (T `((%LOG) ,p))))) ((eq (caar p) 'RAT) @@ -2014,7 +2014,7 @@ ('T (setq sw 'T) (return 'T))))))) (defmvar $TAYLOR_ORDER_COEFFICIENTS T - "When TRUE, coefficients of taylor series will be ordered canonically.") + "When `true', coefficients of taylor series will be ordered canonically.") (defun taylor1 (e tlist) (declare (special *within-srf?* )) @@ -2042,7 +2042,7 @@ ((null tl) ) (unless (mfree (exp-pt (car tl)) tvars) (merror - "TAYLOR: attempt to expand ~M~&at a point depending on ~M" + "`taylor': attempt to expand ~M~&at a point depending on ~M" e (caar tl)))) ;; This drastic initialization ensures that ALGEBRAIC, TELLRAT, DISREP, ;; etc. prop's are removed from our gensyms. RATSETUP does not appear @@ -2249,7 +2249,7 @@ (push e zerolist)) e-simp) (prep1 e)))) - ((null (atom (caar e))) (merror "Bad arg TAYLOR2 - internal error")) + ((null (atom (caar e))) (merror "Bad arg `taylor2' - internal error")) ((eq (caar e) 'MRAT) (if (and (memq 'TRUNC (car e)) (compatvarlist varlist (mrat-varlist e) @@ -2503,7 +2503,7 @@ (psminus (expand (m- a const) (cond ((eq func '%TAN) '%COT) ((eq func '%COT) '%TAN) - (t (merror "Internal MAXIMA-ERROR in TAYLOR" + (t (merror "Internal maxima-error in `taylor'" )))))))))) (setq *pscirc '(%COT %TAN %CSC %SIN %SEC %COS %COTH @@ -3171,7 +3171,7 @@ (srconvert1 (cdr r)))) (setq temp (cdr (assq (car tl) gps))) (cond ((null (memq (car tl) (cdr trunclist)))) - ((mplusp temp) (merror "FOO")) + ((mplusp temp) (merror "foo")) (t (setq tlist (cons (list* temp (tay-order (cadr tl)) @@ -3196,8 +3196,8 @@ (defun tay-error (msg exp) (if silent-taylor-flag (throw 'taylor-catch ()) (IF EXP - (merror "TAYLOR~A~%~%~M" MSG EXP) - (merror "TAYLOR~A" MSG)))) + (merror "`taylor'~A~%~%~M" MSG EXP) + (merror "`taylor'~A" MSG)))) (defun exp-pt-err () (tay-err " unable to expand at a point specified in:")) @@ -3212,7 +3212,7 @@ (tay-err ": Expansion to infinite order?")) (defun tay-depth-err () - (tay-err ": TAYLORDEPTH exceeded while expanding:")) + (tay-err ": `taylordepth' exceeded while expanding:")) ; (Comment Subtitle TAYLORINFO) Index: hyp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/hyp.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- hyp.lisp 29 Oct 2004 17:03:11 -0000 1.9 +++ hyp.lisp 25 Nov 2004 02:36:02 -0000 1.10 @@ -1349,7 +1349,7 @@ ;; (MEMQ 'ARRAY (CDAR A))) ;; (if (FREEVAR (CDR A)) ;; T -;; (merror "VARIABLE-OF-INTEGRATION-APPEARED-IN-SUBSCRIPT"))) +;; (merror "`variable-of-integration-appeared-in-subscript'"))) ;; (T (AND (FREEVAR (CAR A)) (FREEVAR (CDR A)))))) (defun freepar Index: inmis.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/inmis.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- inmis.lisp 4 Oct 2004 02:25:55 -0000 1.3 +++ inmis.lisp 25 Nov 2004 02:36:02 -0000 1.4 @@ -68,7 +68,7 @@ (defmfun $reset nil (load '((dsk macsym) reset fasl)) '$done) #+multics -(defmfun $reset () (load (executable-dir "RESET")) '$done) +(defmfun $reset () (load (executable-dir "reset")) '$done)... [truncated message content] |
