Skip to content

Commit

Permalink
Some minor cleanup and updates. Should improve build issue with Gentoo …
Browse files Browse the repository at this point in the history 
…#1907.
  • Loading branch information
@lerno
lerno committed Jan 30, 2025
1 parent 50385be commit 7782602
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 46 deletions.
52 changes: 22 additions & 30 deletions src/compiler/sema_const.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "sema_internal.h"

static bool sema_append_const_array_one(SemaContext *context, Expr *expr, Expr *list, Expr *element);
static bool sema_append_concat_const_bytes(SemaContext *context, Expr *expr, Expr *list, Expr *element, bool is_append);
static bool sema_append_concat_const_bytes(SemaContext *context, Expr *expr, Expr *list, Expr *element);

ArrayIndex sema_len_from_const(Expr *expr)
{
Expand Down Expand Up @@ -68,7 +68,7 @@ static inline bool sema_expr_const_append(SemaContext *context, Expr *append_exp
case CONST_POINTER:
case CONST_BYTES:
case CONST_STRING:
return sema_append_concat_const_bytes(context, append_expr, list, element, true);
return sema_append_concat_const_bytes(context, append_expr, list, element);
default:
RETURN_SEMA_ERROR(list, "Expected some kind of list or vector here.");
}
Expand All @@ -80,7 +80,7 @@ static inline bool sema_expr_const_append(SemaContext *context, Expr *append_exp
return true;
}

static bool sema_concat_const_bytes(SemaContext *context, Expr *expr, Type *type, bool is_bytes, const char *a, const char *b, ArraySize alen, ArraySize blen)
static void expr_concat_const_bytes(Expr *expr, Type *type, bool is_bytes, const char *a, const char *b, ArraySize alen, ArraySize blen)
{
Type *indexed = type_get_indexed_type(type);
char *data = malloc_arena(alen + blen + 1);
Expand All @@ -98,10 +98,9 @@ static bool sema_concat_const_bytes(SemaContext *context, Expr *expr, Type *type
};
expr->resolve_status = RESOLVE_DONE;
expr->type = is_bytes ? type_get_array(indexed, alen + blen) : type;
return true;
}

static bool sema_concat_character(SemaContext *context, Expr *expr, Type *type, const char *a, ArraySize alen, uint64_t c)
static void expr_concat_character(Expr *expr, Type *type, const char *a, ArraySize alen, uint64_t c)
{
char append_array[4];
int len;
Expand Down Expand Up @@ -131,7 +130,7 @@ static bool sema_concat_character(SemaContext *context, Expr *expr, Type *type,
append_array[3] = (char) (0x80 | (c & 0x3F));
len = 4;
}
return sema_concat_const_bytes(context, expr, type, false, a, append_array, alen, len);
expr_concat_const_bytes(expr, type, false, a, append_array, alen, len);
}

/**
Expand All @@ -157,14 +156,16 @@ static bool sema_concat_bytes_and_other(SemaContext *context, Expr *expr, Expr *
// 2. Bytes + (i)char => Bytes
if (!cast_implicit(context, right, type_char, false)) return false;
char c = (char) int_to_i64(right->const_expr.ixx);
return sema_concat_const_bytes(context, expr, left->type, true, left_bytes, &c, len, 1);
expr_concat_const_bytes(expr, left->type, true, left_bytes, &c, len, 1);
return true;
}
// 1. String + character => String
if (int_is_neg(right->const_expr.ixx) || int_icomp(right->const_expr.ixx, 0x10FFFF, BINARYOP_GT))
{
RETURN_SEMA_ERROR(right, "Cannot concatenate a string with an non-unicode value.");
}
return sema_concat_character(context, expr, left->type, left_bytes, len, right->const_expr.ixx.i.low);
expr_concat_character(expr, left->type, left_bytes, len, right->const_expr.ixx.i.low);
return true;
case CONST_FLOAT:
case CONST_BOOL:
case CONST_ENUM:
Expand All @@ -177,9 +178,9 @@ static bool sema_concat_bytes_and_other(SemaContext *context, Expr *expr, Expr *
type_quoted_error_string(left->type), type_to_error_string(right->type));
case CONST_BYTES:
case CONST_STRING:
return sema_concat_const_bytes(context, expr, left->type, is_bytes, left_bytes,
right->const_expr.bytes.ptr,
len, right->const_expr.bytes.len);
expr_concat_const_bytes(expr, left->type, is_bytes, left_bytes, right->const_expr.bytes.ptr,
len, right->const_expr.bytes.len);
return true;
case CONST_UNTYPED_LIST:
if (!cast_implicit(context, right, type_get_inferred_array(indexed), false)) return false;
goto RETRY;
Expand All @@ -191,36 +192,27 @@ static bool sema_concat_bytes_and_other(SemaContext *context, Expr *expr, Expr *
}
UNREACHABLE
}
static bool sema_append_concat_const_bytes(SemaContext *context, Expr *expr, Expr *list, Expr *element, bool is_append)
static bool sema_append_concat_const_bytes(SemaContext *context, Expr *expr, Expr *list, Expr *element)
{
Type *indexed = type_get_indexed_type(list->type);
ASSERT(indexed && "This should always work");
if (is_append && !cast_implicit(context, element, indexed, false)) return false;
if (!cast_implicit(context, element, indexed, false)) return false;
size_t str_len = list->const_expr.bytes.len;
size_t element_len = is_append ? 1 : element->const_expr.bytes.len;
bool is_bytes = list->const_expr.const_kind == CONST_BYTES;
char *data = malloc_arena(str_len + element_len + 1);
char *data = malloc_arena(str_len + 2);
char *current = data;
if (str_len) memcpy(current, list->const_expr.bytes.ptr, str_len);
current += str_len;
if (is_append)
{
current[0] = (unsigned char)element->const_expr.ixx.i.low;
}
else
{
if (element_len) memcpy(current, element->const_expr.bytes.ptr, element_len);
}
current += element_len;
current[0] = '\0';
current[0] = (unsigned char)element->const_expr.ixx.i.low;
current[1] = '\0';
expr->expr_kind = EXPR_CONST;
expr->const_expr = (ExprConst) {
.const_kind = list->const_expr.const_kind,
.bytes.ptr = data,
.bytes.len = str_len + element_len
.bytes.len = str_len + 1
};
expr->resolve_status = RESOLVE_DONE;
expr->type = is_bytes ? type_get_array(indexed, str_len + element_len) : list->type;
expr->type = is_bytes ? type_get_array(indexed, str_len + 1) : list->type;
return true;
}

Expand Down Expand Up @@ -466,17 +458,17 @@ bool sema_expr_analyse_ct_concat(SemaContext *context, Expr *concat_expr, Expr *
switch (inner_element->kind)
{
case CONST_INIT_ZERO:
continue;
break;
case CONST_INIT_STRUCT:
case CONST_INIT_UNION:
case CONST_INIT_ARRAY:
case CONST_INIT_ARRAY_FULL:
case CONST_INIT_ARRAY_VALUE:
expr_rewrite_const_initializer(inner_expr, index_type, inner_element);
continue;
break;
case CONST_INIT_VALUE:
*inner_expr = *inner_element->init_value;
continue;
break;
}
}
continue;
Expand Down
23 changes: 7 additions & 16 deletions src/compiler/sema_stmts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static bool context_labels_exist_in_scope(SemaContext *context);
static inline bool sema_analyse_then_overwrite(SemaContext *context, Ast *statement, AstId replacement);
static inline bool sema_analyse_catch_unwrap(SemaContext *context, Expr *expr);
static inline bool sema_analyse_compound_statement_no_scope(SemaContext *context, Ast *compound_statement);
static inline bool sema_check_type_case(SemaContext *context, Type *switch_type, Ast *case_stmt, Ast **cases, unsigned index);
static inline bool sema_check_type_case(SemaContext *context, Ast *case_stmt, Ast **cases, unsigned index);
static inline bool sema_check_value_case(SemaContext *context, Type *switch_type, Ast *case_stmt, Ast **cases,
unsigned index, bool *if_chained, bool *max_ranged, uint64_t *actual_cases_ref,
Int *low, Int *high);
Expand Down Expand Up @@ -340,7 +340,7 @@ static void sema_unwrappable_from_catch_in_else(SemaContext *c, Expr *cond)
sema_unwrap_var(c, decl);
break;
default:
continue;
break;
}
}

Expand All @@ -360,7 +360,6 @@ static inline bool assert_create_from_contract(SemaContext *context, Ast *direct
FOREACH(Expr *, expr, declexpr->expression_list)
{
if (expr->expr_kind == EXPR_DECL) RETURN_SEMA_ERROR(expr, "Only expressions are allowed in contracts.");
CondResult result = COND_MISSING;
if (!sema_analyse_expr_rhs(context, type_bool, expr, false, NULL, false)) return false;

const char *comment = directive->contract_stmt.contract.comment;
Expand All @@ -384,7 +383,6 @@ static inline bool assert_create_from_contract(SemaContext *context, Ast *direct
// Check whether a defer chain contains a try or a catch.
static inline bool sema_defer_has_try_or_catch(AstId defer_top, AstId defer_bottom)
{
AstId first = 0;
while (defer_bottom != defer_top)
{
Ast *defer = astptr(defer_top);
Expand Down Expand Up @@ -1447,8 +1445,6 @@ static inline bool sema_analyse_foreach_stmt(SemaContext *context, Ast *statemen
Expr **expressions = NULL;
bool is_reverse = statement->foreach_stmt.is_reverse;
bool value_by_ref = statement->foreach_stmt.value_by_ref;
bool success = true;
bool iterator_based = false;
bool iterator_was_initializer = enumerator->expr_kind == EXPR_INITIALIZER_LIST;
// Check the type if needed
TypeInfo *variable_type_info = vartype(var);
Expand Down Expand Up @@ -1491,10 +1487,7 @@ static inline bool sema_analyse_foreach_stmt(SemaContext *context, Ast *statemen
{
RETURN_SEMA_ERROR(enumerator, "It is not possible to enumerate a compile time 'untyped' list at runtime, but you can use the compile time `$foreach` with the list.");
}
else
{
RETURN_SEMA_ERROR(var, "Add an explicit type to the variable if you want to iterate over an initializer list.");
}
RETURN_SEMA_ERROR(var, "Add an explicit type to the variable if you want to iterate over an initializer list.");
}
if (canonical->type_kind == TYPE_POINTER)
{
Expand Down Expand Up @@ -2240,7 +2233,7 @@ static inline bool sema_analyse_compound_statement_no_scope(SemaContext *context
return all_ok;
}

static inline bool sema_check_type_case(SemaContext *context, Type *switch_type, Ast *case_stmt, Ast **cases, unsigned index)
static inline bool sema_check_type_case(SemaContext *context, Ast *case_stmt, Ast **cases, unsigned index)
{
Expr *expr = exprptr(case_stmt->case_stmt.expr);
if (!sema_analyse_expr_rhs(context, type_typeid, expr, false, NULL, false)) return false;
Expand Down Expand Up @@ -2439,7 +2432,7 @@ static bool sema_analyse_switch_body(SemaContext *context, Ast *statement, Sourc
case AST_CASE_STMT:
if (type_switch)
{
if (!sema_check_type_case(context, switch_type, stmt, cases, i))
if (!sema_check_type_case(context, stmt, cases, i))
{
success = false;
break;
Expand Down Expand Up @@ -2601,6 +2594,7 @@ static inline bool sema_analyse_ct_switch_stmt(SemaContext *context, Ast *statem
case AST_CASE_STMT:
{
Expr *expr = exprptr(stmt->case_stmt.expr);
assert(expr);
Expr *to_expr = exprptrzero(stmt->case_stmt.to_expr);
if (to_expr && !type_is_integer(type))
{
Expand Down Expand Up @@ -2724,7 +2718,7 @@ static inline bool sema_analyse_ct_foreach_stmt(SemaContext *context, Ast *state
Expr *collection = exprptr(statement->ct_foreach_stmt.expr);
if (!sema_analyse_ct_expr(context, collection)) return false;
if (!expr_is_const(collection)) goto FAILED_NO_LIST;
unsigned count;
unsigned count = (unsigned)-1; // To fix invalid "maybe uninitialized" on GCC
ConstInitializer *initializer = NULL;
Expr **expressions = NULL;
Type *const_list_type = NULL;
Expand Down Expand Up @@ -2914,7 +2908,6 @@ bool sema_analyse_ct_assert_stmt(SemaContext *context, Ast *statement)
{
Expr *expr = exprptrzero(statement->assert_stmt.expr);
ExprId message = statement->assert_stmt.message;
const char *msg = NULL;
Expr *message_expr = message ? exprptr(message) : NULL;
if (message_expr)
{
Expand Down Expand Up @@ -2998,7 +2991,6 @@ bool sema_analyse_ct_echo_stmt(SemaContext *context, Ast *statement)
static inline bool sema_analyse_ct_for_stmt(SemaContext *context, Ast *statement)
{
unsigned for_context = sema_context_push_ct_stack(context);
bool success = false;
ExprId init;
if ((init = statement->for_stmt.init))
{
Expand Down Expand Up @@ -3194,7 +3186,6 @@ static bool sema_analyse_ensure(SemaContext *context, Ast *directive)

static bool sema_analyse_optional_returns(SemaContext *context, Ast *directive)
{
Ast **returns = NULL;
FOREACH(Ast *, ret, directive->contract_stmt.faults)
{
if (ret->contract_fault.resolved) continue;
Expand Down

0 comments on commit 7782602

Please sign in to comment.