|
From: <cli...@li...> - 2010-12-15 01:17:46
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.7579,1.7580 init.lisp,1.301,1.302 (Sam Steingold) 2. clisp/tests ChangeLog,1.671,1.672 streams.tst,1.63,1.64 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Mon, 29 Nov 2010 21:42:51 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.7579,1.7580 init.lisp,1.301,1.302 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31947/src Modified Files: ChangeLog init.lisp Log Message: fix bug#3122505: LOAD does not close FAS files with a bad version marker * src/init.lisp (open-for-load): catch errors when READing the version marker Index: init.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/init.lisp,v retrieving revision 1.301 retrieving revision 1.302 diff -u -d -r1.301 -r1.302 --- init.lisp 25 Nov 2010 17:03:48 -0000 1.301 +++ init.lisp 29 Nov 2010 21:42:49 -0000 1.302 @@ -1632,7 +1632,12 @@ (or (eq *load-obsolete-action* :error) (eq present-files t) (cdr present-files)) - (setq obj (read stream))) + (setq obj + #+compiler ; normal operation; handler-bind works + (block nil + (handler-bind ((error (lambda (c) (return c)))) + (read stream))) + #-compiler (read stream))) ; bootstrap #+compiler (if (and bad-file (eq *load-obsolete-action* :compile)) ;; assume that BAD-FILE was compiled from STREAM Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7579 retrieving revision 1.7580 diff -u -d -r1.7579 -r1.7580 --- ChangeLog 26 Nov 2010 17:12:17 -0000 1.7579 +++ ChangeLog 29 Nov 2010 21:42:49 -0000 1.7580 @@ -1,3 +1,9 @@ +2010-11-29 Sam Steingold <sd...@gn...> + + fix bug#3122505: LOAD does not close FAS files with a bad version marker + * init.lisp (open-for-load): catch errors when READing the version + marker + 2010-11-26 Sam Steingold <sd...@gn...> * constsym.d, subr.d, subrkw.d, stream.d (make_stream, stream_handles): ------------------------------ Message: 2 Date: Mon, 29 Nov 2010 21:42:52 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/tests ChangeLog,1.671,1.672 streams.tst,1.63,1.64 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/tests In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31947/tests Modified Files: ChangeLog streams.tst Log Message: fix bug#3122505: LOAD does not close FAS files with a bad version marker * src/init.lisp (open-for-load): catch errors when READing the version marker Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/tests/ChangeLog,v retrieving revision 1.671 retrieving revision 1.672 diff -u -d -r1.671 -r1.672 --- ChangeLog 30 Oct 2010 21:06:19 -0000 1.671 +++ ChangeLog 29 Nov 2010 21:42:49 -0000 1.672 @@ -1,3 +1,7 @@ +2010-11-29 Sam Steingold <sd...@gn...> + + * streams.tst: add a test for bug#3122505: LOAD bad FAS + 2010-10-31 Vladimir Tzankov <vtz...@gm...> * mt.tst: add tests for :TEST and :TIMEOUT arguments of EXEMPTION-WAIT Index: streams.tst =================================================================== RCS file: /cvsroot/clisp/clisp/tests/streams.tst,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- streams.tst 20 Sep 2010 20:40:23 -0000 1.63 +++ streams.tst 29 Nov 2010 21:42:49 -0000 1.64 @@ -1246,6 +1246,21 @@ (assert (load s :verbose nil)))) "1234" +;; https://sourceforge.net/tracker/?func=detail&atid=101355&aid=3122505&group_id=1355 +(let* ((lisp "tmp.lisp") (fas (compile-file-pathname lisp))) + (unwind-protect + (progn + (with-open-file (s lisp :direction :output) + (write-line "1" s)) + (with-open-file (s fas :direction :output) + (write-char #\Null s)) + (handler-case (load fas) + (error (c) (princ-error c))) + (handler-case (equalp (compile-file lisp) (truename fas)) + (error (c) (princ-error c)))) + (post-compile-file-cleanup lisp))) +T + (progn (symbol-cleanup 's) (symbol-cleanup 's1) ------------------------------ ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 55, Issue 10 ***************************************** |