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

Remove dead keywords; Fix min and max for enum types

Browse Source
This commit is contained in:
gingerBill
2019-03-31 22:35:05 +01:00
parent 2614830c69
commit ecd2eacd75
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/check_type.cpp
View File

@@ -759,6 +759,8 @@ void check_enum_type(CheckerContext *ctx, Type *enum_type, Type *named_type, Ast
ExactValue iota = exact_value_i64(-1);
ExactValue min_value = exact_value_i64(0);
ExactValue max_value = exact_value_i64(0);
bool min_value_set = false;
bool max_value_set = false;
scope_reserve(ctx->scope, et->fields.count);
@@ -810,11 +812,21 @@ void check_enum_type(CheckerContext *ctx, Type *enum_type, Type *named_type, Ast
continue;
}
if (compare_exact_values(Token_Gt, min_value, iota)) {
if (min_value_set) {
if (compare_exact_values(Token_Gt, min_value, iota)) {
min_value = iota;
}
} else {
min_value = iota;
min_value_set = true;
}
if (compare_exact_values(Token_Lt, max_value, iota)) {
if (max_value_set) {
if (compare_exact_values(Token_Lt, max_value, iota)) {
max_value = iota;
}
} else {
max_value = iota;
max_value_set = true;
}
Entity *e = alloc_entity_constant(ctx->scope, ident->Ident.token, constant_type, iota);

1
src/parser.cpp
View File

@@ -1223,7 +1223,6 @@ void fix_advance_to_next_stmt(AstFile *f) {
case Token_return:
case Token_switch:
case Token_defer:
case Token_asm:
case Token_using:
case Token_break:

3
src/tokenizer.cpp
View File

@@ -122,9 +122,6 @@ TOKEN_KIND(Token__KeywordBegin, ""), \
TOKEN_KIND(Token_type_of, "type_of"), \
TOKEN_KIND(Token_macro, "macro"), \
TOKEN_KIND(Token_const, "const"), \
TOKEN_KIND(Token_asm, "asm"), \
TOKEN_KIND(Token_yield, "yield"), \
TOKEN_KIND(Token_await, "await"), \
TOKEN_KIND(Token__KeywordEnd, ""), \
TOKEN_KIND(Token_Count, "")