static
struct definition *_enum_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope);
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index);
static
void _enum_definition_free(struct definition *definition);
return g_hash_table_size(enum_declaration->table.quark_to_range_set);
}
-void enum_copy(struct stream_pos *dest, const struct format *fdest,
- struct stream_pos *src, const struct format *fsrc,
- struct definition *definition)
-{
- struct definition_enum *_enum =
- container_of(definition, struct definition_enum, p);
- struct declaration_enum *enum_declaration= _enum->declaration;
- GArray *array;
- GQuark v;
-
- array = fsrc->enum_read(src, enum_declaration);
- assert(array);
- /* unref previous array */
- if (_enum->value)
- g_array_unref(_enum->value);
- _enum->value = array;
- /*
- * Arbitrarily choose the first one.
- * TODO: use direct underlying declaration read/write intead. Not doing it for
- * now to test enum read and write code.
- */
- v = g_array_index(array, GQuark, 0);
- return fdest->enum_write(dest, enum_declaration, v);
-}
-
static
void _enum_declaration_free(struct declaration *declaration)
{
}
struct declaration_enum *
- _enum_declaration_new(const char *name, struct declaration_integer *integer_declaration)
+ enum_declaration_new(struct declaration_integer *integer_declaration)
{
struct declaration_enum *enum_declaration;
enum_val_free,
enum_range_set_free);
CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
- enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_int_hash,
- g_int_equal,
+ enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal,
NULL, enum_range_set_free);
declaration_ref(&integer_declaration->p);
enum_declaration->integer_declaration = integer_declaration;
enum_declaration->p.id = CTF_TYPE_ENUM;
- enum_declaration->p.name = g_quark_from_string(name);
enum_declaration->p.alignment = 1;
- enum_declaration->p.copy = enum_copy;
enum_declaration->p.declaration_free = _enum_declaration_free;
enum_declaration->p.definition_new = _enum_definition_new;
enum_declaration->p.definition_free = _enum_definition_free;
static
struct definition *
_enum_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope)
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index)
{
struct declaration_enum *enum_declaration =
container_of(declaration, struct declaration_enum, p);
_enum->p.declaration = declaration;
_enum->declaration = enum_declaration;
_enum->p.ref = 1;
+ _enum->p.index = index;
+ _enum->p.name = field_name;
+ _enum->p.path = new_definition_path(parent_scope, field_name);
_enum->value = NULL;
definition_integer_parent =
enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p,
- parent_scope);
+ parent_scope,
+ g_quark_from_static_string("container"), 0);
_enum->integer = container_of(definition_integer_parent,
struct definition_integer, p);
return &_enum->p;