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

Fix error printing for basic directives

Browse Source
This commit is contained in:
Ginger Bill
2017-04-17 19:58:43 +01:00
parent 6d9fadf351
commit 0c22081e5f
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.c
+10 -2
View File
@@ -2366,9 +2366,9 @@ bool check_is_castable_to(Checker *c, Operand *operand, Type *y) {
return true;
}
if (is_type_string(src) && is_type_u8_slice(dst)) {
if (is_type_typed(src)) {
// if (is_type_typed(src)) {
return true;
}
// }
}
// proc <-> proc
@@ -2404,6 +2404,8 @@ void check_cast(Checker *c, Operand *x, Type *type) {
} else if (check_is_castable_to(c, x, type)) {
if (x->mode != Addressing_Constant) {
x->mode = Addressing_Value;
} else if (is_type_slice(type) && is_type_string(x->type)) {
x->mode = Addressing_Value;
}
can_convert = true;
}
@@ -4935,6 +4937,7 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t
check_ident(c, o, node, NULL, type_hint, false);
case_end;
case_ast_node(bl, BasicLit, node);
Type *t = t_invalid;
switch (bl->kind) {
@@ -5929,6 +5932,11 @@ gbString write_expr_to_string(gbString str, AstNode *node) {
str = string_append_token(str, *bl);
case_end;
case_ast_node(bd, BasicDirective, node);
str = gb_string_appendc(str, "#");
str = gb_string_append_length(str, bd->name.text, bd->name.len);
case_end;
case_ast_node(pl, ProcLit, node);
str = write_expr_to_string(str, pl->type);
case_end;