X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=2aa45b8a0cdfbe6f33f0cd290bf50064ecaeae88;hp=33311a683dae1056ff48928b4f4f0e3f83a788a4;hb=98df1c9fb24d5e7e10bf628692011e130e0d8339;hpb=2527e1494b783a60d8a874f28835700046f55dda

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 33311a68..2aa45b8a 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -91,7 +91,8 @@ struct declaration {
 	struct definition *
 		(*definition_new)(struct declaration *declaration,
 				  struct definition_scope *parent_scope,
-				  GQuark field_name, int index);
+				  GQuark field_name, int index,
+				  const char *root_name);
 	/*
 	 * definition_free called with definition ref is decremented to 0.
 	 */
@@ -166,6 +167,7 @@ struct definition_float {
 	struct definition_integer *sign;
 	struct definition_integer *mantissa;
 	struct definition_integer *exp;
+	struct definition_scope *scope;
 	/* Last values read */
 	long double value;
 };
@@ -218,6 +220,7 @@ struct definition_enum {
 	struct definition p;
 	struct definition_integer *integer;
 	struct declaration_enum *declaration;
+	struct definition_scope *scope;
 	/* Last GQuark values read. Keeping a reference on the GQuark array. */
 	GArray *value;
 };
@@ -298,7 +301,7 @@ struct definition_array {
 
 struct declaration_sequence {
 	struct declaration p;
-	struct declaration_integer *len_declaration;
+	GArray *length_name;		/* Array of GQuark */
 	struct declaration *elem;
 	struct declaration_scope *scope;
 };
@@ -307,7 +310,7 @@ struct definition_sequence {
 	struct definition p;
 	struct declaration_sequence *declaration;
 	struct definition_scope *scope;
-	struct definition_integer *len;
+	struct definition_integer *length;
 	GPtrArray *elems;		/* Array of pointers to struct definition */
 };
 
@@ -358,13 +361,11 @@ int register_field_definition(GQuark field_name,
 			      struct definition_scope *scope);
 struct definition_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);
+			     GQuark field_name, const char *root_name);
 void free_definition_scope(struct definition_scope *scope);
 
-GQuark new_definition_path(struct definition_scope *parent_scope, GQuark field_name);
+GQuark new_definition_path(struct definition_scope *parent_scope,
+			   GQuark field_name, const char *root_name);
 
 static inline
 int compare_definition_path(struct definition *definition, GQuark path)
@@ -497,7 +498,7 @@ int array_rw(struct stream_pos *pos, struct definition *definition);
  * to the sequence. No need to free them explicitly.
  */
 struct declaration_sequence *
-	sequence_declaration_new(struct declaration_integer *len_declaration, 
+	sequence_declaration_new(const char *length_name,
 		struct declaration *elem_declaration,
 		struct declaration_scope *parent_scope);
 uint64_t sequence_len(struct definition_sequence *sequence);