summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgriffin <briang42@easystreet.net>2023-09-16 00:44:16 (GMT)
committergriffin <briang42@easystreet.net>2023-09-16 00:44:16 (GMT)
commit68a951b7df6da5632f16927d3e5e7f6d729550d2 (patch)
treebc4c8b8ef4414b63e33b41a746d3ae727947473d
parent56d7cb1dd358b70cc0fc771dc60910dcd546e279 (diff)
downloadtcl-68a951b7df6da5632f16927d3e5e7f6d729550d2.zip
tcl-68a951b7df6da5632f16927d3e5e7f6d729550d2.tar.gz
tcl-68a951b7df6da5632f16927d3e5e7f6d729550d2.tar.bz2
Fix bug [891a74b941] - format %#d not consistent with other radix prefixes
-rw-r--r--generic/tclStringObj.c4
-rw-r--r--tests/format.test6
2 files changed, 7 insertions, 3 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 850bf45..dcdc71b 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2228,6 +2228,10 @@ Tcl_AppendFormatToObj(
Tcl_AppendToObj(segment, "0b", 2);
segmentLimit -= 2;
break;
+ case 'd':
+ Tcl_AppendToObj(segment, "0d", 2);
+ segmentLimit -= 2;
+ break;
}
}
diff --git a/tests/format.test b/tests/format.test
index 8cabbf1..17a362b 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -83,13 +83,13 @@ test format-1.12 {integer formatting} {
} {101 0 0b101 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
test format-1.13 {integer formatting} {
format "%#0d %#0d %#0d %#0d %#0d" 0 6 34 16923 -12 -1
-} {0 6 34 16923 -12}
+} {0 0d6 0d34 0d16923 -0d12}
test format-1.14 {integer formatting} {
format "%#05d %#020d %#020d %#020d %#020d" 0 6 34 16923 -12 -1
-} {00000 00000000000000000006 00000000000000000034 00000000000000016923 -0000000000000000012}
+} {00000 0d000000000000000006 0d000000000000000034 0d000000000000016923 -0d00000000000000012}
test format-1.15 {integer formatting} {
format "%-#05d %-#020d %-#020d %-#020d %-#020d" 0 6 34 16923 -12 -1
-} {00000 00000000000000000006 00000000000000000034 00000000000000016923 -0000000000000000012}
+} {00000 0d000000000000000006 0d000000000000000034 0d000000000000016923 -0d00000000000000012}
test format-2.1 {string formatting} {