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

Fix minor bugs in IR for slices

Browse Source
This commit is contained in:
Ginger Bill
2017-02-23 22:22:56 +00:00
parent 047c0e4bcc
commit a982c51c30
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/_preload.odin
+3 -3
View File
@@ -89,9 +89,9 @@ Type_Info :: union {
}
// // NOTE(bill): only the ones that are needed (not all types)
// // This will be set by the compiler
__type_infos: []Type_Info;
// NOTE(bill): only the ones that are needed (not all types)
// This will be set by the compiler
__type_table: []Type_Info;
type_info_base :: proc(info: ^Type_Info) -> ^Type_Info {
if info == nil {
core/fmt.odin
+16 -8
View File
@@ -206,10 +206,12 @@ buffer_write_type :: proc(buf: ^Buffer, ti: ^Type_Info) {
}
buffer_write_byte(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_type(buf, info.types[i]);
buffer_write_byte(buf, ',');
}
buffer_write_byte(buf, '}');
@@ -227,7 +229,7 @@ buffer_write_type :: proc(buf: ^Buffer, ti: ^Type_Info) {
total_count += 1;
}
for name, i in info.variant_names {
if i > 0 || total_count > 0 {
if total_count > 0 || i > 0 {
buffer_write_string(buf, ", ");
}
buffer_write_string(buf, name);
@@ -237,13 +239,15 @@ buffer_write_type :: proc(buf: ^Buffer, ti: ^Type_Info) {
variant_type := type_info_base(info.variant_types[i]);
variant := union_cast(^Struct)variant_type;
for j in cf.names.count..<variant.names.count {
vc := variant.names.count-cf.names.count;
for j in 0..<vc {
if j > 0 {
buffer_write_byte(buf, ',');
buffer_write_string(buf, ", ");
}
buffer_write_string(buf, variant.names[j]);
index := j + cf.names.count;
buffer_write_string(buf, variant.names[index]);
buffer_write_string(buf, ": ");
buffer_write_type(buf, variant.types[j]);
buffer_write_type(buf, variant.types[index]);
}
}
buffer_write_string(buf, "}");
@@ -251,17 +255,21 @@ buffer_write_type :: proc(buf: ^Buffer, ti: ^Type_Info) {
case Raw_Union:
buffer_write_string(buf, "raw_union {");
for name, i in info.names {
if i > 0 {
buffer_write_string(buf, ", ");
}
buffer_write_string(buf, name);
buffer_write_string(buf, ": ");
buffer_write_type(buf, info.types[i]);
buffer_write_byte(buf, ',');
}
buffer_write_string(buf, "}");
case Enum:
buffer_write_string(buf, "enum ");
buffer_write_type(buf, info.base);
buffer_write_string(buf, " {}");
buffer_write_string(buf, " {");
buffer_write_string(buf, "}");
}
}