From 9ba2926e7e40e4f3ab7865f13fd57a16714433be Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 28 Dec 2019 16:31:15 +0000 Subject: [PATCH] Fix enumerated array contiguous error --- src/check_expr.cpp | 9 +++------ src/check_type.cpp | 22 ++++++++++------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 268adc70f..a8f6d613b 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -8125,12 +8125,9 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type } } - - if (t->kind == Type_EnumeratedArray) { - if (cl->elems.count > 0 && cl->elems[0]->kind != Ast_FieldValue) { - if (0 < max && max < t->EnumeratedArray.count) { - error(node, "Expected %lld values for this enumerated array literal, got %lld", cast(long long)t->EnumeratedArray.count, cast(long long)max); - } + if (cl->elems.count > 0 && cl->elems[0]->kind != Ast_FieldValue) { + if (0 < max && max < t->EnumeratedArray.count) { + error(node, "Expected %lld values for this enumerated array literal, got %lld", cast(long long)t->EnumeratedArray.count, cast(long long)max); } } diff --git a/src/check_type.cpp b/src/check_type.cpp index 098c4b76a..6521bd248 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -3252,18 +3252,16 @@ bool check_type_internal(CheckerContext *ctx, Ast *e, Type **type, Type *named_t } } - if (t->EnumeratedArray.count != bt->Enum.fields.count) { - if (!is_partial) { - error(e, "Non-contiguous enumeration used as an index in an enumerated array"); - long long ea_count = cast(long long)t->EnumeratedArray.count; - long long enum_count = cast(long long)t->Enum.fields.count; - error_line("\tenumerated array length: %lld\n", ea_count); - error_line("\tenum field count: %lld\n", enum_count); - error_line("\tSuggestion: prepend #partial to the enumerated array to allow for non-named elements\n"); - if (2*enum_count < ea_count) { - error_line("\tWarning: the number of named elements is much smaller than the length of the array, are you sure this is what you want?\n"); - error_line("\t this warning will be removed if #partial is applied\n"); - } + if (!is_partial && t->EnumeratedArray.count > bt->Enum.fields.count) { + error(e, "Non-contiguous enumeration used as an index in an enumerated array"); + long long ea_count = cast(long long)t->EnumeratedArray.count; + long long enum_count = cast(long long)t->Enum.fields.count; + error_line("\tenumerated array length: %lld\n", ea_count); + error_line("\tenum field count: %lld\n", enum_count); + error_line("\tSuggestion: prepend #partial to the enumerated array to allow for non-named elements\n"); + if (2*enum_count < ea_count) { + error_line("\tWarning: the number of named elements is much smaller than the length of the array, are you sure this is what you want?\n"); + error_line("\t this warning will be removed if #partial is applied\n"); } }