Rename: type_class, type -> type, declaration
[babeltrace.git] / types / array.c
index 153a38e62e43e8c11a583a268c6285b0f5f9af8a..6dd3b9ca8a6c869e419ef17c54ff9141ebf8c31f 100644 (file)
 /*
- * BabelTrace - Array Type Converter
+ * array.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Array Type Converter
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <babeltrace/compiler.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
+
+static
+struct declaration *_array_declaration_new(struct type *type,
+                       struct declaration_scope *parent_scope);
+static
+void _array_declaration_free(struct declaration *declaration);
 
 void array_copy(struct stream_pos *dest, const struct format *fdest, 
                struct stream_pos *src, const struct format *fsrc,
-               const struct type_class *type_class)
+               struct declaration *declaration)
 {
-       struct type_class_array *array_class =
-               container_of(type_class, struct type_class_array, p);
-       unsigned int i;
+       struct declaration_array *array =
+               container_of(declaration, struct declaration_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_class->elem;
-               elem_class->copy(dest, fdest, src, fsrc, &elem_class->p);
+       for (i = 0; i < array_type->len; i++) {
+               struct type *elem_type = array->current_element.type;
+               elem_type->p.type->copy(dest, fdest, src, fsrc, elem_type);
        }
-       fsrc->array_end(src, array_class);
-       fdest->array_end(dest, array_class);
+       fsrc->array_end(src, array_type);
+       fdest->array_end(dest, array_type);
 }
 
-void array_type_free(struct type_class_array *array_class)
+static
+void _array_type_free(struct type *type)
 {
-       array_class->elem->free(&array_class->elem->p);
-       g_free(array_class);
-}
+       struct type_array *array_type =
+               container_of(type, struct type_array, p);
 
-static void _array_type_free(struct type_class *type_class)
-{
-       struct type_class_struct *array_class =
-               container_of(type_class, struct type_class_array, p);
-       array_type_free(array_class);
+       type_unref(array_type->elem);
+       g_free(array_type);
 }
 
-struct type_class_array *array_type_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_class_array *array_class;
+       struct type_array *array_type;
+       struct type *type;
        int ret;
 
-       array_class = g_new(struct type_class_array, 1);
-       type_class = &float_class->p;
-
-       array_class->len = len;
-       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;
+       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->free = _array_type_free;
+       type->alignment = 1;
+       type->copy = array_copy;
+       type->type_free = _array_type_free;
+       type->declaration_new = _array_declaration_new;
+       type->declaration_free = _array_declaration_free;
+       type->ref = 1;
 
-       if (type_class->name) {
-               ret = ctf_register_type(type_class);
+       if (type->name) {
+               ret = register_type(type);
                if (ret)
                        goto error_register;
        }
-       return array_class;
+       return array_type;
 
 error_register:
-       g_free(array_class);
+       type_unref(array_type->elem);
+       g_free(array_type);
        return NULL;
 }
+
+static
+struct declaration *
+       _array_declaration_new(struct type *type,
+                              struct declaration_scope *parent_scope)
+{
+       struct type_array *array_type =
+               container_of(type, struct type_array, p);
+       struct declaration_array *array;
+
+       array = g_new(struct declaration_array, 1);
+       type_ref(&array_type->p);
+       array->p.type = array_type;
+       array->p.ref = 1;
+       array->scope = new_declaration_scope(parent_scope);
+       array->current_element.declaration =
+               array_type->elem.p->declaration_new(&array_type->elem.p,
+                                                   parent_scope);
+       return &array->p;
+}
+
+static
+void _array_declaration_free(struct declaration *declaration)
+{
+       struct type_array *array =
+               container_of(declaration, struct type_array, p);
+       struct declaration *elem_declaration =
+               array->current_element.declaration;
+
+       elem_type->p.type->declaration_free(elem_type);
+       free_declaration_scope(array->scope);
+       type_unref(array->p.type);
+       g_free(array);
+}
This page took 0.025305 seconds and 4 git commands to generate.