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

Minor clean up of parse_field_prefixes

Browse Source
This commit is contained in:
gingerBill
2021-08-15 13:18:06 +01:00
parent 7bbc9a4634
commit 294c8426e6
2 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+48 -37
View File
@@ -3393,18 +3393,35 @@ Ast *parse_var_type(AstFile *f, bool allow_ellipsis, bool allow_typeid_token) {
} }
enum FieldPrefixKind { enum FieldPrefixKind : i32 {
FieldPrefix_Unknown = -1, FieldPrefix_Unknown = -1,
FieldPrefix_Invalid = 0, FieldPrefix_Invalid = 0,
FieldPrefix_using, FieldPrefix_using,
FieldPrefix_const, FieldPrefix_const,
FieldPrefix_no_alias, FieldPrefix_no_alias,
FieldPrefix_c_var_arg, FieldPrefix_c_vararg,
FieldPrefix_auto_cast, FieldPrefix_auto_cast,
FieldPrefix_any_int, FieldPrefix_any_int,
}; };
struct ParseFieldPrefixMapping {
String name;
TokenKind token_kind;
FieldPrefixKind prefix;
FieldFlag flag;
};
gb_global ParseFieldPrefixMapping parse_field_prefix_mappings[] = {
{str_lit("using"), Token_using, FieldPrefix_using, FieldFlag_using},
{str_lit("auto_cast"), Token_auto_cast, FieldPrefix_auto_cast, FieldFlag_auto_cast},
{str_lit("no_alias"), Token_Hash, FieldPrefix_no_alias, FieldFlag_no_alias},
{str_lit("c_vararg"), Token_Hash, FieldPrefix_c_vararg, FieldFlag_c_vararg},
{str_lit("const"), Token_Hash, FieldPrefix_const, FieldFlag_const},
{str_lit("any_int"), Token_Hash, FieldPrefix_any_int, FieldFlag_any_int},
};
FieldPrefixKind is_token_field_prefix(AstFile *f) { FieldPrefixKind is_token_field_prefix(AstFile *f) {
switch (f->curr_token.kind) { switch (f->curr_token.kind) {
case Token_EOF: case Token_EOF:
@@ -3420,14 +3437,13 @@ FieldPrefixKind is_token_field_prefix(AstFile *f) {
advance_token(f); advance_token(f);
switch (f->curr_token.kind) { switch (f->curr_token.kind) {
case Token_Ident: case Token_Ident:
if (f->curr_token.string == "no_alias") { for (i32 i = 0; i < gb_count_of(parse_field_prefix_mappings); i++) {
return FieldPrefix_no_alias; auto *mapping = parse_field_prefix_mappings + i;
} else if (f->curr_token.string == "c_vararg") { if (mapping->token_kind == Token_Hash) {
return FieldPrefix_c_var_arg; if (f->curr_token.string == mapping->name) {
} else if (f->curr_token.string == "const") { return mapping->prefix;
return FieldPrefix_const; }
} else if (f->curr_token.string == "any_int") { }
return FieldPrefix_any_int;
} }
break; break;
} }
@@ -3436,14 +3452,8 @@ FieldPrefixKind is_token_field_prefix(AstFile *f) {
return FieldPrefix_Invalid; return FieldPrefix_Invalid;
} }
u32 parse_field_prefixes(AstFile *f) { u32 parse_field_prefixes(AstFile *f) {
i32 using_count = 0; i32 counts[gb_count_of(parse_field_prefix_mappings)] = {};
i32 no_alias_count = 0;
i32 c_vararg_count = 0;
i32 auto_cast_count = 0;
i32 const_count = 0;
i32 any_int_count = 0;
for (;;) { for (;;) {
FieldPrefixKind kind = is_token_field_prefix(f); FieldPrefixKind kind = is_token_field_prefix(f);
@@ -3456,30 +3466,31 @@ u32 parse_field_prefixes(AstFile *f) {
continue; continue;
} }
switch (kind) { for (i32 i = 0; i < gb_count_of(parse_field_prefix_mappings); i++) {
case FieldPrefix_using: using_count += 1; advance_token(f); break; if (parse_field_prefix_mappings[i].prefix == kind) {
case FieldPrefix_no_alias: no_alias_count += 1; advance_token(f); break; counts[i] += 1;
case FieldPrefix_c_var_arg: c_vararg_count += 1; advance_token(f); break; advance_token(f);
case FieldPrefix_auto_cast: auto_cast_count += 1; advance_token(f); break; break;
case FieldPrefix_const: const_count += 1; advance_token(f); break; }
case FieldPrefix_any_int: any_int_count += 1; advance_token(f); break;
} }
} }
if (using_count > 1) syntax_error(f->curr_token, "Multiple 'using' in this field list");
if (no_alias_count > 1) syntax_error(f->curr_token, "Multiple '#no_alias' in this field list");
if (c_vararg_count > 1) syntax_error(f->curr_token, "Multiple '#c_vararg' in this field list");
if (auto_cast_count > 1) syntax_error(f->curr_token, "Multiple 'auto_cast' in this field list");
if (const_count > 1) syntax_error(f->curr_token, "Multiple '#const' in this field list");
if (any_int_count > 1) syntax_error(f->curr_token, "Multiple '#any_int' in this field list");
u32 field_flags = 0; u32 field_flags = 0;
if (using_count > 0) field_flags |= FieldFlag_using; for (i32 i = 0; i < gb_count_of(parse_field_prefix_mappings); i++) {
if (no_alias_count > 0) field_flags |= FieldFlag_no_alias; if (counts[i] > 0) {
if (c_vararg_count > 0) field_flags |= FieldFlag_c_vararg; field_flags |= parse_field_prefix_mappings[i].flag;
if (auto_cast_count > 0) field_flags |= FieldFlag_auto_cast;
if (const_count > 0) field_flags |= FieldFlag_const; if (counts[i] != 1) {
if (any_int_count > 0) field_flags |= FieldFlag_any_int; auto *mapping = parse_field_prefix_mappings + i;
String name = mapping->name;
char const *prefix = "";
if (mapping->token_kind == Token_Hash) {
prefix = "#";
}
syntax_error(f->curr_token, "Multiple '%s%.*s' in this field list", prefix, LIT(name));
}
}
}
return field_flags; return field_flags;
} }
src/parser.hpp
+1 -1
View File
@@ -267,7 +267,7 @@ enum ViralStateFlag : u16 {
}; };
enum FieldFlag { enum FieldFlag : u32 {
FieldFlag_NONE = 0, FieldFlag_NONE = 0,
FieldFlag_ellipsis = 1<<0, FieldFlag_ellipsis = 1<<0,
FieldFlag_using = 1<<1, FieldFlag_using = 1<<1,