[Maxima-commits] CVS: maxima/src nparse.lisp,1.11,1.12

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20226/src

Modified Files:
	nparse.lisp 
Log Message:
o Moved STREAM-NAME to nparse.lisp.
o Removed definition of INSTREAM struct since it's already defined in
  nparse.lisp.


Index: nparse.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/nparse.lisp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- nparse.lisp	23 Feb 2003 18:04:46 -0000	1.11
+++ nparse.lisp	11 Mar 2003 04:01:59 -0000	1.12
@@ -1833,31 +1833,6 @@
     (MAPC #'(LAMBDA (X) (REMPROP NOUN-FORM X))
  	  '(DIMENSION DISSYM LBP RBP))))
 
-(defun find-stream (stream)
-   (dolist (v *stream-alist*)
-	(cond ((eq stream (instream-stream v))
-	       (return v))))
-  )
-
-
-(defun add-lineinfo (lis)
-  (if (or (atom lis) (and (eq *parse-window* *standard-input*)
-			  (not (find-stream *parse-stream*))))
-			  lis
-    (let* ((st (get-instream *parse-stream*))
- 	   (n (instream-line st))
-	   (nam (instream-name st))
-	   )
-      (or nam (return-from add-lineinfo lis))
-      (setq *current-line-info*
-	    (cond ((eq (cadr *current-line-info*) nam)
-		   (cond ((eql (car *current-line-info*) n)
-			  *current-line-info*)
-			 (t  (cons n (cdr *current-line-info*)))))
-		  (t (list n nam  'src))))
-      (cond ((null (cdr lis))
-	     (list (car lis) *current-line-info*))
-	    (t (append lis (list *current-line-info*)))))))
 
 
 ;; the functions get-instream etc.. are all defined in
@@ -1871,13 +1846,18 @@
 
 (defvar *stream-alist* nil)
 
+(defun stream-name (path)
+  (let ((tem (errset (namestring (pathname path)))))
+    (car tem)))
+
 (defun instream-name (instr)
   (or (instream-stream-name instr)
       (stream-name (instream-stream instr))))
 
-(defun stream-name (str) (namestring (pathname str)))
-
-(defstruct instream stream (line 0 :type fixnum) stream-name)
+(defstruct instream
+  stream
+  (line 0 :type fixnum)
+  stream-name)
 
 ;; (closedp stream) checks if a stream is closed.. how to do this in common
 ;; lisp!!
@@ -1906,5 +1886,30 @@
   ;(setq *at-newline*  (if (eql (peek-char nil str nil) #\() :all t))
   (values))
 
-)
-; end #-gcl
+) ; end #-gcl
+
+(defun find-stream (stream)
+   (dolist (v *stream-alist*)
+	(cond ((eq stream (instream-stream v))
+	       (return v))))
+  )
+
+
+(defun add-lineinfo (lis)
+  (if (or (atom lis) (and (eq *parse-window* *standard-input*)
+			  (not (find-stream *parse-stream*))))
+			  lis
+    (let* ((st (get-instream *parse-stream*))
+ 	   (n (instream-line st))
+	   (nam (instream-name st))
+	   )
+      (or nam (return-from add-lineinfo lis))
+      (setq *current-line-info*
+	    (cond ((eq (cadr *current-line-info*) nam)
+		   (cond ((eql (car *current-line-info*) n)
+			  *current-line-info*)
+			 (t  (cons n (cdr *current-line-info*)))))
+		  (t (list n nam  'src))))
+      (cond ((null (cdr lis))
+	     (list (car lis) *current-line-info*))
+	    (t (append lis (list *current-line-info*)))))))