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

Fix fmt.odin printing enums

Browse Source
This commit is contained in:
Ginger Bill
2017-02-24 20:55:35 +00:00
parent 9b2f5c359a
commit eec709c545
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.bat
+1
View File
@@ -45,6 +45,7 @@ del *.ilk > NUL 2> NUL
cl %compiler_settings% "src\main.c" ^ cl %compiler_settings% "src\main.c" ^
/link %linker_settings% -OUT:%exe_name% ^ /link %linker_settings% -OUT:%exe_name% ^
&& odin run code/demo.odin && odin run code/demo.odin
rem && odin run code/Jaze/src/main.odin
rem && odin build_dll code/example.odin ^ rem && odin build_dll code/example.odin ^
rem odin run code/demo.odin rem odin run code/demo.odin
core/fmt.odin
+12 -7
View File
@@ -268,7 +268,12 @@ buffer_write_type :: proc(buf: ^Buffer, ti: ^Type_Info) {
buffer_write_string(buf, "enum "); buffer_write_string(buf, "enum ");
buffer_write_type(buf, info.base); buffer_write_type(buf, info.base);
buffer_write_string(buf, " {"); buffer_write_string(buf, " {");
for name, i in info.names {
if i > 0 {
buffer_write_string(buf, ", ");
}
buffer_write_string(buf, name);
}
buffer_write_string(buf, "}"); buffer_write_string(buf, "}");
} }
} }
@@ -708,13 +713,13 @@ fmt_enum :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
case u32: i = cast(i64)v; case u32: i = cast(i64)v;
case u64: i = cast(i64)v; case u64: i = cast(i64)v;
case uint: i = cast(i64)v; case uint: i = cast(i64)v;
case f32: f = cast(f64)v; case f32: f = cast(f64)v; i = transmute(i64)f;
case f64: f = cast(f64)v; case f64: f = cast(f64)v; i = transmute(i64)f;
} }
if types.is_string(e.base) { if types.is_string(e.base) {
for it, idx in e.values { for val, idx in e.values {
if it.i == i { if val.i == i {
buffer_write_string(fi.buf, e.names[idx]); buffer_write_string(fi.buf, e.names[idx]);
ok = true; ok = true;
break; break;
@@ -724,8 +729,8 @@ fmt_enum :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
buffer_write_string(fi.buf, ""); buffer_write_string(fi.buf, "");
ok = true; ok = true;
} else { } else {
for it, idx in e.values { for val, idx in e.values {
if it.f == f { if val.i == i {
buffer_write_string(fi.buf, e.names[idx]); buffer_write_string(fi.buf, e.names[idx]);
ok = true; ok = true;
break; break;