mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-03-03 23:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #119

Browse Source 
This may need better error messages
This commit is contained in:
Ginger Bill
2017-10-12 20:52:19 +01:00
parent 349a62121c
commit 26d3c54aff
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/check_expr.cpp
View File

@@ -405,7 +405,7 @@ bool is_polymorphic_type_assignable(Checker *c, Type *poly, Type *source, bool c
i64 check_distance_between_types(Checker *c, Operand *operand, Type *type) {
if (operand->mode == Addressing_Invalid ||
type == t_invalid) {
return 0;
return -1;
}
if (operand->mode == Addressing_Builtin) {
@@ -1192,8 +1192,9 @@ bool check_representable_as_constant(Checker *c, ExactValue in_value, Type *type
}
type = core_type(type);
if (is_type_boolean(type)) {
if (type == t_invalid) {
return false;
} else if (is_type_boolean(type)) {
return in_value.kind == ExactValue_Bool;
} else if (is_type_string(type)) {
return in_value.kind == ExactValue_String;
@@ -1485,8 +1486,17 @@ void check_comparison(Checker *c, Operand *x, Operand *y, TokenKind op) {
gb_string_free(type_string);
}
} else {
gbString xt = type_to_string(x->type);
gbString yt = type_to_string(y->type);
gbString xt, yt;
if (x->mode == Addressing_Overload) {
xt = gb_string_make(heap_allocator(), "overloaded procedure");
} else {
xt = type_to_string(x->type);
}
if (y->mode == Addressing_Overload) {
yt = gb_string_make(heap_allocator(), "overloaded procedure");
} else {
yt = type_to_string(y->type);
}
err_str = gb_string_make(c->tmp_allocator,
gb_bprintf("mismatched types `%s` and `%s`", xt, yt));
gb_string_free(yt);