[Maxima-commits] CVS: maxima/src mdebug.lisp,1.31,1.32

[Andreas E. <ar...@us...>]

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

Modified Files:
	mdebug.lisp 
Log Message:


eval-when around defstruct is unnecessary and cause a redefinition warning.


Index: mdebug.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/mdebug.lisp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mdebug.lisp	15 Oct 2007 02:45:56 -0000	1.31
+++ mdebug.lisp	16 Oct 2007 22:58:07 -0000	1.32
@@ -526,17 +526,12 @@
 (def-break :top  #'(lambda( &rest l)l (throw 'macsyma-quit 'top)) "Throw to top level")
 
 
+(defstruct (line-info (:type list)) line file)
 
-(eval-when
-    #+gcl (compile load eval)
-    #-gcl (:compile-toplevel :load-toplevel :execute)
-
-    (defstruct (line-info (:type list)) line file)
-
-    (defstruct (bkpt (:type list)) form file file-line function))
+(defstruct (bkpt (:type list)) form file file-line function)
 
 
-(defun *break-points* (form  ) 
+(defun *break-points* (form)
   (let ((pos(position form *break-points* :key 'car )))
     (format t "Bkpt ~a:" pos)
     (break-dbm-loop  (aref *break-points* pos) )))
@@ -544,11 +539,8 @@
 
 ;;fun = function name eg '$|odeSeriesSolve| and li = offset from beginning of function.
 ;;   or= string (filename) and li = absolute position.
-;; 
 
-(defun break-function (fun &optional (li 0)  absolute  &aux i tem info form
-		       fun-line
-		       )
+(defun break-function (fun &optional (li 0) absolute &aux i tem info form fun-line)
   (unless *mdebug*
     (format t "~&Turning on debugging debugmode(true)")
     (setq *mdebug* t))
@@ -560,7 +552,7 @@
 			    (setq linfo (get-lineinfo (aref tem 1)))
 			    (equal file (cadr linfo))
 			    (fb >= li (setq start (aref tem 0)))
-			    (fb <= li (f + start (length (the vector tem)))))
+			    (fb <= li (+ start (length (the vector tem)))))
 		  do (setq fun vv li (f - li start -1 ))
 					; (print (list 'found fun fun li  (aref tem 0)))
 		  (return-from joe nil)
@@ -597,13 +589,12 @@
 
 
 ;; note  need to make the redefine function, fixup the break point
-;; list.. 
+;; list..
 
 (defun make-break-point (fun ar i)
   (declare (fixnum i) (type (vector t) ar))
   (let* ((tem (aref ar i))
 	 (linfo (get-lineinfo tem)))
-					;(defstruct (bkpt (:type list)) form file file-line function)    
     (and linfo (list tem (cadr linfo) (car linfo) fun))))
 
 (defun dbm-up (n &aux (cur *current-frame*) (m (length *mlambda-call-stack*)))