/* type scope */
struct declaration_scope {
/* Hash table mapping type name GQuark to "struct declaration" */
+ /* Used for both typedef and typealias. */
GHashTable *typedef_declarations;
/* Hash table mapping struct name GQuark to "struct declaration_struct" */
GHashTable *struct_declarations;
/* Hash table mapping field name GQuark to "struct definition" */
GHashTable *definitions;
struct definition_scope *parent_scope;
+ /*
+ * Complete "path" leading to this definition scope.
+ * Includes dynamic scope name '.' field name '.' field name '.' ....
+ * Array of GQuark elements (which are each separated by dots).
+ * The dynamic scope name can contain dots, and is encoded into
+ * a single GQuark. Thus, scope_path[0] returns the GQuark
+ * identifying the dynamic scope.
+ */
+ GArray *scope_path; /* array of GQuark */
};
enum ctf_type_id {
CTF_TYPE_ENUM,
CTF_TYPE_STRING,
CTF_TYPE_STRUCT,
+ CTF_TYPE_UNTAGGED_VARIANT,
CTF_TYPE_VARIANT,
CTF_TYPE_ARRAY,
CTF_TYPE_SEQUENCE,
struct declaration {
enum ctf_type_id id;
- GQuark name; /* type name */
size_t alignment; /* type alignment, in bits */
int ref; /* number of references to the type */
/*
void (*declaration_free)(struct declaration *declaration);
struct definition *
(*definition_new)(struct declaration *declaration,
- struct definition_scope *parent_scope);
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index);
/*
* definition_free called with definition ref is decremented to 0.
*/
struct definition {
struct declaration *declaration;
+ int index; /* Position of the definition in its container */
int ref; /* number of references to the definition */
};
GArray *value;
};
+enum ctf_string_encoding {
+ CTF_STRING_UTF8 = 0,
+ CTF_STRING_ASCII,
+ CTF_STRING_UNKNOWN,
+};
+
struct declaration_string {
struct declaration p;
+ enum ctf_string_encoding encoding;
};
struct definition_string {
GArray *fields; /* Array of struct field */
};
-struct declaration_variant {
+struct declaration_untagged_variant {
struct declaration p;
GHashTable *fields_by_tag; /* Tuples (field tag, field index) */
struct declaration_scope *scope;
GArray *fields; /* Array of declaration_field */
- GQuark tag_name; /* TODO */
- /* Tag name must be nonzero and must exist when defining the variant */
};
+struct declaration_variant {
+ struct declaration p;
+ struct declaration_untagged_variant *untagged_variant;
+ GArray *tag_name; /* Array of GQuark */
+};
+
+/* A variant needs to be tagged to be defined. */
struct definition_variant {
struct definition p;
struct declaration_variant *declaration;
struct declaration *declaration,
struct declaration_scope *scope);
struct declaration *lookup_declaration(GQuark declaration_name,
- struct declaration_scope *scope);
+ struct declaration_scope *scope);
/*
* Type scopes also contain a separate registry for struct, variant and
lookup_struct_declaration(GQuark struct_name,
struct declaration_scope *scope);
int register_variant_declaration(GQuark variant_name,
- struct declaration_variant *variant_declaration,
+ struct declaration_untagged_variant *untagged_variant_declaration,
struct declaration_scope *scope);
-struct declaration_variant *lookup_variant_declaration(GQuark variant_name,
+struct declaration_untagged_variant *lookup_variant_declaration(GQuark variant_name,
struct declaration_scope *scope);
int register_enum_declaration(GQuark enum_name,
struct declaration_enum *enum_declaration,
* definition scopes.
*/
struct definition *
- lookup_field_definition(GQuark field_name,
- struct definition_scope *scope);
+ lookup_definition(GArray *cur_path, /* array of GQuark */
+ GArray *lookup_path, /* array of GQuark */
+ struct definition_scope *scope);
int register_field_definition(GQuark field_name,
struct definition *definition,
struct definition_scope *scope);
struct definition_scope *
- new_definition_scope(struct definition_scope *parent_scope);
+ new_definition_scope(struct definition_scope *parent_scope,
+ GQuark field_name);
+void set_dynamic_definition_scope(struct definition *definition,
+ struct definition_scope *scope,
+ const char *root_name);
void free_definition_scope(struct definition_scope *scope);
void declaration_ref(struct declaration *declaration);
void definition_ref(struct definition *definition);
void definition_unref(struct definition *definition);
-/* Nameless declarations can be created by passing a NULL name */
-
-struct declaration_integer *integer_declaration_new(const char *name,
- size_t len, int byte_order,
+struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
int signedness, size_t alignment);
/*
* mantissa_len is the length of the number of bytes represented by the mantissa
* (e.g. result of DBL_MANT_DIG). It includes the leading 1.
*/
-struct declaration_float *float_declaration_new(const char *name,
- size_t mantissa_len,
+struct declaration_float *float_declaration_new(size_t mantissa_len,
size_t exp_len, int byte_order,
size_t alignment);
size_t enum_get_nr_enumerators(struct declaration_enum *enum_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_string *
+ string_declaration_new(enum ctf_string_encoding encoding);
struct declaration_struct *
- struct_declaration_new(const char *name,
- struct declaration_scope *parent_scope);
+ struct_declaration_new(struct declaration_scope *parent_scope);
void struct_declaration_add_field(struct declaration_struct *struct_declaration,
const char *field_name,
struct declaration *field_declaration);
* from numeric values to a single tag. Overlapping tag value ranges are
* therefore forbidden.
*/
-struct declaration_variant *variant_declaration_new(const char *name,
+struct declaration_untagged_variant *untagged_variant_declaration_new(
struct declaration_scope *parent_scope);
-void variant_declaration_add_field(struct declaration_variant *variant_declaration,
- const char *tag_name,
- struct declaration *tag_declaration);
+struct declaration_variant *variant_declaration_new(struct declaration_untagged_variant *untagged_variant,
+ const char *tag);
+
+void untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration,
+ const char *field_name,
+ struct declaration *field_declaration);
struct declaration_field *
- variant_declaration_get_field_from_tag(struct declaration_variant *variant_declaration,
+ untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration,
GQuark tag);
/*
* Returns 0 on success, -EPERM on error.
* array.
*/
struct declaration_array *
- array_declaration_new(const char *name,
- size_t len, struct declaration *elem_declaration,
+ array_declaration_new(size_t len, struct declaration *elem_declaration,
struct declaration_scope *parent_scope);
/*
* to the sequence. No need to free them explicitly.
*/
struct declaration_sequence *
- sequence_declaration_new(const char *name,
- struct declaration_integer *len_declaration,
+ sequence_declaration_new(struct declaration_integer *len_declaration,
struct declaration *elem_declaration,
struct declaration_scope *parent_scope);
+/*
+ * in: path (dot separated), out: q (GArray of GQuark)
+ */
+void append_scope_path(const char *path, GArray *q);
+
#endif /* _BABELTRACE_declarationS_H */
projects / babeltrace.git / blobdiff