From 50b90140ddeee58a28221cf9fe44c352f2d4b054 Mon Sep 17 00:00:00 2001
From: rmax <rmax>
Date: Mon, 7 Apr 2008 15:23:04 +0000
Subject: * generic/tclStringObj.c (Tcl_AppendFormatToObj): Fix [format {% d}]
 so that it behaves the same way as in 8.4 and as C's printf(). *
 tests/format.test: Add a test for '% d' and '%+d'.

---
 ChangeLog              | 7 +++++++
 generic/tclStringObj.c | 6 +++---
 tests/format.test      | 8 +++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5287637..6ff5657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Reinhard Max  <max@suse.de>
+
+	* generic/tclStringObj.c (Tcl_AppendFormatToObj):
+	Fix [format {% d}] so that it behaves the same way as in 8.4 and
+	as C's printf().
+	* tests/format.test: Add a test for '% d' and '%+d'.
+
 2008-04-05  Kevin B. Kenny  <kennykb@acm.org>
 	
 	* win/tclWinFile.c: (WinSymLinkDirectory): Fixed a problem that
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 9664726..16a5bae 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -33,7 +33,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStringObj.c,v 1.70 2008/02/28 17:36:49 dgp Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.71 2008/04/07 15:23:10 rmax Exp $ */
 
 #include "tclInt.h"
 #include "tommath.h"
@@ -2003,8 +2003,8 @@ Tcl_AppendFormatToObj(
 	    allocSegment = 1;
 	    Tcl_IncrRefCount(segment);
 
-	    if ((isNegative || gotPlus) && (useBig || (ch == 'd'))) {
-		Tcl_AppendToObj(segment, (isNegative ? "-" : "+"), 1);
+	    if ((isNegative || gotPlus || gotSpace) && (useBig || (ch == 'd'))) {
+		Tcl_AppendToObj(segment, (isNegative ? "-" : gotPlus ? "+" : " "), 1);
 	    }
 
 	    if (gotHash) {
diff --git a/tests/format.test b/tests/format.test
index b050fc3..a985eeb 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: format.test,v 1.25 2008/01/10 16:09:23 dgp Exp $
+# RCS: @(#) $Id: format.test,v 1.26 2008/04/07 15:23:11 rmax Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -496,6 +496,12 @@ test format-15.3 {testing %0..s 0 padding for chars/strings} {
 test format-15.4 {testing %0..s 0 padding for chars/strings} {
     format %05c 61
 } {0000=}
+test format-15.5 {testing %d space padding for integers} {
+    format "(% 1d) (% 1d)" 10 -10
+} {( 10) (-10)}
+test format-15.6 {testing %d plus padding for integers} {
+    format "(%+1d) (%+1d)" 10 -10
+} {(+10) (-10)}
 
 set a "0123456789"
 set b ""
-- 
cgit v0.12