X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=types%2Farray.c;h=b13ba39267c0dbbec791c2d30980ef50938d5cfa;hb=e1151715912eaec959682b3bc10be3ced6abe467;hp=6ac4a1a1cbfab26b06ef5648380b48ceb1264d95;hpb=c054553dac076f91196b372fa19efaf2adc4e4f9;p=babeltrace.git

diff --git a/types/array.c b/types/array.c
index 6ac4a1a1..b13ba392 100644
--- a/types/array.c
+++ b/types/array.c
@@ -20,102 +20,98 @@
 #include <babeltrace/format.h>
 
 static
-struct type *_array_type_new(struct type_class *type_class,
-			     struct declaration_scope *parent_scope);
+struct definition *_array_definition_new(struct type *type,
+			struct definition_scope *parent_scope);
 static
-void _array_type_free(struct type *type);
+void _array_definition_free(struct definition *definition);
 
 void array_copy(struct stream_pos *dest, const struct format *fdest, 
 		struct stream_pos *src, const struct format *fsrc,
-		struct type *type)
+		struct definition *definition)
 {
-	struct type_sequence *array = container_of(type, struct type_array, p);
-	struct type_class_array *array_class = array->_class;
+	struct definition_array *array =
+		container_of(definition, struct definition_array, p);
+	struct type_array *array_type = array->type;
 	uint64_t i;
 
-	fsrc->array_begin(src, array_class);
-	fdest->array_begin(dest, array_class);
+	fsrc->array_begin(src, array_type);
+	fdest->array_begin(dest, array_type);
 
-	for (i = 0; i < array_class->len; i++) {
-		struct type_class *elem_class = array->current_element.type;
-		elem_type->p._class->copy(dest, fdest, src, fsrc, elem_type);
+	for (i = 0; i < array_type->len; i++) {
+		struct definition *elem = array->current_element.definition;
+		elem->type->copy(dest, fdest, src, fsrc, elem);
 	}
-	fsrc->array_end(src, array_class);
-	fdest->array_end(dest, array_class);
+	fsrc->array_end(src, array_type);
+	fdest->array_end(dest, array_type);
 }
 
 static
-void _array_type_class_free(struct type_class *type_class)
+void _array_type_free(struct type *type)
 {
-	struct type_class_array *array_class =
-		container_of(type_class, struct type_class_array, p);
+	struct type_array *array_type =
+		container_of(type, struct type_array, p);
 
-	type_class_unref(array_class->elem);
-	g_free(array_class);
+	free_type_scope(array_type->scope);
+	type_unref(array_type->elem);
+	g_free(array_type);
 }
 
-struct type_class_array *
-array_type_class_new(const char *name, size_t len, struct type_class *elem)
+struct type_array *
+	array_type_new(const char *name, size_t len, struct type *elem_type,
+		       struct type_scope *parent_scope)
 {
-	struct type_class_array *array_class;
-	struct type_class *type_class;
-	int ret;
+	struct type_array *array_type;
+	struct type *type;
 
-	array_class = g_new(struct type_class_array, 1);
-	type_class = &array_class->p;
-	array_class->len = len;
-	type_ref(elem);
-	array_class->elem = elem;
-	type_class->name = g_quark_from_string(name);
+	array_type = g_new(struct type_array, 1);
+	type = &array_type->p;
+	array_type->len = len;
+	type_ref(elem_type);
+	array_type->elem = elem_type;
+	array_type->scope = new_type_scope(parent_scope);
+	type->id = CTF_TYPE_ARRAY;
+	type->name = g_quark_from_string(name);
 	/* No need to align the array, the first element will align itself */
-	type_class->alignment = 1;
-	type_class->copy = array_copy;
-	type_class->class_free = _array_type_class_free;
-	type_class->type_new = _array_type_new;
-	type_class->type_free = _array_type_free;
-	type_class->ref = 1;
-
-	if (type_class->name) {
-		ret = register_type(type_class);
-		if (ret)
-			goto error_register;
-	}
-	return array_class;
-
-error_register:
-	type_class_unref(array_class->elem);
-	g_free(array_class);
-	return NULL;
+	type->alignment = 1;
+	type->copy = array_copy;
+	type->type_free = _array_type_free;
+	type->definition_new = _array_definition_new;
+	type->definition_free = _array_definition_free;
+	type->ref = 1;
+	return array_type;
 }
 
 static
-struct type_array *_array_type_new(struct type_class *type_class,
-				   struct declaration_scope *parent_scope)
+struct definition *
+	_array_definition_new(struct type *type,
+			      struct definition_scope *parent_scope)
 {
-	struct type_class_array *array_class =
-		container_of(type_class, struct type_class_array, p);
-	struct type_array *array;
+	struct type_array *array_type =
+		container_of(type, struct type_array, p);
+	struct definition_array *array;
 
-	array = g_new(struct type_array, 1);
-	type_class_ref(&array_class->p);
-	array->p._class = array_class;
+	array = g_new(struct definition_array, 1);
+	type_ref(&array_type->p);
+	array->p.type = type;
+	array->type = array_type;
 	array->p.ref = 1;
-	array->scope = new_declaration_scope(parent_scope);
-	array->current_element.type =
-		array_class->elem.p->type_new(&array_class->elem.p,
-						 parent_scope);
+	array->scope = new_definition_scope(parent_scope);
+	array->current_element.definition =
+		array_type->elem->definition_new(array_type->elem,
+						  parent_scope);
 	return &array->p;
 }
 
 static
-void _array_type_free(struct type *type)
+void _array_definition_free(struct definition *definition)
 {
-	struct type_array *array =
-		container_of(type, struct type_array, p);
-	struct type *elem_type = array->current_element.type;
+	struct definition_array *array =
+		container_of(definition, struct definition_array, p);
+	struct definition *elem_definition =
+		array->current_element.definition;
 
-	elem_type->p._class->type_free(elem_type);
-	free_declaration_scope(array->scope);
-	type_class_unref(array->p._class);
+	elem_definition->type->definition_free(elem_definition);
+	free_definition_scope(array->scope);
+	type_unref(array->p.type);
 	g_free(array);
 }