Skip to content

Commit

Permalink
warning removal - remaining 528 warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@thradams
thradams committed Oct 5, 2024
1 parent 9aab416 commit 0d187aa
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 142 deletions.
1 change: 1 addition & 0 deletions src/expressions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2974,6 +2974,7 @@ struct expression* _Owner _Opt unary_expression(struct parser_ctx* ctx)
switch (traits_token->type)
{
case TK_KEYWORD_IS_LVALUE:
assert(new_expression->right != NULL);
new_expression->constant_value = constant_value_make_signed_int(expression_is_lvalue(new_expression->right));
break;

Expand Down
52 changes: 27 additions & 25 deletions src/flow_object.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ struct flow_object* _Opt make_object_core(struct flow_visit_ctx* ctx,
}
else
{
struct flow_object* p_member_obj =
struct flow_object* _Opt p_member_obj =
make_object_core(ctx,
&p_member_declarator->declarator->type,
&l,
Expand Down Expand Up @@ -1121,7 +1121,7 @@ void print_object(struct type* p_type, struct flow_object* p_object, bool short_
char name[100] = { 0 };
object_get_name(p_type, p_object, name, sizeof name);

struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
print_object_core(0, &visitor, name, type_is_pointer(p_type), short_version, s_visit_number++);
Expand Down Expand Up @@ -1159,7 +1159,7 @@ void object_set_uninitialized_core(struct object_visitor* p_visitor)
{
if (p_visitor->member_index < p_visitor->p_object->members.size)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];
object_set_uninitialized_core(&visitor);
Expand Down Expand Up @@ -1220,7 +1220,7 @@ void object_set_uninitialized_core(struct object_visitor* p_visitor)

void object_set_uninitialized(struct type* p_type, struct flow_object* p_object)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
object_set_uninitialized_core(&visitor);
Expand Down Expand Up @@ -1362,7 +1362,7 @@ static void object_set_moved_core(struct object_visitor* p_visitor)
{
if (p_visitor->member_index < p_visitor->p_object->members.size)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];
object_set_moved_core(&visitor);
Expand Down Expand Up @@ -1410,7 +1410,7 @@ static void object_set_moved_core(struct object_visitor* p_visitor)

void object_set_moved(struct type* p_type, struct flow_object* p_object)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
object_set_moved_core(&visitor);
Expand Down Expand Up @@ -1451,7 +1451,7 @@ static void object_set_unknown_core(struct object_visitor* p_visitor, bool t_is_
{
if (p_visitor->member_index < p_visitor->p_object->members.size)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];

Expand Down Expand Up @@ -1514,7 +1514,7 @@ static void object_set_unknown_core(struct object_visitor* p_visitor, bool t_is_
{
struct type t2 = type_remove_pointer(p_visitor->p_type);
bool t2_is_nullable = type_is_nullable(&t2, nullable_enabled);
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &t2;
visitor.p_object = pointed;

Expand All @@ -1532,7 +1532,7 @@ static void object_set_unknown_core(struct object_visitor* p_visitor, bool t_is_

void object_set_unknown(struct type* p_type, bool t_is_nullable, struct flow_object* p_object, bool nullable_enabled)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
object_set_unknown_core(&visitor, t_is_nullable, s_visit_number++, nullable_enabled);
Expand Down Expand Up @@ -1692,7 +1692,7 @@ void object_set_zero_core(struct object_visitor* p_visitor)
{
if (p_visitor->member_index < p_visitor->p_object->members.size)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];
object_set_zero_core(&visitor);
Expand Down Expand Up @@ -1737,7 +1737,7 @@ void object_set_zero_core(struct object_visitor* p_visitor)

void object_set_zero(struct type* p_type, struct flow_object* p_object)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
object_set_zero_core(&visitor);
Expand Down Expand Up @@ -1772,7 +1772,7 @@ void object_set_end_of_lifetime_core(struct object_visitor* p_visitor)
{
if (p_visitor->member_index < p_visitor->p_object->members.size)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];
object_set_end_of_lifetime_core(&visitor);
Expand Down Expand Up @@ -1810,7 +1810,7 @@ void object_set_end_of_lifetime_core(struct object_visitor* p_visitor)

void object_set_end_of_lifetime(struct type* p_type, struct flow_object* p_object)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
object_set_end_of_lifetime_core(&visitor);
Expand Down Expand Up @@ -2001,7 +2001,7 @@ void object_get_name(const struct type* p_type,
else if (p_object->p_expression_origin)
{
int bytes_written = 0;
struct token* p = p_object->p_expression_origin->first_token;
struct token* _Opt p = p_object->p_expression_origin->first_token;
for (int i = 0; i < 10; i++)
{
const char* ps = p->lexeme;
Expand Down Expand Up @@ -2291,7 +2291,7 @@ void checked_read_object_core(struct flow_visit_ctx* ctx,

if (p_visitor->p_object->current.pointed)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &t2;
visitor.p_object = p_visitor->p_object->current.pointed;

Expand Down Expand Up @@ -2358,7 +2358,7 @@ void checked_read_object(struct flow_visit_ctx* ctx,

object_get_name(p_type, p_object, name, sizeof name);

struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_object = p_object;
visitor.p_type = p_type;

Expand Down Expand Up @@ -2448,7 +2448,7 @@ static void flow_end_of_block_visit_core(struct flow_visit_ctx* ctx,

const bool member_is_view = type_is_view(&p_member_declarator->declarator->type);

struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &p_member_declarator->declarator->type;
visitor.p_object = p_visitor->p_object->members.data[p_visitor->member_index];

Expand Down Expand Up @@ -2544,7 +2544,7 @@ static void flow_end_of_block_visit_core(struct flow_visit_ctx* ctx,

if (p_visitor->p_object->current.pointed)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = &t2;
visitor.p_object = p_visitor->p_object->current.pointed;
flow_end_of_block_visit_core(ctx, &visitor, b_type_is_view, position, buffer, visit_number);
Expand Down Expand Up @@ -2585,7 +2585,7 @@ static void flow_end_of_block_visit_core(struct flow_visit_ctx* ctx,

if (p_visitor->p_object->current.pointed)
{
struct token* name_token = p_visitor->p_object->p_declarator_origin->name_opt ?
struct token* _Opt name_token = p_visitor->p_object->p_declarator_origin->name_opt ?
p_visitor->p_object->p_declarator_origin->name_opt :
p_visitor->p_object->p_declarator_origin->first_token_opt;

Expand Down Expand Up @@ -2614,7 +2614,7 @@ void flow_end_of_block_visit(struct flow_visit_ctx* ctx,
const struct token* position_token,
const char* previous_names)
{
struct object_visitor visitor = { 0 };
_Opt struct object_visitor visitor = { 0 };
visitor.p_type = p_type;
visitor.p_object = p_object;
flow_end_of_block_visit_core(ctx,
Expand Down Expand Up @@ -3060,12 +3060,12 @@ static void flow_assignment_core(
if (p_visitor_a->member_index < p_visitor_a->p_object->members.size &&
p_visitor_b->member_index < p_visitor_b->p_object->members.size)
{
struct object_visitor visitor_a = { 0 };
_Opt struct object_visitor visitor_a = { 0 };
visitor_a.p_type = &p_a_member_declarator->declarator->type;
visitor_a.p_object = p_visitor_a->p_object->members.data[p_visitor_a->member_index];


struct object_visitor visitor_b = { 0 };
_Opt struct object_visitor visitor_b = { 0 };
visitor_b.p_type = &p_b_member_declarator->declarator->type;
visitor_b.p_object = p_visitor_b->p_object->members.data[p_visitor_b->member_index];

Expand Down Expand Up @@ -3161,6 +3161,8 @@ struct flow_object* _Opt expression_get_object(struct flow_visit_ctx* ctx, stru
if (p_expression->declarator->declaration_specifiers &&
p_expression->declarator->declaration_specifiers->storage_class_specifier_flags & STORAGE_SPECIFIER_EXTERN)
{
assert(p_expression->declarator->p_object != NULL);

//External objects are added to the arena on-demand
if (objects_find(&ctx->arena, p_expression->declarator->p_object) == NULL)
{
Expand Down Expand Up @@ -3220,7 +3222,7 @@ struct flow_object* _Opt expression_get_object(struct flow_visit_ctx* ctx, stru
{
assert(p_expression->left != NULL);

struct flow_object* p_obj = expression_get_object(ctx, p_expression->left, nullable_enabled);
struct flow_object* _Opt p_obj = expression_get_object(ctx, p_expression->left, nullable_enabled);
if (p_obj)
{
if (p_expression->member_index < p_obj->members.size)
Expand Down Expand Up @@ -3335,7 +3337,7 @@ struct flow_object* _Opt expression_get_object(struct flow_visit_ctx* ctx, stru
}
else if (p_expression->expression_type == POSTFIX_FUNCTION_CALL)
{
struct flow_object* p_object = make_object(ctx, &p_expression->type, NULL, p_expression);
struct flow_object* _Opt p_object = make_object(ctx, &p_expression->type, NULL, p_expression);
if (p_object == NULL) throw;

const bool is_nullable = type_is_nullable(&p_expression->type, nullable_enabled);
Expand Down Expand Up @@ -3387,7 +3389,7 @@ struct flow_object* _Opt expression_get_object(struct flow_visit_ctx* ctx, stru
{
assert(p_expression->left != NULL);

struct flow_object* p_obj = expression_get_object(ctx, p_expression->left, nullable_enabled);
struct flow_object* _Opt p_obj = expression_get_object(ctx, p_expression->left, nullable_enabled);

//
//
Expand Down
2 changes: 2 additions & 0 deletions src/flow_visit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,8 @@ static void flow_visit_init_declarator(struct flow_visit_ctx* ctx, struct init_d
.p_token_end = p_init_declarator->initializer->assignment_expression->last_token,
};

assert(p_init_declarator->p_declarator->p_object != NULL);

flow_check_assignment(ctx,
p_init_declarator->initializer->assignment_expression->first_token,
&a_marker,
Expand Down
13 changes: 10 additions & 3 deletions src/hashmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void* _Opt hashmap_remove(struct hash_map* map, const char* key, enum tag* p_typ
{
const unsigned int hash = string_hash(key);
struct map_entry** pp_entry = &map->table[hash % map->capacity];
struct map_entry* p_entry = *pp_entry;
struct map_entry* _Opt p_entry = *pp_entry;

for (; p_entry != NULL; p_entry = p_entry->next)
{
Expand Down Expand Up @@ -154,7 +154,7 @@ int hashmap_set(struct hash_map* map, const char* key, struct hash_item_set* ite
{
int result = 0;

void* p = NULL;
void* _Opt p = NULL;
enum tag type = TAG_TYPE_NUMBER;
if (item->p_declarator)
{
Expand Down Expand Up @@ -247,7 +247,14 @@ int hashmap_set(struct hash_map* map, const char* key, struct hash_item_set* ite


p_new_entry->type = type;
p_new_entry->key = strdup(key);

char * _Opt _Owner temp_key = strdup(key);
if (temp_key == NULL)
{
throw;
}

p_new_entry->key = temp_key;
p_new_entry->next = map->table[index];
map->table[index] = p_new_entry;
map->size++;
Expand Down
Loading

0 comments on commit 0d187aa

Please sign in to comment.