fdest->array_begin(dest, array_type);
for (i = 0; i < array_type->len; i++) {
- struct type *elem_type = array->current_element.type;
- elem_type->p.type->copy(dest, fdest, src, fsrc, elem_type);
+ struct declaration *elem = array->current_element.declaration;
+ elem->type->copy(dest, fdest, src, fsrc, elem);
}
fsrc->array_end(src, array_type);
fdest->array_end(dest, array_type);
struct type_array *array_type =
container_of(type, struct type_array, p);
+ free_type_scope(array_type->scope);
type_unref(array_type->elem);
g_free(array_type);
}
struct type_array *
- array_type_new(const char *name, size_t len, struct type *elem_type)
+ array_type_new(const char *name, size_t len, struct type *elem_type,
+ struct type_scope *parent_scope)
{
struct type_array *array_type;
struct type *type;
- int ret;
array_type = g_new(struct type_array, 1);
type = &array_type->p;
array_type->len = len;
type_ref(elem_type);
array_type->elem = elem_type;
+ array_type->scope = new_type_scope(parent_scope);
+ type->id = CTF_TYPE_ARRAY;
type->name = g_quark_from_string(name);
/* No need to align the array, the first element will align itself */
type->alignment = 1;
type->declaration_new = _array_declaration_new;
type->declaration_free = _array_declaration_free;
type->ref = 1;
-
- if (type->name) {
- ret = register_type(type);
- if (ret)
- goto error_register;
- }
return array_type;
-
-error_register:
- type_unref(array_type->elem);
- g_free(array_type);
- return NULL;
}
static
array = g_new(struct declaration_array, 1);
type_ref(&array_type->p);
- array->p.type = array_type;
+ array->p.type = type;
+ array->type = array_type;
array->p.ref = 1;
array->scope = new_declaration_scope(parent_scope);
array->current_element.declaration =
- array_type->elem.p->declaration_new(&array_type->elem.p,
- parent_scope);
+ array_type->elem->declaration_new(array_type->elem,
+ parent_scope);
return &array->p;
}
static
void _array_declaration_free(struct declaration *declaration)
{
- struct type_array *array =
- container_of(declaration, struct type_array, p);
+ struct declaration_array *array =
+ container_of(declaration, struct declaration_array, p);
struct declaration *elem_declaration =
array->current_element.declaration;
- elem_type->p.type->declaration_free(elem_type);
+ elem_declaration->type->declaration_free(elem_declaration);
free_declaration_scope(array->scope);
type_unref(array->p.type);
g_free(array);