X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=5ae831ce2a745e3beaeff5973f59ac051ffd7ec7;hp=2306d94f1b17cecd48df03b89343efe507fe8256;hb=98df1c9fb24d5e7e10bf628692011e130e0d8339;hpb=2527e1494b783a60d8a874f28835700046f55dda

diff --git a/types/float.c b/types/float.c
index 2306d94f..5ae831ce 100644
--- a/types/float.c
+++ b/types/float.c
@@ -23,7 +23,8 @@
 static
 struct definition *_float_definition_new(struct declaration *declaration,
 				   struct definition_scope *parent_scope,
-				   GQuark field_name, int index);
+				   GQuark field_name, int index,
+				   const char *root_name);
 static
 void _float_definition_free(struct definition *definition);
 
@@ -69,43 +70,53 @@ static
 struct definition *
 	_float_definition_new(struct declaration *declaration,
 			      struct definition_scope *parent_scope,
-			      GQuark field_name, int index)
+			      GQuark field_name, int index,
+			      const char *root_name)
 {
 	struct declaration_float *float_declaration =
 		container_of(declaration, struct declaration_float, p);
 	struct definition_float *_float;
 	struct definition *tmp;
+	int ret;
 
 	_float = g_new(struct definition_float, 1);
 	declaration_ref(&float_declaration->p);
 	_float->p.declaration = declaration;
 	_float->declaration = float_declaration;
+	_float->scope = new_definition_scope(parent_scope, field_name, root_name);
+	_float->p.path = new_definition_path(parent_scope, field_name, root_name);
 	if (float_declaration->byte_order == LITTLE_ENDIAN) {
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			parent_scope, g_quark_from_static_string("mantissa"), 0);
+			_float->scope, g_quark_from_static_string("mantissa"), 0, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			parent_scope, g_quark_from_static_string("exp"), 1);
+			_float->scope, g_quark_from_static_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			parent_scope, g_quark_from_static_string("sign"), 2);
+			_float->scope, g_quark_from_static_string("sign"), 2, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 	} else {
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			parent_scope, g_quark_from_static_string("sign"), 0);
+			_float->scope, g_quark_from_static_string("sign"), 0, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			parent_scope, g_quark_from_static_string("exp"), 1);
+			_float->scope, g_quark_from_static_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			parent_scope, g_quark_from_static_string("mantissa"), 2);
+			_float->scope, g_quark_from_static_string("mantissa"), 2, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 	}
 	_float->p.ref = 1;
-	_float->p.index = index;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	_float->p.index = root_name ? INT_MAX : index;
 	_float->p.name = field_name;
-	_float->p.path = new_definition_path(parent_scope, field_name);
 	_float->value = 0.0;
+	ret = register_field_definition(field_name, &_float->p,
+					parent_scope);
+	assert(!ret);
 	return &_float->p;
 }