Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13803/src Modified Files: Tag: strings-are-lisp-strings-branch commac.lisp compar.lisp desoln.lisp elim.lisp init-cl.lisp matcom.lisp max_ext.lisp mdebug.lisp merror.lisp mtrace.lisp nparse.lisp outmis.lisp plot.lisp series.lisp suprv1.lisp Log Message: Cut out more stuff related to distinction between Lisp and Maxima strings. Index: commac.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/commac.lisp,v retrieving revision 1.47.2.1 retrieving revision 1.47.2.2 diff -u -d -r1.47.2.1 -r1.47.2.2 --- commac.lisp 29 Sep 2007 19:06:36 -0000 1.47.2.1 +++ commac.lisp 30 Sep 2007 03:06:39 -0000 1.47.2.2 @@ -523,10 +523,6 @@ finally (return (make-symbol (maybe-invert-string-case (coerce tem 'string)))))) -;; A do-nothing function. We can get rid of this, -;; now that Maxima strings are Lisp strings. -(defun make-mstring (s) s) - ;;for those window labels etc. that are wrong type. ;; is not only called for symbols, but also on numbers (defun flatc (sym) Index: compar.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/compar.lisp,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -u -d -r1.29 -r1.29.2.1 --- compar.lisp 23 Sep 2007 06:22:08 -0000 1.29 +++ compar.lisp 30 Sep 2007 03:06:39 -0000 1.29.2.1 @@ -864,10 +864,6 @@ (and (stringp b) (equal a b))) ((stringp b) nil) - ((mstringp a) - (and (mstringp b) (equal a b))) - ((mstringp b) nil) - ((arrayp a) (and (arrayp b) (array-meqp a b))) ((arrayp b) nil) Index: desoln.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/desoln.lisp,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -d -r1.7 -r1.7.4.1 --- desoln.lisp 14 Apr 2007 22:13:36 -0000 1.7 +++ desoln.lisp 30 Sep 2007 03:06:39 -0000 1.7.4.1 @@ -38,7 +38,7 @@ ((not (eql ($length (setq $ovar (maref $vars 1))) 1)) (simplify ($error $ovar - (make-mstring "contains more than one independent variable."))))) + "contains more than one independent variable.")))) (setq $ovar (simplify ($inpart $ovar 1))) (setq $dispflag nil) (setq @@ -68,7 +68,7 @@ nil)) (cond ((or (like $teqns '((mlist))) (like $teqns (list '(mlist) '((mlist))))) - (simplify ($error (make-mstring "`desolve' can't handle this case.")))) + (simplify ($error "`desolve' can't handle this case."))) (t (setq $teqns (simplify ($first $teqns))))) (cond ((not (like $flag t)) (setq $teqns (simplify ($first $teqns))))) Index: elim.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/elim.lisp,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -d -r1.7 -r1.7.4.1 --- elim.lisp 14 Apr 2007 22:13:36 -0000 1.7 +++ elim.lisp 30 Sep 2007 03:06:39 -0000 1.7.4.1 @@ -32,12 +32,12 @@ (setq $flag (setq $dispflag nil)) (cond ((not (and ($listp $eqns) ($listp $vars))) - (simplify ($error (make-mstring "The arguments must both be lists"))))) + (simplify ($error "The arguments must both be lists")))) (cond ((> ($length $vars) (setq $l ($length $eqns))) - (simplify ($error (make-mstring "More variables then equations"))))) + (simplify ($error "More variables than equations")))) (cond ((eql $l 1) - (simplify ($error (make-mstring "Can't eliminate from only one equation"))))) + (simplify ($error "Can't eliminate from only one equation")))) (cond ((eql ($length $vars) $l) (setq $vars ($reverse $vars)) (setq $sv (maref $vars 1)) Index: init-cl.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v retrieving revision 1.103.2.1 retrieving revision 1.103.2.2 diff -u -d -r1.103.2.1 -r1.103.2.2 --- init-cl.lisp 30 Sep 2007 00:21:19 -0000 1.103.2.1 +++ init-cl.lisp 30 Sep 2007 03:06:40 -0000 1.103.2.2 @@ -39,9 +39,6 @@ (defun shadow-string-assignment (var value) (cond - ((mstringp value) - (set (get var 'lisp-shadow) (maybe-invert-string-case (symbol-name (stripdollar value)))) - value) ((stringp value) (set (get var 'lisp-shadow) value) value) Index: matcom.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/matcom.lisp,v retrieving revision 1.16.8.1 retrieving revision 1.16.8.2 diff -u -d -r1.16.8.1 -r1.16.8.2 --- matcom.lisp 29 Sep 2007 19:06:38 -0000 1.16.8.1 +++ matcom.lisp 30 Sep 2007 03:06:40 -0000 1.16.8.2 @@ -518,7 +518,7 @@ (defun announce-rule-firing (rulename expr simplified-expr) (let (($display2d nil) ($stringdisp nil)) - ($print (make-mstring "By") rulename "," expr "-->" simplified-expr)) + ($print "By" rulename "," expr "-->" simplified-expr)) simplified-expr) (defmspec $defrule (form) Index: max_ext.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/max_ext.lisp,v retrieving revision 1.30.2.1 retrieving revision 1.30.2.2 diff -u -d -r1.30.2.1 -r1.30.2.2 --- max_ext.lisp 30 Sep 2007 00:21:19 -0000 1.30.2.1 +++ max_ext.lisp 30 Sep 2007 03:06:41 -0000 1.30.2.2 @@ -124,8 +124,6 @@ $lcharp $lowercasep $uppercasep - $sunlisp - $lstringp $stringp $charat $charlist Index: mdebug.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mdebug.lisp,v retrieving revision 1.30 retrieving revision 1.30.6.1 diff -u -d -r1.30 -r1.30.6.1 --- mdebug.lisp 22 Mar 2007 22:44:48 -0000 1.30 +++ mdebug.lisp 30 Sep 2007 03:06:41 -0000 1.30.6.1 @@ -552,8 +552,7 @@ (unless *mdebug* (format t "~&Turning on debugging debugmode(true)") (setq *mdebug* t)) - (cond ((or (stringp fun) - (and (mstringp fun) (setq fun ($sconcat fun)))) + (cond ((stringp fun) (let ((file fun) start) (loop named joe for vv being the symbols of 'maxima with tem with linfo when (and (typep (setq tem (set-full-lineinfo vv)) Index: merror.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/merror.lisp,v retrieving revision 1.22.4.1 retrieving revision 1.22.4.2 diff -u -d -r1.22.4.1 -r1.22.4.2 --- merror.lisp 30 Sep 2007 00:21:19 -0000 1.22.4.1 +++ merror.lisp 30 Sep 2007 03:06:42 -0000 1.22.4.2 @@ -17,7 +17,7 @@ (defvar *mdebug* t "Enter the lisp debugger on an error if this is true") -(defmvar $error `((mlist simp) ,(make-mstring "No error.")) +(defmvar $error `((mlist simp) "No error.") "During an MAXIMA-ERROR break this is bound to a list of the arguments to the call to MAXIMA-ERROR, with the message text in a compact format.") Index: mtrace.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mtrace.lisp,v retrieving revision 1.23 retrieving revision 1.23.6.1 diff -u -d -r1.23 -r1.23.6.1 --- mtrace.lisp 29 Mar 2007 22:04:52 -0000 1.23 +++ mtrace.lisp 30 Sep 2007 03:06:42 -0000 1.23.6.1 @@ -442,7 +442,7 @@ ((eq (caar option) keyword) (let ((return-to-trace-handle $trace_safety)) (return (mapply (cadr option) predicate-arglist - (make-mstring "A trace option predicate")))))))) + "A trace option predicate"))))))) (defun trace-enter-print (fun lev largs &aux (mlargs `((mlist) ,@largs))) @@ -475,7 +475,7 @@ (if (trace-option-p fun '$break) (do ((return-to-trace-handle nil) ($trace_break_arg `((mlist) ,@largs)))(nil) - ($break (make-mstring "Trace entering") fun (make-mstring "level") lev) + ($break "Trace entering" fun "level" lev) (cond (($listp $trace_break_arg) (return (cdr $trace_break_arg))) (t @@ -487,7 +487,7 @@ (if (trace-option-p fun '$break) (let (($trace_break_arg ret-val) (return-to-trace-handle nil)) - ($break (make-mstring "Trace exiting") fun (make-mstring "level") lev) + ($break "Trace exiting" fun "level" lev) $trace_break_arg) ret-val)) @@ -593,7 +593,7 @@ (return-to-trace-handle nil)) (case type ((mexpr) - (mapply prop largs (make-mstring "A traced function"))) + (mapply prop largs "A traced function")) ((expr) (apply prop largs)) ((subr lsubr) Index: nparse.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/nparse.lisp,v retrieving revision 1.45.4.2 retrieving revision 1.45.4.3 diff -u -d -r1.45.4.2 -r1.45.4.3 --- nparse.lisp 30 Sep 2007 00:21:20 -0000 1.45.4.2 +++ nparse.lisp 30 Sep 2007 03:06:43 -0000 1.45.4.3 @@ -488,10 +488,6 @@ (defmacro pop-c () '(scan-one-token)) -(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) (let ((propl (getl op-from getl))) (if propl Index: outmis.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/outmis.lisp,v retrieving revision 1.16.4.1 retrieving revision 1.16.4.2 diff -u -d -r1.16.4.1 -r1.16.4.2 --- outmis.lisp 29 Sep 2007 19:06:39 -0000 1.16.4.1 +++ outmis.lisp 30 Sep 2007 03:06:43 -0000 1.16.4.2 @@ -134,7 +134,7 @@ '((mlist))) (do ((y (symbol-plist x) (cddr y)) (l (cons '(mlist simp) (and (boundp x) - (if (optionp x) (ncons (make-mstring "system value")) + (if (optionp x) (ncons "system value") (ncons '$value))))) (prop)) ((null y) @@ -144,7 +144,7 @@ (if (member x (cdr $activecontexts) :test #'eq) (nconc l (ncons '$activecontext))) (cond ((null (symbol-plist x)) - (if (fboundp x) (nconc l (list (make-mstring "system function")))))) + (if (fboundp x) (nconc l (list "system function"))))) l) @@ -152,7 +152,7 @@ (cond ((setq prop (assoc (car y) `((bindtest . $bindtest) (sp2 . $deftaylor) (sp2subs . $deftaylor) - (assign . ,(make-mstring "assign property")) + (assign . "assign property") (nonarray . $nonarray) (grad . $gradef) (noun . $noun) (evfun . $evfun) (special . $special) (evflag . $evflag) (op . $operator)) :test #'eq)) @@ -161,22 +161,22 @@ ((and (eq (car y) 'operators) (not (eq (cadr y) 'simpargs1))) (nconc l (list '$rule))) ((and (member (car y) '(fexpr fsubr mfexpr*s mfexpr*) :test #'eq) - (nconc l (ncons (make-mstring "special evaluation form"))) + (nconc l (ncons "special evaluation form")) nil)) ((and (or (get (car y) 'mfexpr*) (fboundp x)) - (not (member (make-mstring "system function") l :test #'equal))) + (not (member "system function" l :test #'equal))) (nconc l (list (cond ((get x 'translated) '$transfun) ((mgetl x '($rule ruleof)) '$rule) - (t (make-mstring "system function")))))) - ((and (eq (car y) 'autoload) (not (member (make-mstring "system function") l :test #'equal))) + (t "system function"))))) + ((and (eq (car y) 'autoload) (not (member "system function" l :test #'equal))) (nconc l (ncons (if (member x (cdr $props) :test #'eq) - (make-mstring "user autoload function") - (make-mstring "system function"))))) + "user autoload function" + "system function")))) ((and (eq (car y) 'reversealias) (member (car y) (cdr $aliases) :test #'eq)) (nconc l (ncons '$alias))) ((eq (car y) 'data) - (nconc l (cons (make-mstring "database info") (cdr ($facts x))))) + (nconc l (cons "database info" (cdr ($facts x))))) ((eq (car y) 'mprops) ;; PROPS PROPERTIES (do ((y @@ -186,8 +186,8 @@ (cond ((setq prop (assoc (car y) `((mexpr . $function) (mmacro . $macro) - (hashar . ,(make-mstring "hashed array")) - (aexpr . ,(make-mstring "array function")) + (hashar . "hashed array") + (aexpr . "array function") (atvalues . $atvalue) ($atomgrad . $atomgrad) ($numer . $numer) @@ -200,12 +200,12 @@ (nconc l (list (cdr prop)))) ((eq (car y) 'array) (nconc l - (list (cond ((get x 'array) (make-mstring "complete array")) - (t (make-mstring "declared array")))))) + (list (cond ((get x 'array) "complete array") + (t "declared array"))))) ((and (eq (car y) '$props) (cdadr y)) (nconc l (do ((y (cdadr y) (cddr y)) - (l (list '(mlist) (make-mstring "user properties")))) + (l (list '(mlist) "user properties"))) ((null y) (list l)) (nconc l (list (car y))))))))))))) Index: plot.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/plot.lisp,v retrieving revision 1.105.4.1 retrieving revision 1.105.4.2 diff -u -d -r1.105.4.1 -r1.105.4.2 --- plot.lisp 29 Sep 2007 19:06:39 -0000 1.105.4.1 +++ plot.lisp 30 Sep 2007 03:06:44 -0000 1.105.4.2 @@ -160,8 +160,8 @@ (merror "Gnuplot is not running.")) (cond ((null s) (send-gnuplot-command "replot")) - ((mstringp s) - (send-gnuplot-command ($sconcat s)) + ((stringp s) + (send-gnuplot-command s) (send-gnuplot-command "replot")) (t (merror "Input to 'gnuplot_replot' is not a string!"))) @@ -1531,7 +1531,7 @@ (cond ((stringp v) v) - ((or (mstringp v) (msymbolp v)) + ((msymbolp v) (setq v (maybe-invert-string-case (symbol-name (stripdollar v))))) (t (setq v (maybe-invert-string-case (string (implode (strgrind v))))))) Index: series.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/series.lisp,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -u -d -r1.13 -r1.13.4.1 --- series.lisp 18 Jul 2007 10:21:28 -0000 1.13 +++ series.lisp 30 Sep 2007 03:06:44 -0000 1.13.4.1 @@ -55,9 +55,9 @@ ((and x (not (eq (car x) 'err))) x) ($verbose (mtell "Unable to expand for the following reason:") - (cond ((null x) (mtell "~%no reason given") (make-mstring "Unable to expand")) + (cond ((null x) (mtell "~%no reason given") "Unable to expand") (t (cdr x)))) - (t (make-mstring "Unable to expand"))))) + (t "Unable to expand")))) (defun out-of (e) (let ((e (cond ((and (boundp '*var) *var) Index: suprv1.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/suprv1.lisp,v retrieving revision 1.62.4.2 retrieving revision 1.62.4.3 diff -u -d -r1.62.4.2 -r1.62.4.3 --- suprv1.lisp 30 Sep 2007 00:21:20 -0000 1.62.4.2 +++ suprv1.lisp 30 Sep 2007 03:06:44 -0000 1.62.4.3 @@ -839,9 +839,6 @@ ((stringp name) (getalias (or (getopr0 name) (implode (cons #\$ (coerce name 'list)))))))) -;; 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)) (let* |