ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 05:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #69 for fmt.printf padding

Browse Source
This commit is contained in:
Ginger Bill
2017-06-06 10:02:53 +01:00
parent 88b990eb63
commit 107740ca5e
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt.odin
+26 -8
View File
@@ -500,14 +500,14 @@ fmt_write_padding :: proc(fi: ^FmtInfo, width: int) {
if width <= 0 { if width <= 0 {
return; return;
} }
pad_byte: byte = ' '; pad_byte: byte = '0';
if fi.zero { if fi.space {
pad_byte = '0'; pad_byte = ' ';
} }
data := string_buffer_data(fi.buf^); data := string_buffer_data(fi.buf^);
count := min(width, cap(data)-len(data)); count := min(width, cap(data)-len(data));
for _ in 0..count { for _ in 0..<count {
write_byte(fi.buf, pad_byte); write_byte(fi.buf, pad_byte);
} }
} }
@@ -550,11 +550,29 @@ _fmt_int :: proc(fi: ^FmtInfo, u: u128, base: int, is_signed: bool, bit_size: in
} }
buf: [256]byte; buf: [256]byte;
start := 0;
flags: strconv.IntFlag; flags: strconv.IntFlag;
if fi.hash { flags |= strconv.IntFlag.PREFIX; } if fi.hash && !fi.zero { flags |= strconv.IntFlag.Prefix; }
if fi.plus { flags |= strconv.IntFlag.PLUS; } if fi.plus { flags |= strconv.IntFlag.Plus; }
if fi.space { flags |= strconv.IntFlag.SPACE; } if fi.space { flags |= strconv.IntFlag.Space; }
s := strconv.append_bits(buf[0..<0], u128(u), base, is_signed, bit_size, digits, flags); s := strconv.append_bits(buf[start..<start], u128(u), base, is_signed, bit_size, digits, flags);
if fi.hash && fi.zero {
c: byte;
match base {
case 2: c = 'b';
case 8: c = 'o';
case 10: c = 'd';
case 12: c = 'z';
case 16: c = 'x';
}
if c != 0 {
write_byte(fi.buf, '0');
write_byte(fi.buf, c);
}
}
prev_zero := fi.zero; prev_zero := fi.zero;
defer fi.zero = prev_zero; defer fi.zero = prev_zero;
core/strconv.odin
+6 -6
View File
@@ -1,9 +1,9 @@
#import . "decimal.odin"; #import . "decimal.odin";
IntFlag :: enum { IntFlag :: enum {
PREFIX = 1<<0, Prefix = 1<<0,
PLUS = 1<<1, Plus = 1<<1,
SPACE = 1<<2, Space = 1<<2,
} }
@@ -469,7 +469,7 @@ append_bits :: proc(buf: []byte, u_: u128, base: int, is_signed: bool, bit_size:
} }
i--; a[i] = digits[uint(u % b)]; i--; a[i] = digits[uint(u % b)];
if flags&IntFlag.PREFIX != 0 { if flags&IntFlag.Prefix != 0 {
ok := true; ok := true;
match base { match base {
case 2: i--; a[i] = 'b'; case 2: i--; a[i] = 'b';
@@ -486,9 +486,9 @@ append_bits :: proc(buf: []byte, u_: u128, base: int, is_signed: bool, bit_size:
if neg { if neg {
i--; a[i] = '-'; i--; a[i] = '-';
} else if flags&IntFlag.PLUS != 0 { } else if flags&IntFlag.Plus != 0 {
i--; a[i] = '+'; i--; a[i] = '+';
} else if flags&IntFlag.SPACE != 0 { } else if flags&IntFlag.Space != 0 {
i--; a[i] = ' '; i--; a[i] = ' ';
} }