From: Andreas E. <ar...@us...> - 2007-03-30 22:56:03
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17193 Modified Files: mlisp.lisp nparse.lisp transf.lisp transm.lisp trdata.lisp Log Message: removed (comment macro comments. Index: mlisp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mlisp.lisp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- mlisp.lisp 29 Mar 2007 22:04:52 -0000 1.44 +++ mlisp.lisp 30 Mar 2007 22:55:55 -0000 1.45 @@ -1810,11 +1810,7 @@ (case (car arrfun) (aexpr (mapply1 (cadr arrfun) subs (cadr arrfun) form)) (a-expr (apply (cadr arrfun) subs)) - (a-subr - (comment "This is what the code used to look like:" - (eval (nconc (list 'subrcall nil - (list 'quote (cadr arrfun))) subs))) - (system-subrcall* (cadr arrfun) subs))))) + (a-subr (system-subrcall* (cadr arrfun) subs))))) (defun hasher (l) ; This is not the best way to write a hasher. But, (if (null l) ; please don't change this code or you're liable to Index: nparse.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/nparse.lisp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- nparse.lisp 27 Mar 2007 20:40:50 -0000 1.39 +++ nparse.lisp 30 Mar 2007 22:55:55 -0000 1.40 @@ -576,19 +576,19 @@ (cond ((not (consp op)) (let ((existing-lbp (get op 'lbp)) (existing-rbp (get op 'rbp))) - (cond ((not lbp) - (comment ignore omitted arg)) + (cond ((not lbp) ;; ignore ommitted arg + ) ((not existing-lbp) (putprop op lbp 'lbp)) ((not (equal existing-lbp lbp)) (maxima-error "Incompatible LBP's defined for this operator ~a" op))) - (cond ((not rbp) - (comment ignore omitted arg)) + (cond ((not rbp) ;; ignore ommitted arg + ) ((not existing-rbp) (putprop op rbp 'rbp)) ((not (equal existing-rbp rbp)) (maxima-error "Incompatible RBP's defined for this operator ~a" op))))) - ('else + (t (mapcar #'(lambda (x) (set-lbp-and-rbp x lbp rbp)) op)))) Index: transf.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transf.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- transf.lisp 7 Nov 2005 17:37:12 -0000 1.3 +++ transf.lisp 30 Mar 2007 22:55:55 -0000 1.4 @@ -21,7 +21,7 @@ ;;; some floating point translations. with tricks. -(def%tr %log (form) +(def%tr %log (form) (let (arg) (setq arg (translate (cadr form))) (cond ((and (eq (car arg) '$float) (get (caar form) 'lisp-function-to-use)) @@ -44,16 +44,6 @@ (def-same%tr %asinh %log) (def-same%tr %acsch %log) (def-same%tr %erf %log) - -(comment not used - ;; defsubr1 is also obsolete. see DEF-PROCEDURE-PROPERTY. - (defsubr1 translate-$number (form) - (let (arg) - (setq arg (translate (cadr form))) - (if (and (covers '$number (car arg)) (get (caar form) 'lisp-function-to-use)) - (list (car arg) (get (caar form) 'lisp-function-to-use) (cdr arg)) - (cons (car arg) `(simplify (list ',(list (caar form)) ,(cdr arg)))))))) - (defmvar $tr_float_can_branch_complex t "States wether the arc functions might return complex @@ -78,4 +68,3 @@ (def-same%tr %asec %acos) (def-same%tr %asec %acos) (def-same%tr %acsc %acos) - Index: transm.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transm.lisp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- transm.lisp 27 Jan 2007 18:39:28 -0000 1.10 +++ transm.lisp 30 Mar 2007 22:55:55 -0000 1.11 @@ -124,10 +124,6 @@ (defmacro tprop-call (op form) `(subr-call ,op ,form)) -(defmacro def-autoload-translate (&rest funs) - `(comment *autoloading?* ,@funs)) - - ;;; declarations for the TRANSL PACKAGE. (declare-top (special *transl-sources*) Index: trdata.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/trdata.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- trdata.lisp 8 Jan 2007 01:45:18 -0000 1.7 +++ trdata.lisp 30 Mar 2007 22:55:55 -0000 1.8 @@ -11,6 +11,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (in-package :maxima) + (macsyma-module trdata) ;;; N.B. This is some data. Boy, does it have subtle effect on the code @@ -18,56 +19,55 @@ ;;; Since it is so small, and compiles so quickly it sometimes serves ;;; as a fix (i.e. hack) file. so be careful. - (transl-module trdata) -(eval-when (compile) - (setq *def%tr-produces-autoload-file* nil)) - -;; this should go someplace else perhaps. - -(def-autoload-translate $find_root) +(eval-when + #+gcl (compile) + #-gcl (:compile-toplevel) + (setq *def%tr-produces-autoload-file* nil)) ;;; MODEDECLARE(FUNCTION(LENGTH),FIXNUM) ;;I think all this can be done at load time only:--wfs -(eval-when (load) +(eval-when + #+gcl (load) + #-gcl (:load-toplevel) - (mapc #'(lambda (x) (putprop x '$fixnum 'function-mode)) - '($length $nterms random $nroots $rank $polysign $time - $array_dimension_n)) + (mapc #'(lambda (x) (putprop x '$fixnum 'function-mode)) + '($length $nterms random $nroots $rank $polysign $time + $array_dimension_n)) - (mapc #'(lambda (x) (putprop x '$float 'function-mode)) - '($find_root_subr)) + (mapc #'(lambda (x) (putprop x '$float 'function-mode)) + '($find_root_subr)) ;;; Functions of BOOLEAN return VALUE. i.e. PREDICATES - (mapc #'(lambda (x) (putprop x '$boolean 'function-mode)) - '($array $bfloatp $listp $matrixp $ratnump $constantp - $atom $freeof $subvarp $symbolp - $evenp $oddp $orderlessp $ordergreatp $mapatom - $integerp $floatnump $nonscalarp $numberp $ratp $member - $emptyp)) + (mapc #'(lambda (x) (putprop x '$boolean 'function-mode)) + '($array $bfloatp $listp $matrixp $ratnump $constantp + $atom $freeof $subvarp $symbolp + $evenp $oddp $orderlessp $ordergreatp $mapatom + $integerp $floatnump $nonscalarp $numberp $ratp $member + $emptyp)) ;;; MODEDECLARE(TRUE,BOOLEAN) - (mapc #'(lambda (x) (putprop x '$boolean 'mode)) - '($true $false $doallmxops $domxmxops $doscmxops $detout - $dotassoc $dotdistrib $dotscrules $exponentialize - $keepfloat $listarith $logsimp - $maxapplyheight $maxapplydepth $maperror $powerdisp - $scalarmatrix $simp $ttyoff $underflow $infeval - $xaxis $yaxis $ratfac)) + (mapc #'(lambda (x) (putprop x '$boolean 'mode)) + '($true $false $doallmxops $domxmxops $doscmxops $detout + $dotassoc $dotdistrib $dotscrules $exponentialize + $keepfloat $listarith $logsimp + $maxapplyheight $maxapplydepth $maperror $powerdisp + $scalarmatrix $simp $ttyoff $underflow $infeval + $xaxis $yaxis $ratfac)) - (mapc #'(lambda (x) (putprop x (stripdollar x) 'lisp-function-to-use)) - '(%log %sin %cos %tan %cot %csc %sec %acot - %asin %acos %acsc %asec - %sinh %cosh %tanh %coth %csch %sech %asinh %acsch %erf)) + (mapc #'(lambda (x) (putprop x (stripdollar x) 'lisp-function-to-use)) + '(%log %sin %cos %tan %cot %csc %sec %acot + %asin %acos %acsc %asec + %sinh %cosh %tanh %coth %csch %sech %asinh %acsch %erf)) - (mapc #'(lambda (x) (putprop x t 'implied-quotep)) - '($eval $done $%i $%pi $%e $%phi $%gamma - mqapply ; important for array referencing conventions. - )) + (mapc #'(lambda (x) (putprop x t 'implied-quotep)) + '($eval $done $%i $%pi $%e $%phi $%gamma + mqapply ; important for array referencing conventions. + )) ;;; The result of a part function never needs simplification. @@ -80,41 +80,33 @@ ;;; cost of the extra SIMPLFY call is not much compared with the ;;; consing involved. Above all, we must have correct code !!! - (mapc #'(lambda (l) (putprop l t 'tr-nosimp)) - '( ;$first $rest $last - $print - $num $denom $lhs $rhs $part - $cons $reverse $endcons $append - $union $intersection $setdiff $symdiff - $mapset $predset |${| $elementof - )) - - (defprop $realpart $realpart lisp-function-to-use) - + (mapc #'(lambda (l) (putprop l t 'tr-nosimp)) + '($print $num $denom $lhs $rhs $part + $cons $reverse $endcons $append + $union $intersection $setdiff $symdiff + $mapset $predset |${| $elementof)) - (setq transl-modules '( + (defprop $realpart $realpart lisp-function-to-use) - transs - transl - trutil - trans1 - trans2 - trans3 - trans4 - trans5 - transf - troper - trpred - mtags - mdefun - transq - fcall - acall - trdata - mcompi - trmode - trhook - )) + (setq transl-modules '(transs + transl + trutil + trans1 + trans2 + trans3 + trans4 + trans5 + transf + troper + trpred - ) + mtags + mdefun + transq + fcall + acall + trdata + mcompi + trmode + trhook))) |