Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10182/src Modified Files: Tag: strings-are-lisp-strings-branch comm.lisp comm2.lisp displa.lisp dskfn.lisp init-cl.lisp lmdcls.lisp macsys.lisp mactex.lisp matrix.lisp max_ext.lisp merror.lisp mlisp.lisp mload.lisp nparse.lisp option.lisp suprv1.lisp transl.lisp transs.lisp trmode.lisp Log Message: Expunge remaining special treatment of ampersand character; do not treat specially any symbol begins with ampersand. With these changes, builds successfully and run_testsuite reports no unexpected errors. Index: comm.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/comm.lisp,v retrieving revision 1.25.2.1 retrieving revision 1.25.2.2 diff -u -d -r1.25.2.1 -r1.25.2.2 --- comm.lisp 29 Sep 2007 19:06:36 -0000 1.25.2.1 +++ comm.lisp 30 Sep 2007 00:21:18 -0000 1.25.2.2 @@ -63,7 +63,6 @@ atp nil islinp nil lnorecurse nil - &** '&^ $derivsubst nil timesp nil $opsubst t Index: comm2.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/comm2.lisp,v retrieving revision 1.15.4.1 retrieving revision 1.15.4.2 diff -u -d -r1.15.4.1 -r1.15.4.2 --- comm2.lisp 29 Sep 2007 19:06:36 -0000 1.15.4.1 +++ comm2.lisp 30 Sep 2007 00:21:18 -0000 1.15.4.2 @@ -513,7 +513,7 @@ (defun box-label (x) (if (atom x) x - (implode (cons #\& (mstring x))))) + (coerce (mstring x))) 'string) (declare-top (special label)) Index: displa.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/displa.lisp,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -u -d -r1.35.2.1 -r1.35.2.2 --- displa.lisp 29 Sep 2007 19:06:37 -0000 1.35.2.1 +++ displa.lisp 30 Sep 2007 00:21:18 -0000 1.35.2.2 @@ -69,10 +69,10 @@ ;; Parameters which control how boxes, absolute value signs, ;; evaluation-at-a-point bars, and matrices are drawn. -(defmvar $boxchar '|&"| "Character used for drawing boxes.") -(defmvar $absboxchar '|&!| "Character used for drawing absolute value signs and 'evaluation at' signs.") -(defmvar $lmxchar '|&[| "Character used for drawing the left edge of a matrix.") -(defmvar $rmxchar '|&]| "Character used for drawing the right edge of a matrix.") +(defmvar $boxchar "\"" "Character used for drawing boxes.") +(defmvar $absboxchar "!" "Character used for drawing absolute value signs and 'evaluation at' signs.") +(defmvar $lmxchar "[" "Character used for drawing the left edge of a matrix.") +(defmvar $rmxchar "]" "Character used for drawing the right edge of a matrix.") ;; These variables are bound within Macsyma Listeners since they are different ;; for each window. Set them here, anyway, so that RETRIEVE can be called from @@ -230,12 +230,10 @@ (exploden dummy)) ((not (eq (getop atom) atom)) (setq dummy (exploden (getop atom))) - (if (char= #\& (car dummy)) - (cons #\" (nconc (cdr dummy) (list #\"))) - (cdr dummy))) + (cdr dummy)) (t (setq dummy (exploden atom)) (cond ((char= #\$ (car dummy)) (cdr dummy)) - ((or (char= #\% (car dummy)) (char= #\& (car dummy))) (cdr dummy)) + ((char= #\% (car dummy)) (cdr dummy)) ($lispdisp (cons #\? dummy)) (t dummy)))))) @@ -684,7 +682,7 @@ (unless (checkfit (+ 1 w width)) (return (dimension-function form result))) (setq result (cons (cons 0 (cons (- 0 1 d) eqs)) - (cons `(d-vbar ,(1+ h) ,(1+ d) ,(char (symbol-name $absboxchar) 1)) exp)) + (cons `(d-vbar ,(1+ h) ,(1+ d) ,(car (coerce $absboxchar 'list))) exp)) width (+ 1 w width) height (1+ h) depth (+ 1 d depth)) @@ -931,7 +929,7 @@ (dimension-function form result)) (t (setq width (+ 2 width)) (update-heights height depth) - (setq bar `(d-vbar ,height ,depth ,(char (symbol-name $absboxchar) 1))) + (setq bar `(d-vbar ,height ,depth ,(car (coerce $absboxchar 'list)))) (cons bar (nconc arg (cons bar result)))))) (displa-def $matrix dim-$matrix) @@ -1029,7 +1027,7 @@ (cond ((not (checkfit (+ 2 width))) (return (dimension-function (cons '($box) (cdr form)) result)))) (setq width (+ 2 width) height (1+ height) depth (1+ depth)) - (setq ch (char (symbol-name $boxchar) 1)) + (setq ch (car (coerce $boxchar 'list))) (setq result (cons (do ((l (mapcar #'(lambda (l) (char (symbol-name l) 0)) (makstring (caddr form))) (cdr l)) @@ -1376,14 +1374,14 @@ ;; dimension strings. (defun d-matrix (linear? direction h d) - (d-vbar linear? h d (char (symbol-name (if (eq direction 'right) + (d-vbar linear? h d (car (coerce (if (eq direction 'right) $rmxchar - $lmxchar)) 1))) + $lmxchar) 'list)))) ;; There is wired knowledge of character offsets here. (defun d-box (linear? h d w body &aux (char 0) dmstr) ;char a char? - (setq char (char (symbol-name $boxchar) 1)) + (setq char (car (coerce $boxchar 'list))) (setq dmstr `((0 ,h (d-hbar ,(+ 2 w) ,char)) (,(- (+ w 2)) 0) (d-vbar ,h ,d ,char) Index: dskfn.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/dskfn.lisp,v retrieving revision 1.18.4.1 retrieving revision 1.18.4.2 diff -u -d -r1.18.4.1 -r1.18.4.2 --- dskfn.lisp 29 Sep 2007 19:06:37 -0000 1.18.4.1 +++ dskfn.lisp 30 Sep 2007 00:21:19 -0000 1.18.4.2 @@ -108,10 +108,12 @@ *macsyma-extend-types-saved* nil) (if (null (errset (dskstore x storefl file list))) (setq maxima-error t)) + ;; FOLLOWING CODE IS NEVER EXECUTED DUE TO PRECEDING (SETQ *MACSYMA-EXTEND-TYPES-SAVED* NIL) + ;; CUT (DEFVAR *MACSYMA-EXTEND-TYPES-SAVED*) AND FOLLOWING CODE AT SOME FUTURE DATE (if (not (null *macsyma-extend-types-saved*)) (block nil (if (null (errset - (dskstore (cons '&{ *macsyma-extend-types-saved*) storefl file list))) + (dskstore (cons "{" *macsyma-extend-types-saved*) storefl file list))) (setq maxima-error t)) (setq *macsyma-extend-types-saved* nil))) (close savefile) Index: init-cl.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v retrieving revision 1.103 retrieving revision 1.103.2.1 diff -u -d -r1.103 -r1.103.2.1 --- init-cl.lisp 25 Sep 2007 14:41:28 -0000 1.103 +++ init-cl.lisp 30 Sep 2007 00:21:19 -0000 1.103.2.1 @@ -667,7 +667,7 @@ (do-symbols (s maxima-package) (when (and (eql (symbol-package s) maxima-package) (not (eq s '||)) - (member (char (symbol-name s) 0) '(#\$ #\% #\&) :test #'char=)) + (member (char (symbol-name s) 0) '(#\$ #\%) :test #'char=)) (push s *builtin-symbols*) (unless (member s problematic-symbols :test #'eq) (setf (gethash s *builtin-symbol-props*) Index: lmdcls.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/lmdcls.lisp,v retrieving revision 1.24 retrieving revision 1.24.4.1 diff -u -d -r1.24 -r1.24.4.1 --- lmdcls.lisp 4 May 2007 14:48:00 -0000 1.24 +++ lmdcls.lisp 30 Sep 2007 00:21:19 -0000 1.24.4.1 @@ -100,7 +100,7 @@ $tr_warn_fexpr $tr_warn_meval $tr_warn_mode $tr_warn_undeclared $tr_warn_undefined_variable $tr_windy $ttyintfun $ttyintnum $universe $user_mesfile $use_fast_arrays $values $vect_cross - $zerobern %e-val %p%i %pi-val %pi//2 %pi//4 %pi2 &** *$any-modes* + $zerobern %e-val %p%i %pi-val %pi//2 %pi//4 %pi2 *$any-modes* *alpha *const* *fnewvarsw *gcdl* *in *in-$batchload* *in-compile* *in-macsyma-indexer* *in-translate-file* *inv* *irreds *min* *mx* *n *opers-list *out *ratweights *tr-warn-break* *transl-backtrace* Index: macsys.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/macsys.lisp,v retrieving revision 1.62 retrieving revision 1.62.4.1 diff -u -d -r1.62 -r1.62.4.1 --- macsys.lisp 23 Jul 2007 02:07:22 -0000 1.62 +++ macsys.lisp 30 Sep 2007 00:21:19 -0000 1.62.4.1 @@ -411,7 +411,7 @@ (defmfun $appendfile (name) (if (and (symbolp name) - (member (char (symbol-name name) 0) '(#\& #\$) :test #'char=)) + (member (char (symbol-name name) 0) '(#\$) :test #'char=)) (setq name (maxima-string name))) (if $appendfile (merror "already in appendfile, use closefile first")) (let ((stream (open name :direction :output @@ -480,8 +480,7 @@ (let ((ans "") ) (dolist (v x) (setq ans (concatenate 'string ans - (cond ((and (symbolp v) (char= (char (symbol-name v) 0) #\&)) - (subseq (print-invert-case v) 1)) + (cond ((stringp v) v) (t (coerce (mstring v) 'string)))))) Index: mactex.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mactex.lisp,v retrieving revision 1.55 retrieving revision 1.55.4.1 diff -u -d -r1.55 -r1.55.4.1 --- mactex.lisp 6 Jun 2007 14:33:28 -0000 1.55 +++ mactex.lisp 30 Sep 2007 00:21:19 -0000 1.55.4.1 @@ -200,10 +200,8 @@ (append l (list (cond ((numberp x) (texnumformat x)) ((and (symbolp x) (get x 'texword))) - ((stringp x) (tex-string x)) - ((mstringp x) - (let ((s (maybe-invert-string-case (symbol-name (stripdollar x))))) - (tex-string (quote-% (if $stringdisp (concatenate 'string "``" s "''") s))))) + ((stringp x) + (tex-string (quote-% (if $stringdisp (concatenate 'string "``" s "''") s)))) ((characterp x) (tex-char x)) (t (tex-stripdollar x)))) r)) @@ -938,24 +936,6 @@ (defprop | --> | "\\longrightarrow " texsym) (defprop #.(intern (format nil " ~A " 'where)) "\\;\\mathbf{where}\\;" texsym) -(defprop &>= ("\\ge ") texsym) -(defprop &>= tex-infix tex) - -(defprop &> (">") texsym) -(defprop &> tex-infix tex) - -(defprop &<= ("\\le ") texsym) -(defprop &<= tex-infix tex) - -(defprop &< ("<") texsym) -(defprop &< tex-infix tex) - -(defprop &= ("=") texsym) -(defprop &= tex-infix tex) - -(defprop |&#| ("\\ne ") texsym) -(defprop |&#| tex-infix tex) - ;; end of additions by Marek Rychlik (defun tex-try-sym (x) @@ -1004,9 +984,6 @@ ;; The texput function was written by Barton Willis. (defun $texput (e s &optional tx) - (when (mstringp e) - (setq e (define-symbol (string-left-trim '(#\&) e)))) - (setq s (if ($listp s) (margs s) (list s))) (setq s (mapcar #'(lambda (x) (maybe-invert-string-case (symbol-name (stripdollar x)))) s)) Index: matrix.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/matrix.lisp,v retrieving revision 1.19 retrieving revision 1.19.4.1 diff -u -d -r1.19 -r1.19.4.1 --- matrix.lisp 28 May 2007 21:20:14 -0000 1.19 +++ matrix.lisp 30 Sep 2007 00:21:19 -0000 1.19.4.1 @@ -20,8 +20,8 @@ (defmvar $detout nil) (defmvar top* nil) (defmvar $ratmx nil) -(defmvar $matrix_element_mult '|&*|) ;;; Else, most useful when '|&.| -(defmvar $matrix_element_add '|&+|) +(defmvar $matrix_element_mult "*") ;;; Else, most useful when "." +(defmvar $matrix_element_add "+") (defmvar $matrix_element_transpose nil) ;;I believe that all the code now stores arrays in the value cell @@ -193,8 +193,8 @@ ((equal (setq minor (assoo (delete d (copy-tree id) :test #'equal) mdl)) 0) (go loop))) (setq ans - (if (and (eq $matrix_element_mult '|&*|) - (eq $matrix_element_add '|&+|)) + (if (and (equal $matrix_element_mult "*") + (equal $matrix_element_add "+")) (add ans (mul sign e minor)) ;fast common case (mapply $matrix_element_add (list ans @@ -490,18 +490,18 @@ (go loop2))) ;;; This actually takes the inner product of the two vectors. -;;; I check for the most common cases for speed. '|&*| is a slight +;;; I check for the most common cases for speed. "*" is a slight ;;; violation of data abstraction here. The parser should turn "*" into ;;; MTIMES, well, it may someday, which will break this code. Don't ;;; hold your breath. (defun multl (a b) - (cond ((eq $matrix_element_add '|&+|) + (cond ((equal $matrix_element_add "+") (do ((ans (if (not $ratmx) 0 '(0 . 1)) (cond ((not $ratmx) - (cond ((eq $matrix_element_mult '|&*|) + (cond ((equal $matrix_element_mult "*") (add ans (mul (car a) (car b)))) - ((eq $matrix_element_mult '|&.|) + ((equal $matrix_element_mult ".") (add ans (ncmul (car a) (car b)))) (t (add ans Index: max_ext.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/max_ext.lisp,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -d -r1.30 -r1.30.2.1 --- max_ext.lisp 17 Sep 2007 05:30:04 -0000 1.30 +++ max_ext.lisp 30 Sep 2007 00:21:19 -0000 1.30.2.1 @@ -25,7 +25,7 @@ ($auto_mexpr '$declare_linear_operator "misc/declin") ($auto_mexpr '$nonumfactor "simplification/genut") -(meval '((%setup_autoload simp) &bffac $bfzeta)) +(meval '((%setup_autoload simp) "bffac" $bfzeta)) ;jfa ($auto_mexpr '$eigenvectors '|eigen|) Index: merror.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/merror.lisp,v retrieving revision 1.22 retrieving revision 1.22.4.1 diff -u -d -r1.22 -r1.22.4.1 --- merror.lisp 24 May 2007 13:20:17 -0000 1.22 +++ merror.lisp 30 Sep 2007 00:21:19 -0000 1.22.4.1 @@ -186,7 +186,7 @@ (throw 'raterr nil) (apply #'merror args))) -;;; The user-error function is called on |&foo| "strings" and expressions. +;;; The user-error function is called on "strings" and expressions. ;;; Cons up a format string so that $ERROR can be bound. ;;; This might also be done at code translation time. ;;; This is a bit crude. @@ -198,12 +198,12 @@ (setq sl (maknam sl)) (cons sl (nreverse se))) (setq s (pop l)) - (cond ((and (symbolp s) (char= (char (symbol-name s) 0) #\&)) + (cond ((stringp s) (setq sb (mapcan #'(lambda (x) (if (char= x #\~) (list x x) (list x))) - (cdr (exploden s))))) + (coerce s 'list)))) (t (push s se) (setq sb (list #\~ #\M)))) Index: mlisp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mlisp.lisp,v retrieving revision 1.55.2.1 retrieving revision 1.55.2.2 diff -u -d -r1.55.2.1 -r1.55.2.2 --- mlisp.lisp 29 Sep 2007 19:06:38 -0000 1.55.2.1 +++ mlisp.lisp 30 Sep 2007 00:21:20 -0000 1.55.2.2 @@ -593,8 +593,7 @@ (cond ((atom x) (when (or (not (symbolp x)) (member x '(t nil) :test #'eq) - (mget x '$numer) - (char= (char (symbol-name x) 0) #\&)) + (mget x '$numer)) (if munbindp (return nil)) (if (mget x '$numer) (merror "~:M improper value assignment to a numerical quantity" x) @@ -804,7 +803,7 @@ (putopr "@" '$@) ;; !! FOLLOWING LINE MOVED TO NPARSE.LISP TO AVOID COMPILER ERROR ;; !! (MOVING SUPRV1.LISP HIGHER IN MAXIMA.SYSTEM CAUSES MYSTERIOUS ERROR) -;; !! (define-symbol '&@) +;; !! (define-symbol "@") (defprop $@ dimension-infix dimension) (defprop $@ (#\@) dissym) (defprop $@ msize-infix grind) @@ -1983,7 +1982,7 @@ (error "~a is already a hash table. Make it a function first" fun))) (cond ((and (null args) (not mqdef)) (mputprop fun (mdefine1 subs body) 'aexpr)) ((null (dolist (u subs) - (if (not (or (consp u) ($constantp u) (char= (char (symbol-name u) 0) #\&))) + (if (not (or (consp u) ($constantp u) (stringp u))) (return t)))) (arrstore (cons (ncons fun) subs) (mdefine1 args body))) (t (mdefchk fun subs t nil) @@ -2020,7 +2019,7 @@ (merror "Improper parameter in function definition for ~:M:~%~M" fun (car l))))) (defun mdefparam (x) - (and (atom x) (not (maxima-constantp x)) (not (char= (char (symbol-name x) 0) #\&)))) + (and (atom x) (not (maxima-constantp x)) (not (stringp x)))) (defun mdeflistp (l) (and (null (cdr l)) ($listp (car l)) (cdar l) (null (cddar l)))) Index: mload.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mload.lisp,v retrieving revision 1.47.4.1 retrieving revision 1.47.4.2 diff -u -d -r1.47.4.1 -r1.47.4.2 --- mload.lisp 29 Sep 2007 19:06:39 -0000 1.47.4.1 +++ mload.lisp 30 Sep 2007 00:21:20 -0000 1.47.4.2 @@ -98,8 +98,6 @@ (let* ((system-object (cond ((and (atom user-object) (not (symbolp user-object))) user-object) - ;; The following clause takes care of |&Foo|, - ;; which comes from the Maxima string "Foo". ((atom user-object) ;hence a symbol in view of the (print-invert-case (fullstrip1 user-object))) ; first clause (($listp user-object) @@ -420,7 +418,7 @@ ;; multiple possiblities. eg foo.l{i,}sp or foo.{dem,dm1,dm2} (defun $file_search (name &optional paths) (if (and (symbolp name) - (member (char (symbol-name name) 0) '(#\& #\$))) + (member (char (symbol-name name) 0) '(#\$))) (setq name (subseq (print-invert-case name) 1))) (if (symbolp name) (setf name (string name))) (if (probe-file name) (return-from $file_search name)) Index: nparse.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/nparse.lisp,v retrieving revision 1.45.4.1 retrieving revision 1.45.4.2 diff -u -d -r1.45.4.1 -r1.45.4.2 --- nparse.lisp 29 Sep 2007 19:06:39 -0000 1.45.4.1 +++ nparse.lisp 30 Sep 2007 00:21:20 -0000 1.45.4.2 @@ -489,6 +489,7 @@ (defun mstringp (x) + (format t "MSTRINGP: ALL CALLS TO ME SHOULD GO AWAY AND THEN I SHOULD GO AWAY TOO.~%") (and (symbolp x) (char= (char (symbol-name x) 0) #\&))) (defun inherit-propl (op-to op-from getl) @@ -1428,7 +1429,7 @@ ((symbolp x) (or (get x 'reversealias) (let ((name (symbol-name x))) - (if (member (char name 0) '(#\$ #\% #\&) :test #'char=) + (if (member (char name 0) '(#\$ #\%) :test #'char=) (subseq name 1) name)))) (t x))) Index: option.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/option.lisp,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -d -r1.9 -r1.9.4.1 --- option.lisp 23 Apr 2007 23:03:01 -0000 1.9 +++ option.lisp 30 Sep 2007 00:21:20 -0000 1.9.4.1 @@ -1061,6 +1061,6 @@ (subc %asech (c) $float $numer $bfloat $%piargs $%iargs $triginverses $trigsign $logarc) -(subc |&.| (c) $dotassoc $dotscrules $dotconstrules $dotexptsimp +(subc |.| (c) $dotassoc $dotscrules $dotconstrules $dotexptsimp $dotdistrib $assumescalar) Index: suprv1.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/suprv1.lisp,v retrieving revision 1.62.4.1 retrieving revision 1.62.4.2 diff -u -d -r1.62.4.1 -r1.62.4.2 --- suprv1.lisp 29 Sep 2007 19:06:40 -0000 1.62.4.1 +++ suprv1.lisp 30 Sep 2007 00:21:20 -0000 1.62.4.2 @@ -244,7 +244,7 @@ (let ((file ($file_search filename))) (dolist (func functions) (nonsymchk func '$setup_autoload) - (putprop (setq func (dollarify-name func)) file 'autoload) + (putprop (setq func ($verbify func)) file 'autoload) (add2lnc func $props))) '$done) @@ -734,7 +734,7 @@ ((numberp x) x) ((null x) 'false) ((eq x t) 'true) - ((member (getchar x 1) '($ % &) :test #'equal) + ((member (getchar x 1) '($ %) :test #'equal) (intern (subseq (string x) 1))) (t x))) @@ -797,21 +797,6 @@ (get x 'noun)))) (t x))) - -(defmfun dollarify-name (name) - (let ((n (char (symbol-name name) 0))) - (cond ((char= n #\&) - (or (getopr0 name) - (let ((namel (casify-exploden name)) ampname dolname) - (cond ((getopr0 (setq ampname (implode (cons #\& namel))))) - (t (setq dolname (implode (cons #\$ namel))) - (putprop dolname ampname 'op) - (putopr ampname dolname) - (add2lnc ampname $props) - dolname))))) - ((char= n #\%) ($verbify name)) - (t name)))) - (defmspec $string (form) (setq form (strmeval (fexprcheck form))) (setq form (if $grind (strgrind form) (mstring form))) @@ -849,36 +834,13 @@ ($bothcoeff $bothcoef))) (defmfun amperchk (name) - " $AB ==> $AB, - $aB ==> $aB, - &AB ==> $AB, - &aB ==> $aB, - |aB| ==> |aB| " (cond - ((symbolp name) - (if (char= (char (symbol-name name) 0) #\&) - ;; THIS NEXT CASE SHOULD NEVER BE EXECUTED WHEN MAXIMA STRINGS ARE LISP STRINGS - (getalias (or (getopr0 name) (implode (cons #\$ (casify-exploden name))))) - name)) + ((symbolp name) name) ((stringp name) (getalias (or (getopr0 name) (implode (cons #\$ (coerce name 'list)))))))) - -#+(and cl (not scl) (not allegro)) -(defun casify-exploden (x) - (cond ((char= (char (symbol-name x) 0) #\&) - (cdr (exploden (maybe-invert-string-case (string x))))) - (t (exploden x)))) - -#+(or scl allegro) -(defun casify-exploden (x) - (cond ((char= (char (symbol-name x) 0) #\&) - (let ((string (string x))) - (unless #+scl (eq ext:*case-mode* :lower) - #+allegro (eq excl:*current-case-mode* :case-sensitive-lower) - (setf string (maybe-invert-string-case string))) - (cdr (exploden string)))) - (t (exploden x)))) +;; LOOKS LIKE ANY CALLS TO CASIFY-EXPLODEN CAN BE REPLACED BY CALLS TO EXPLODEN +(defun casify-exploden (x) (exploden x)) (defmspec $stringout (x) (setq x (cdr x)) Index: transl.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transl.lisp,v retrieving revision 1.33 retrieving revision 1.33.2.1 diff -u -d -r1.33 -r1.33.2.1 --- transl.lisp 7 Sep 2007 17:35:04 -0000 1.33 +++ transl.lisp 30 Sep 2007 00:21:20 -0000 1.33.2.1 @@ -954,11 +954,11 @@ (defun implied-quotep (atom) (cond ((get atom 'implied-quotep) atom) - ((char= (char (symbol-name atom) 0) #\&) ;;; mstring hack - (cond ((eq atom '|&**|) ;;; foolishness. The PARSER should do this. + ((stringp atom) + (cond ((equal atom "**") ;;; foolishness. The PARSER should do this. ;; Losing Fortran hackers. (tr-format "~% `**' is obsolete, use `^' !!!") - '|&^|) + "^") (t atom))) (t nil))) Index: transs.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transs.lisp,v retrieving revision 1.34 retrieving revision 1.34.4.1 diff -u -d -r1.34 -r1.34.4.1 --- transs.lisp 6 Jun 2007 14:33:28 -0000 1.34 +++ transs.lisp 30 Sep 2007 00:21:20 -0000 1.34.4.1 @@ -164,10 +164,8 @@ (setq bin-file (compile-file input-file :output-file bin-file)) (append result (list bin-file))) -;; Converts a Maxima "string" (which is really a symbol that starts -;; with the character '&') to a Lisp string. (defun maxima-string (symb) - (string-left-trim "&" (print-invert-case symb))) + (print-invert-case symb)) (defmfun $translate_file (input-file &optional output-file) (setq input-file (maxima-string input-file)) Index: trmode.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/trmode.lisp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -d -r1.17 -r1.17.2.1 --- trmode.lisp 5 Sep 2007 18:51:30 -0000 1.17 +++ trmode.lisp 30 Sep 2007 00:21:20 -0000 1.17.2.1 @@ -255,8 +255,8 @@ mode (case mode (($integer $integerp) '$fixnum) - (($complex) "&to ask about this") - (t "&to see the documentation on")))) + (($complex) "to ask about this") + (t "to see the documentation on")))) (defmfun fluidize (variable) (mapc #'(lambda (v) (or (boundp v) (setf (symbol-value v) nil))) |