X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=37ee9291cb8ec052647bb430e5f236c0971f2bc9;hb=e0c14875ccc7df4e6a13052f1af19a69b5bc7e16;hp=21dd66f246f0c9d71845858320bb359d7313ae60;hpb=6a36ddcab611cb253bc589c61a2ef87a6d033867;p=babeltrace.git

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 21dd66f2..37ee9291 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -90,6 +90,7 @@ struct definition;
 /* 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;
@@ -123,6 +124,7 @@ 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,
@@ -285,15 +287,20 @@ struct definition_struct {
 	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;
@@ -382,7 +389,7 @@ struct definition_scope *
 			     GQuark field_name);
 void set_dynamic_definition_scope(struct definition *definition,
 				  struct definition_scope *scope,
-				  GQuark root_name);
+				  const char *root_name);
 void free_definition_scope(struct definition_scope *scope);
 
 void declaration_ref(struct declaration *declaration);
@@ -391,18 +398,14 @@ void declaration_unref(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);
 
@@ -468,13 +471,16 @@ struct_get_field_from_index(struct definition_struct *struct_definition,
  * 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(const char *name,
 		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.
@@ -508,4 +514,9 @@ struct declaration_sequence *
 		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 */