adapt to latest libfirm

[cparser] / entity.c

diff --git a/entity.c b/entity.c
index 5e255c1..df956d7 100644 (file)
--- a/entity.c
+++ b/entity.c
@@ -45,7 +45,7 @@ const char *get_entity_kind_name(entity_kind_t kind)
        case ENTITY_NAMESPACE:       return "namespace";
        }
 
-       panic("Invalid entity kind encountered in get_entity_kind_name");
+       panic("invalid entity kind");
 }
 
 /**
@@ -57,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),
@@ -80,14 +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, source_position_t const *const pos)
+entity_t *allocate_entity_zero(entity_kind_t const kind, entity_namespace_t const namespc, symbol_t *const symbol, position_t const *const pos)
 {
        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;
+       entity->kind           = kind;
+       entity->base.namespc   = namespc;
+       entity->base.symbol    = symbol;
+       entity->base.pos       = *pos;
        return entity;
 }