From: Dieter K. <cra...@us...> - 2010-04-30 22:16:22
|
Update of /cvsroot/maxima/maxima/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1076/src Modified Files: dskfn.lisp mlisp.lisp suprv1.lisp nparse.lisp lmdcls.lisp Log Message: Changing the name of mopl to *mopl* to emphasize that it is a global special variable. Related files: dskfn.lisp lmdcls.lisp mlisp.lisp nparse.lisp suprv1.lisp No problems with the testsuite and share_testsuite. Index: dskfn.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/dskfn.lisp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- dskfn.lisp 8 Nov 2009 20:56:08 -0000 1.25 +++ dskfn.lisp 30 Apr 2010 22:16:13 -0000 1.26 @@ -16,7 +16,7 @@ filelist opers $packagefile fasdumpfl fasdeqlist fasdnoneqlist savenohack dsksavep aaaaa errset lessorder greatorder indlist - $labels $aliases varlist mopl $props defaultf + $labels $aliases varlist *mopl* $props defaultf $infolists $features featurel savefile $gradefs $values $functions $arrays prinlength prinlevel $contexts context $activecontexts)) @@ -305,8 +305,8 @@ (let ((val1 (implode (cons #\$ (cdr (exploden val)))))) (when (or (get val1 'nud) (get val1 'led) (get val1 'lbp)) (fasprin `(define-symbol (quote ,val))) - (if (member val mopl :test #'eq) - (fasprin `(setq mopl (cons (quote ,val) mopl)))) + (if (member val *mopl* :test #'eq) + (fasprin `(setq *mopl* (cons (quote ,val) *mopl*)))) (when (setq val (get val1 'dimension)) (dskdefprop val1 val 'dimension) (dskdefprop val1 (get val1 'dissym) 'dissym) Index: mlisp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mlisp.lisp,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- mlisp.lisp 21 Mar 2010 07:06:54 -0000 1.85 +++ mlisp.lisp 30 Apr 2010 22:16:13 -0000 1.86 @@ -23,13 +23,12 @@ "If TRUE, messages about map/fullmap truncating on the shortest list or if apply is being used are printed.") -(declare-top (special - derivflag derivlist $labels - $values $functions $arrays $rules $gradefs $dependencies $aliases +(declare-top (special derivflag derivlist $labels $values $functions $arrays + $rules $gradefs $dependencies $aliases $myoptions $props genvar $maxposex $maxnegex $expop $expon $numer state-pdl *mdebug* refchkl baktrcl $norepeat $detout $doallmxops $doscmxops opers - mopl $powerdisp $dispflag *alphabet* $%% %e-val + *mopl* $powerdisp $dispflag *alphabet* $%% %e-val outfiles $macros linel $ratfac $ratwtlvl $operators $partswitch *gcdl* *builtin-$props* $infolists)) @@ -1430,7 +1429,7 @@ (t (putprop var val prop))) (if (and (safe-get var 'op) (operatorp1 var) (not (member (setq var (get var 'op)) (cdr $props) :test #'eq))) - (setq mopl (cons var mopl))) + (setq *mopl* (cons var *mopl*))) (add2lnc (getop var) $props))) (defun linchk (var) Index: suprv1.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/suprv1.lisp,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- suprv1.lisp 30 Apr 2010 00:20:22 -0000 1.94 +++ suprv1.lisp 30 Apr 2010 22:16:13 -0000 1.95 @@ -23,10 +23,9 @@ ;; Store build-in operators, which get additional properties. ;; These operators aren't killed by the function kill-operator. -(defvar mopl nil) +(defvar *mopl* nil) -(declare-top (special - bindlist loclist errset *rset ^q lf tab ff cr +(declare-top (special bindlist loclist errset *rset ^q lf tab ff cr $values $functions $arrays $gradefs $dependencies $rules $props $ratvars $ratvarswitch varlist genvar $filename @@ -360,7 +359,9 @@ (killframe x) (i-$remove (list x $features))) (let ((y (get x 'op))) - (when (and y (not (member y mopl :test #'equal)) (member y (cdr $props) :test #'equal)) + (when (and y + (not (member y *mopl* :test #'equal)) + (member y (cdr $props) :test #'equal)) (kill-operator x))) (remalias x nil) (setf $arrays (delete x $arrays :count 1 :test #'eq)) Index: nparse.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/nparse.lisp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- nparse.lisp 3 Apr 2010 16:59:50 -0000 1.57 +++ nparse.lisp 30 Apr 2010 22:16:13 -0000 1.58 @@ -1637,13 +1637,13 @@ (getopr op)))) (defun op-setup (op) - (declare (special mopl)) + (declare (special *mopl*)) (let ((dummy (or (get op 'op) (coerce (string* op) 'string)))) (putprop op dummy 'op ) (putopr dummy op) (if (and (operatorp1 op) (not (member dummy (cdr $props) :test #'eq))) - (push dummy mopl)) + (push dummy *mopl*)) (add2lnc dummy $props))) (defun kill-operator (op) Index: lmdcls.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/lmdcls.lisp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- lmdcls.lisp 28 Apr 2010 23:17:31 -0000 1.32 +++ lmdcls.lisp 30 Apr 2010 22:16:13 -0000 1.33 @@ -119,7 +119,7 @@ implicit-real in-p infinitesimals infinities inratsimp inside-mprog integerl *islinp* lexprs limit-answers limitp linel linelable lnorecurse local loclist low* maplp master-mesfile mdop - meta-prop-l meta-prop-p mfexprp minpoly* mlocp mm* modulus mopl + meta-prop-l meta-prop-p mfexprp minpoly* mlocp mm* modulus *mopl* mplc* mprogp mproplist mspeclist mspeclist2 msump munbindp need-prog? negprods negsums nn* noevalargs noitems nonintegerl nounl nounsflag opers opers-list opexprp outargs1 outargs2 outfiles |