X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity.c;h=3a2db26d6598aa6938c675d8e7bc5f50b03492ab;hb=188cd4cc8ba69ffabfbf3b78db6a36697cff79f6;hp=d828c8af8a60df33a2b1f2a6504d6c819b45930d;hpb=9634f9c53e95b6bdc7883228c5ec5147f3de4f8e;p=cparser

diff --git a/entity.c b/entity.c
index d828c8a..3a2db26 100644
--- a/entity.c
+++ b/entity.c
@@ -43,7 +43,6 @@ const char *get_entity_kind_name(entity_kind_t kind)
 	case ENTITY_LOCAL_LABEL:     return "local label";
 	case ENTITY_TYPEDEF:         return "typedef";
 	case ENTITY_NAMESPACE:       return "namespace";
-	case ENTITY_INVALID:         break;
 	}
 
 	panic("Invalid entity kind encountered in get_entity_kind_name");
@@ -58,7 +57,7 @@ static size_t get_entity_struct_size(entity_kind_t kind)
 {
 	static const size_t sizes[] = {
 		[ENTITY_VARIABLE]        = sizeof(variable_t),
-		[ENTITY_PARAMETER]       = sizeof(parameter_t),
+		[ENTITY_PARAMETER]       = sizeof(variable_t),
 		[ENTITY_COMPOUND_MEMBER] = sizeof(compound_member_t),
 		[ENTITY_FUNCTION]        = sizeof(function_t),
 		[ENTITY_TYPEDEF]         = sizeof(typedef_t),
@@ -81,13 +80,14 @@ static size_t get_entity_struct_size(entity_kind_t kind)
  *
  * @param kind   the kind of the entity to allocate
  */
-entity_t *allocate_entity_zero(entity_kind_t const kind, entity_namespace_t const namespc, symbol_t *const symbol)
+entity_t *allocate_entity_zero(entity_kind_t const kind, entity_namespace_t const namespc, symbol_t *const symbol, source_position_t const *const pos)
 {
-	size_t    size       = get_entity_struct_size(kind);
-	entity_t *entity     = allocate_ast_zero(size);
-	entity->kind         = kind;
-	entity->base.namespc = namespc;
-	entity->base.symbol  = symbol;
+	size_t    const size   = get_entity_struct_size(kind);
+	entity_t *const entity = allocate_ast_zero(size);
+	entity->kind                 = kind;
+	entity->base.namespc         = namespc;
+	entity->base.symbol          = symbol;
+	entity->base.source_position = *pos;
 	return entity;
 }
 
@@ -105,3 +105,13 @@ elf_visibility_tag_t get_elf_visibility_from_string(const char *string)
 		return ELF_VISIBILITY_ERROR;
 	}
 }
+
+entity_t *skip_unnamed_bitfields(entity_t *entry)
+{
+	for (; entry != NULL; entry = entry->base.next) {
+		assert(entry->kind == ENTITY_COMPOUND_MEMBER);
+		if (!entry->compound_member.bitfield || entry->base.symbol != NULL)
+			break;
+	}
+	return entry;
+}