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

Add extra pointer printing options to fmt.printf

Browse Source
This commit is contained in:
gingerBill
2019-03-15 23:49:47 +00:00
parent 231f3cc15a
commit 14c6f2f258
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+32 -16
View File
@@ -673,13 +673,20 @@ fmt_cstring :: proc(fi: ^Info, s: cstring, verb: rune) {
} }
fmt_pointer :: proc(fi: ^Info, p: rawptr, verb: rune) { fmt_pointer :: proc(fi: ^Info, p: rawptr, verb: rune) {
u := u64(uintptr(p));
switch verb { switch verb {
case 'p', 'v': case 'p', 'v':
u := u64(uintptr(p));
if !fi.hash || verb == 'v' { if !fi.hash || verb == 'v' {
strings.write_string(fi.buf, "0x"); strings.write_string(fi.buf, "0x");
} }
_fmt_int(fi, u, 16, false, 8*size_of(rawptr), __DIGITS_UPPER); _fmt_int(fi, u, 16, false, 8*size_of(rawptr), __DIGITS_UPPER);
case 'b': _fmt_int(fi, u, 2, false, 8*size_of(rawptr), __DIGITS_UPPER);
case 'o': _fmt_int(fi, u, 8, false, 8*size_of(rawptr), __DIGITS_UPPER);
case 'd': _fmt_int(fi, u, 10, false, 8*size_of(rawptr), __DIGITS_UPPER);
case 'x': _fmt_int(fi, u, 16, false, 8*size_of(rawptr), __DIGITS_UPPER);
case 'X': _fmt_int(fi, u, 16, false, 8*size_of(rawptr), __DIGITS_UPPER);
case: case:
fmt_bad_verb(fi, verb); fmt_bad_verb(fi, verb);
} }
@@ -1046,14 +1053,19 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
} }
case runtime.Type_Info_Dynamic_Array: case runtime.Type_Info_Dynamic_Array:
strings.write_byte(fi.buf, '['); if verb == 'p' {
defer strings.write_byte(fi.buf, ']'); slice := cast(^mem.Raw_Dynamic_Array)v.data;
array := cast(^mem.Raw_Dynamic_Array)v.data; fmt_pointer(fi, slice.data, 'p');
for i in 0..array.len-1 { } else {
if i > 0 do strings.write_string(fi.buf, ", "); strings.write_byte(fi.buf, '[');
defer strings.write_byte(fi.buf, ']');
array := cast(^mem.Raw_Dynamic_Array)v.data;
for i in 0..array.len-1 {
if i > 0 do strings.write_string(fi.buf, ", ");
data := uintptr(array.data) + uintptr(i*info.elem_size); data := uintptr(array.data) + uintptr(i*info.elem_size);
fmt_arg(fi, any{rawptr(data), info.elem.id}, verb); fmt_arg(fi, any{rawptr(data), info.elem.id}, verb);
}
} }
case runtime.Type_Info_Simd_Vector: case runtime.Type_Info_Simd_Vector:
@@ -1071,16 +1083,20 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
case runtime.Type_Info_Slice: case runtime.Type_Info_Slice:
strings.write_byte(fi.buf, '['); if verb == 'p' {
defer strings.write_byte(fi.buf, ']'); slice := cast(^mem.Raw_Slice)v.data;
slice := cast(^mem.Raw_Slice)v.data; fmt_pointer(fi, slice.data, 'p');
for i in 0..slice.len-1 { } else {
if i > 0 do strings.write_string(fi.buf, ", "); strings.write_byte(fi.buf, '[');
defer strings.write_byte(fi.buf, ']');
slice := cast(^mem.Raw_Slice)v.data;
for i in 0..slice.len-1 {
if i > 0 do strings.write_string(fi.buf, ", ");
data := uintptr(slice.data) + uintptr(i*info.elem_size); data := uintptr(slice.data) + uintptr(i*info.elem_size);
fmt_arg(fi, any{rawptr(data), info.elem.id}, verb); fmt_arg(fi, any{rawptr(data), info.elem.id}, verb);
}
} }
case runtime.Type_Info_Map: case runtime.Type_Info_Map:
if verb != 'v' { if verb != 'v' {
fmt_bad_verb(fi, verb); fmt_bad_verb(fi, verb);