X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=ae23a96c261ef92ce62404b40e1cac2e69e70def;hp=c78cf584feb4f07f9100ed5f8902a046f1027e01;hb=6ee5115efee00adab0c8f384bc9c0f38fed8a84e;hpb=c054553dac076f91196b372fa19efaf2adc4e4f9

diff --git a/types/float.c b/types/float.c
index c78cf584..ae23a96c 100644
--- a/types/float.c
+++ b/types/float.c
@@ -20,113 +20,94 @@
 #include <babeltrace/format.h>
 
 static
-struct type_float *_float_type_new(struct type_class *type_class,
+struct declaration *_float_declaration_new(struct type *type,
 				   struct declaration_scope *parent_scope);
 static
-void _float_type_free(struct type *type);
+void _float_declaration_free(struct declaration *declaration);
 
 void float_copy(struct stream_pos *destp,
 		const struct format *fdest,
 		struct stream_pos *srcp,
 		const struct format *fsrc,
-		struct type *type)
+		struct declaration *declaration)
 {
-	struct type_float *_float = container_of(type, struct type_float, p);
-	struct type_class_float *float_class = _float->_class;
+	struct declaration_float *_float =
+		container_of(declaration, struct declaration_float, p);
+	struct type_float *float_type = _float->type;
 
 	if (fsrc->float_copy == fdest->float_copy) {
-		fsrc->float_copy(destp, srcp, float_class);
+		fsrc->float_copy(destp, srcp, float_type);
 	} else {
 		double v;
 
-		v = fsrc->double_read(srcp, float_class);
-		fdest->double_write(destp, float_class, v);
+		v = fsrc->double_read(srcp, float_type);
+		fdest->double_write(destp, float_type, v);
 	}
 }
 
 static
-void _float_type_class_free(struct type_class *type_class)
+void _float_type_free(struct type *type)
 {
-	struct type_class_float *float_class =
-		container_of(type_class, struct type_class_float, p);
+	struct type_float *float_type =
+		container_of(type, struct type_float, p);
 
-	type_class_unref(&float_class->exp->p);
-	type_class_unref(&float_class->mantissa->p);
-	type_class_unref(&float_class->sign->p);
-	g_free(float_class);
+	type_unref(&float_type->exp->p);
+	type_unref(&float_type->mantissa->p);
+	type_unref(&float_type->sign->p);
+	g_free(float_type);
 }
 
-struct type_class_float *
-float_type_class_new(const char *name, size_t mantissa_len,
-		     size_t exp_len, int byte_order, size_t alignment)
+struct type_float *
+	float_type_new(const char *name, size_t mantissa_len,
+		       size_t exp_len, int byte_order, size_t alignment)
 {
-	struct type_class_float *float_class;
-	struct type_class *type_class;
-	int ret;
-
-	float_class = g_new(struct type_class_float, 1);
-	type_class = &float_class->p;
-	type_class->name = g_quark_from_string(name);
-	type_class->alignment = alignment;
-	type_class->copy = float_copy;
-	type_class->class_free = _float_type_class_free;
-	type_class->type_new = _float_type_new;
-	type_class->type_free = _float_type_free;
-	type_class->ref = 1;
-	float_class->byte_order = byte_order;
-
-	float_class->sign = integer_type_new(NULL, 1,
-					     byte_order, false, 1);
-	if (!float_class->mantissa)
-		goto error_sign;
-	float_class->mantissa = integer_type_new(NULL, mantissa_len - 1,
-						 byte_order, false, 1);
-	if (!float_class->mantissa)
-		goto error_mantissa;
-	float_class->exp = integer_type_new(NULL, exp_len,
-					    byte_order, true, 1);
-	if (!float_class->exp)
-		goto error_exp;
-
-	if (float_class->p.name) {
-		ret = register_type(&float_class->p);
-		if (ret)
-			goto error_register;
-	}
-	return float_class;
-
-error_register:
-	type_class_unref(&float_class->exp->p);
-error_exp:
-	type_class_unref(&float_class->mantissa->p);
-error_mantissa:
-	type_class_unref(&float_class->sign->p);
-error_sign:
-	g_free(float_class);
-	return NULL;
+	struct type_float *float_type;
+	struct type *type;
+
+	float_type = g_new(struct type_float, 1);
+	type = &float_type->p;
+	type->name = g_quark_from_string(name);
+	type->alignment = alignment;
+	type->copy = float_copy;
+	type->type_free = _float_type_free;
+	type->declaration_new = _float_declaration_new;
+	type->declaration_free = _float_declaration_free;
+	type->ref = 1;
+	float_type->byte_order = byte_order;
+
+	float_type->sign = integer_type_new(NULL, 1,
+					    byte_order, false, 1);
+	float_type->mantissa = integer_type_new(NULL, mantissa_len - 1,
+						byte_order, false, 1);
+	float_type->exp = integer_type_new(NULL, exp_len,
+					   byte_order, true, 1);
+	return float_type;
 }
 
 static
-struct type_float *_float_type_new(struct type_class *type_class,
-				   struct declaration_scope *parent_scope)
+struct declaration *
+	_float_declaration_new(struct type *type,
+			       struct declaration_scope *parent_scope)
 {
-	struct type_class_float *float_class =
-		container_of(type_class, struct type_class_float, p);
-	struct type_float *_float;
-
-	_float = g_new(struct type_float, 1);
-	type_class_ref(&_float_class->p);
-	_float->p._class = _float_class;
+	struct type_float *float_type =
+		container_of(type, struct type_float, p);
+	struct declaration_float *_float;
+
+	_float = g_new(struct declaration_float, 1);
+	type_ref(&float_type->p);
+	_float->p.type= type;
+	_float->type= float_type;
 	_float->p.ref = 1;
 	_float->value = 0.0;
 	return &_float->p;
 }
 
 static
-void _float_type_free(struct type *type)
+void _float_declaration_free(struct declaration *declaration)
 {
-	struct type_float *_float = container_of(type, struct type_float, p);
+	struct declaration_float *_float =
+		container_of(declaration, struct declaration_float, p);
 
-	type_class_unref(_float->p._class);
+	type_unref(_float->p.type);
 	g_free(_float);
 }