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

Minor changes to fmt of auto deferencing

Browse Source
This commit is contained in:
gingerBill
2019-03-16 11:00:37 +00:00
parent f7efaf2ba2
commit 3a31444656
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+18 -7
View File
@@ -10,7 +10,7 @@ import "core:strconv"
import "core:strings" import "core:strings"
@(private) @private
DEFAULT_BUFFER_SIZE :: 1<<12; DEFAULT_BUFFER_SIZE :: 1<<12;
Info :: struct { Info :: struct {
@@ -1041,27 +1041,38 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
write_type(fi.buf, (^^runtime.Type_Info)(v.data)^); write_type(fi.buf, (^^runtime.Type_Info)(v.data)^);
} else { } else {
if verb != 'p' { if verb != 'p' {
ptr := (^rawptr)(v.data)^;
a := any{ptr, info.elem.id};
elem := runtime.type_info_base(info.elem); elem := runtime.type_info_base(info.elem);
if elem != nil do switch e in elem.variant { if elem != nil do switch e in elem.variant {
case runtime.Type_Info_Array, case runtime.Type_Info_Array,
runtime.Type_Info_Slice, runtime.Type_Info_Slice,
runtime.Type_Info_Dynamic_Array, runtime.Type_Info_Dynamic_Array,
runtime.Type_Info_Map: runtime.Type_Info_Map:
if fi.record_level == 0 { if ptr == nil {
fi.record_level += 1; strings.write_string(fi.buf, "<nil>");
return;
}
if fi.record_level < 1 {
fi.record_level += 1;
defer fi.record_level -= 1; defer fi.record_level -= 1;
strings.write_byte(fi.buf, '&'); strings.write_byte(fi.buf, '&');
fmt_value(fi, any{(^rawptr)(v.data)^, info.elem.id}, verb); fmt_value(fi, a, verb);
return; return;
} }
case runtime.Type_Info_Struct, case runtime.Type_Info_Struct,
runtime.Type_Info_Union: runtime.Type_Info_Union:
if fi.record_level == 0 { if ptr == nil {
strings.write_string(fi.buf, "<nil>");
return;
}
if fi.record_level < 1 {
fi.record_level += 1; fi.record_level += 1;
defer fi.record_level -= 1; defer fi.record_level -= 1;
strings.write_byte(fi.buf, '&'); strings.write_byte(fi.buf, '&');
fmt_value(fi, any{(^rawptr)(v.data)^, info.elem.id}, verb); fmt_value(fi, a, verb);
return; return;
} }
} }
@@ -1254,7 +1265,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
fmt_complex :: proc(fi: ^Info, c: complex128, bits: int, verb: rune) { fmt_complex :: proc(fi: ^Info, c: complex128, bits: int, verb: rune) {
switch verb { switch verb {
case 'f', 'F', 'v': case 'f', 'F', 'v', 'h', 'H':
r, i := real(c), imag(c); r, i := real(c), imag(c);
fmt_float(fi, r, bits/2, verb); fmt_float(fi, r, bits/2, verb);
if !fi.plus && i >= 0 { if !fi.plus && i >= 0 {