Menu
▾
▴
clisp-cvs Digest, Vol 27, Issue 45
|
From: <cli...@li...> - 2008-07-26 19:02:38
|
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.6435, 1.6436 fill-out.lisp, 1.16, 1.17 format.lisp, 1.56, 1.57 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Fri, 25 Jul 2008 20:07:06 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog, 1.6435, 1.6436 fill-out.lisp, 1.16, 1.17 format.lisp, 1.56, 1.57 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8122/src Modified Files: ChangeLog fill-out.lisp format.lisp Log Message: * fill-out.lisp (stream-write-char): treat #\NO-BREAK_SPACE specially: output a #\Space and reset PENDING-SPACE * format.lisp (format-error): use #\NO-BREAK_SPACE instead of ~VT for error message indentation (this fixes format error messages broken by the introduction of fill-out.lisp on 2004-04-07) Index: format.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/format.lisp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- format.lisp 24 Jul 2008 17:45:50 -0000 1.56 +++ format.lisp 25 Jul 2008 20:07:03 -0000 1.57 @@ -4,7 +4,7 @@ ;; Major revision by Bruno Haible 14.02.1990-15.02.1990 ;; Further revised and wrote FORMATTER 9.4.1995-11.4.1995 ;; German comments translated into English: Stefan Kain 2001-09-09 -;; pprint-logical-block ~:> support: John Boyland 2003 +;; formatter pprint-logical-block ~:> support: John Boyland 2003 ;; Sam Steingold 1999-2008 ;; FORMAT is a mechanism for producing string output conveniently by, @@ -301,6 +301,9 @@ (defvar *FORMAT-NEXT-ARGLIST*) ; pointer to next sublist in ~:{ iteration (defvar *FORMAT-UP-AND-OUT* nil) ; reason for up-and-out +;; see fill-out.lisp:stream-write-char +(defun nbsp (len) (make-string len :initial-element #\NO-BREAK_SPACE)) + ;; (format-error type {keyword value}* control-string errorpos errorstring . arguments) ;; signals an Error of the given type, that occurred in FORMAT. The position ;; in the Control-string is marked with an arrow. @@ -323,12 +326,13 @@ (loop (setq pos2 (or (position #\Newline control-string :start pos1) (length control-string))) - (setq errorstring (string-concat errorstring "~%~2T~S")) + (setq errorstring (string-concat errorstring "~%" (nbsp 2) "~S")) (setq arguments (nconc arguments (list (substring control-string pos1 pos2)))) (when (<= pos1 errorpos pos2) - (setq errorstring (string-concat errorstring "~%~VT" "|")) - (setq arguments (nconc arguments (list (+ (- errorpos pos1) 3))))) + (setq errorstring + (string-concat errorstring "~%" + (nbsp (+ (- errorpos pos1) 3)) "|"))) (when (= pos2 (length control-string)) (return)) (setq pos1 (+ pos2 1))))) (apply #'error-of-type Index: fill-out.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/fill-out.lisp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- fill-out.lisp 23 Apr 2008 23:15:13 -0000 1.16 +++ fill-out.lisp 25 Jul 2008 20:07:02 -0000 1.17 @@ -1,6 +1,6 @@ ;;; filling/indenting stream ;;; -;;; Copyright (C) 2004-2006 by Sam Steingold +;;; Copyright (C) 2004-2008 by Sam Steingold ;;; Copyright (C) 2004 by Bruno Haible ;;; This is Free Software, covered by the GNU GPL (v2) ;;; See http://www.gnu.org/copyleft/gpl.html @@ -120,6 +120,9 @@ (vector-push-extend ch buffer) (case ch (#\Newline (fill-stream-flush-buffer stream t)) + (#\NO-BREAK_SPACE ; force indentation (see format.lisp:format-error) + (vector-push-extend #\Space buffer) + (setq pending-space nil)) ((#\Space #\Tab) (when (plusp (length buffer)) (fill-stream-flush-buffer stream nil)) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6435 retrieving revision 1.6436 diff -u -d -r1.6435 -r1.6436 --- ChangeLog 24 Jul 2008 17:45:45 -0000 1.6435 +++ ChangeLog 25 Jul 2008 20:07:01 -0000 1.6436 @@ -1,3 +1,11 @@ +2008-07-25 Sam Steingold <sd...@gn...> + + * fill-out.lisp (stream-write-char): treat #\NO-BREAK_SPACE + specially: output a #\Space and reset PENDING-SPACE + * format.lisp (format-error): use #\NO-BREAK_SPACE instead of ~VT + for error message indentation (this fixes format error messages + broken by the introduction of fill-out.lisp on 2004-04-07) + 2008-07-24 Sam Steingold <sd...@gn...> * format.lisp (format-logical-block-parse): uniform error messages ------------------------------ ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 27, Issue 45 ***************************************** |