mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-06 18:54:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ir bug; allow formatting options for arrays & et al.

Browse Source
This commit is contained in:
Ginger Bill
2017-05-09 12:05:17 +01:00
parent 5595daf5a3
commit 8677c81da7
3 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
core/fmt.odin
View File

@@ -604,7 +604,7 @@ fmt_int :: proc(fi: ^Fmt_Info, u: u64, is_signed: bool, bit_size: int, verb: run
}
_pad :: proc(fi: ^Fmt_Info, s: string) {
if !fi.width_set || fi.width == 0 {
if !fi.width_set {
write_string(fi.buf, s);
return;
}
@@ -818,11 +818,6 @@ fmt_value :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
fmt_arg(fi, any{v.data, info.elem}, verb);
case Array:
if verb != 'v' {
fmt_bad_verb(fi, verb);
return;
}
write_byte(fi.buf, '[');
defer write_byte(fi.buf, ']');
for i in 0..<info.count {
@@ -830,15 +825,10 @@ fmt_value :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
write_string(fi.buf, ", ");
}
data := ^byte(v.data) + i*info.elem_size;
fmt_arg(fi, any{rawptr(data), info.elem}, 'v');
fmt_arg(fi, any{rawptr(data), info.elem}, verb);
}
case Dynamic_Array:
if verb != 'v' {
fmt_bad_verb(fi, verb);
return;
}
write_byte(fi.buf, '[');
defer write_byte(fi.buf, ']');
array := (^raw.Dynamic_Array)(v.data);
@@ -847,7 +837,32 @@ fmt_value :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
write_string(fi.buf, ", ");
}
data := ^byte(array.data) + i*info.elem_size;
fmt_arg(fi, any{rawptr(data), info.elem}, 'v');
fmt_arg(fi, any{rawptr(data), info.elem}, verb);
}
case Slice:
write_byte(fi.buf, '[');
defer write_byte(fi.buf, ']');
slice := (^[]byte)(v.data);
for _, i in slice {
if i > 0 {
write_string(fi.buf, ", ");
}
data := &slice[0] + i*info.elem_size;
fmt_arg(fi, any{rawptr(data), info.elem}, verb);
}
case Vector:
write_byte(fi.buf, '<');
defer write_byte(fi.buf, '>');
for i in 0..<info.count {
if i > 0 {
write_string(fi.buf, ", ");
}
data := ^byte(v.data) + i*info.elem_size;
fmt_value(fi, any{rawptr(data), info.elem}, verb);
}
case Map:
@@ -884,35 +899,7 @@ fmt_value :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
fmt_arg(fi, any{rawptr(value), info.value}, 'v');
}
case Slice:
if verb != 'v' {
fmt_bad_verb(fi, verb);
return;
}
write_byte(fi.buf, '[');
defer write_byte(fi.buf, ']');
slice := (^[]byte)(v.data);
for _, i in slice {
if i > 0 {
write_string(fi.buf, ", ");
}
data := &slice[0] + i*info.elem_size;
fmt_arg(fi, any{rawptr(data), info.elem}, 'v');
}
case Vector:
write_byte(fi.buf, '<');
defer write_byte(fi.buf, '>');
for i in 0..<info.count {
if i > 0 {
write_string(fi.buf, ", ");
}
data := ^byte(v.data) + i*info.elem_size;
fmt_value(fi, any{rawptr(data), info.elem}, 'v');
}
case Struct:
write_byte(fi.buf, '{');

4
src/ir.c
View File

@@ -2710,8 +2710,8 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
if (is_type_integer(src) && is_type_integer(dst)) {
GB_ASSERT(src->kind == Type_Basic &&
dst->kind == Type_Basic);
i64 sz = type_size_of(proc->module->allocator, src);
i64 dz = type_size_of(proc->module->allocator, dst);
i64 sz = type_size_of(proc->module->allocator, default_type(src));
i64 dz = type_size_of(proc->module->allocator, default_type(dst));
irConvKind kind = irConv_trunc;
if (dz < sz) {

2
src/types.c
View File

@@ -1763,7 +1763,7 @@ i64 type_size_of_internal(gbAllocator allocator, Type *t, TypePath *path) {
} break;
case Type_Basic: {
GB_ASSERT(is_type_typed(t));
GB_ASSERT_MSG(is_type_typed(t), "%s", type_to_string(t));
BasicKind kind = t->Basic.kind;
i64 size = t->Basic.size;
if (size > 0) {