Skip to content

Commit 05ed940

Browse files
authored
Handle the format '?' in number formatting (qax-os#2080)
1 parent 4324622 commit 05ed940

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

numfmt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5006,7 +5006,7 @@ func (nf *numberFormat) printNumberLiteral(text string) string {
50065006
if token.TType == nfp.TokenTypeLiteral {
50075007
result += token.TValue
50085008
}
5009-
if token.TType == nfp.TokenTypeHashPlaceHolder || token.TType == nfp.TokenTypeZeroPlaceHolder {
5009+
if token.TType == nfp.TokenTypeHashPlaceHolder || token.TType == nfp.TokenTypeZeroPlaceHolder || token.TType == nfp.TokenTypeDigitalPlaceHolder {
50105010
digits, str := handleDigitsLiteral(text, len(token.TValue), intPartLen, hashZeroPartLen)
50115011
intPartLen += digits
50125012
result += str

numfmt_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3635,6 +3635,7 @@ func TestNumFmt(t *testing.T) {
36353635
{"123", "[$x.-unknown]MM/DD/YYYY", "x.05/02/1900"},
36363636
{"1234.5678", "0.0xxx00", "1234.5xxx68"},
36373637
{"80145.899999999994", "[$¥-8004]\" \"#\" \"####\"\"", "¥ 8 0146"},
3638+
{"1", "?", "1"},
36383639
// Unsupported number format
36393640
{"37947.7500001", "0.00000000E+000", "37947.7500001"},
36403641
{"123", "[DBNum4][$-804]yyyy\"\"m\"\";@", "123"},

0 commit comments

Comments
 (0)