[Maxima-commits] CVS: maxima/src dskfn.lisp, 1.15, 1.16 lmdcls.lisp, 1.14, 1.15 suprv1.lisp, 1.50, 1.51

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5528/src

Modified Files:
	dskfn.lisp lmdcls.lisp suprv1.lisp 
Log Message:
Cut out obsolete functions related to files.

(1) cut function FILEPRINT from src/suprv1.lisp
    (not called anywhere in Lisp or Maxima code)
(2) cut function MFILE-OUT from src/suprv1.lisp
    (called only from previous version of $RESTORE)
(3) cut variable $FILE_STRING_PRINT from src/suprv1.lisp
    (referenced only from FILEPRINT and MFILE-OUT,
    distinguished filenames which were strings as in CL
    from filenames which were lists as in obsolete systems)
(4) in function $RESTORE (in src/dskfn.lisp) just punt to $LOAD.
    ($RESTORE is undocumented, previous version was broken,
    and the intended purpose appears to be the same as $LOAD)


Index: dskfn.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/dskfn.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dskfn.lisp	25 Mar 2007 12:17:47 -0000	1.15
+++ dskfn.lisp	27 Mar 2007 03:33:24 -0000	1.16
@@ -394,27 +394,4 @@
 	(i-$store '($labels)))))
 
 (defmspec $restore (file)
-  (setq file (cdr file))
-  (let ((eof (ncons nil)) (in (open (filestrip file))))
-    (setq file (truename in))
-    (setq file (if (atom file) file (append (cdr file) (car file))))
-    (do ((item (read in eof) (read in eof))) ((eq item eof))
-      (cond ((and (eq (car item) 'dsksetq) (not (optionp (cadr item))))
-	     (set (cadr item) (list '(mfile) file (cadr item))))
-	    ((and (eq (car item) 'mdefprop)
-		  (member (cadddr item) '(mexpr mmacro aexpr) :test #'eq))
-	     (mputprop (cadr item)
-		       (list '(mfile) file (cadr item))
-		       (cadddr item)))
-	    ((and (eq (car item) 'mputprop)
-		  (member (cadr (cadddr item)) '(array hashar) :test #'eq))
-	     (mputprop (cadadr item)
-		       (list '(mfile) file (cadadr item))
-		       (cadr (cadddr item)))
-	     (do ((item (read in) (read in))) (nil)
-	       (if (eq (car item) 'add2lnc) (return (eval item)))))
-	    (t (eval item))))
-    (close in)
-    (if (atom file)
-	file
-	(mfile-out file))))
+  (meval `(($load) ,(cadr file))))

Index: lmdcls.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/lmdcls.lisp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- lmdcls.lisp	8 Jan 2007 01:45:17 -0000	1.14
+++ lmdcls.lisp	27 Mar 2007 03:33:24 -0000	1.15
@@ -70,7 +70,7 @@
   $dotconstrules $dotdistrib $dotexptsimp $dotident $dotscrules
   $dskgc $erfflag $errexp $error $error_size $error_syms $expon
   $exponentialize $expop $exptdispflag $exptisolate $exptsubst
-  $facexpand $factorflag $features $file_search $file_string_print
+  $facexpand $factorflag $features $file_search
   $file_types $float $float2bf $floatformat $floatfrac $floatint
   $floatoptions $floatprec $floatwidth $fortfloat $fortindent
   $fortspaces $fpprec $fpprintprec $fptrunc $functions $gammalim $gcd

Index: suprv1.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/suprv1.lisp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- suprv1.lisp	19 Mar 2007 14:52:16 -0000	1.50
+++ suprv1.lisp	27 Mar 2007 03:33:24 -0000	1.51
@@ -149,9 +149,6 @@
 (defun sys-gctime ()
   (status gctime))
 
-(defmvar $file_string_print t
-  "If `true', filenames are output as strings; if `false', as lists.")
-
 (defmvar $showtime nil)
 
 (defmfun meval* (test)
@@ -1050,20 +1047,6 @@
 
 (defmfun $logout () (bye))
 
-(defmfun fileprint (fname)	  ; Takes filename in NAMELIST format.
-  (cond ($file_string_print (princ (namestring fname)) (princ "  "))
-	(t (princ "[")
-	   (princ (cadr fname)) (princ ", ")
-	   (princ (caddr fname)) (princ ", ")
-	   (when (cdddr fname) (princ (cadddr fname)) (princ ", ")) ; For TOPS-20
-	   (princ (caar fname)) (princ ", ")
-	   (princ (cadar fname)) (princ "]  "))))
-
-(defmfun mfile-out (fname) ; Takes filename in NAMELIST or OldIO list format.
-  (if $file_string_print
-      (implode (cons #\& (exploden (namestring fname))))
-      (dollarify (if (atom (car fname)) fname (append (cdr fname) (car fname))))))
-
 ;; File-processing stuff.
 
 (defun mfile nil