ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow constant string value for the field argument of offset_of

Browse Source
This commit is contained in:
gingerBill
2021-10-03 12:24:54 +01:00
parent 2bdae52fed
commit 51b5a973e2
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_builtin.cpp
+19 -9
View File
@@ -670,11 +670,24 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
} }
GB_ASSERT(type != nullptr); GB_ASSERT(type != nullptr);
if (field_arg == nullptr || String field_name = {};
field_arg->kind != Ast_Ident) {
error(field_arg, "Expected an identifier for field argument"); if (field_arg == nullptr) {
error(call, "Expected an identifier or constant string for field argument");
return false; return false;
} }
if (field_arg->kind == Ast_Ident) {
field_name = field_arg->Ident.token.string;
} else if (field_arg->tav.mode == Addressing_Constant && field_arg->tav.value.kind == ExactValue_String) {
field_name = field_arg->tav.value.value_string;
}
if (field_name.len == 0) {
error(field_arg, "Expected an identifier or constant (non-empty) string for field argument");
return false;
}
if (is_type_array(type)) { if (is_type_array(type)) {
gbString t = type_to_string(type); gbString t = type_to_string(type);
error(field_arg, "Invalid a struct type for 'offset_of', got '%s'", t); error(field_arg, "Invalid a struct type for 'offset_of', got '%s'", t);
@@ -682,26 +695,23 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
return false; return false;
} }
ast_node(arg, Ident, field_arg);
String field_name = arg->token.string;
Selection sel = lookup_field(type, field_name, false); Selection sel = lookup_field(type, field_name, false);
if (sel.entity == nullptr) { if (sel.entity == nullptr) {
gbString type_str = type_to_string(type); gbString type_str = type_to_string(type);
error(ce->args[0], error(ce->args[0],
"'%s' has no field named '%.*s'", type_str, LIT(arg->token.string)); "'%s' has no field named '%.*s'", type_str, LIT(field_name));
gb_string_free(type_str); gb_string_free(type_str);
Type *bt = base_type(type); Type *bt = base_type(type);
if (bt->kind == Type_Struct) { if (bt->kind == Type_Struct) {
check_did_you_mean_type(arg->token.string, bt->Struct.fields); check_did_you_mean_type(field_name, bt->Struct.fields);
} }
return false; return false;
} }
if (sel.indirect) { if (sel.indirect) {
gbString type_str = type_to_string(type); gbString type_str = type_to_string(type);
error(ce->args[0], error(ce->args[0],
"Field '%.*s' is embedded via a pointer in '%s'", LIT(arg->token.string), type_str); "Field '%.*s' is embedded via a pointer in '%s'", LIT(field_name), type_str);
gb_string_free(type_str); gb_string_free(type_str);
return false; return false;
} }