Scope path: split dynamic scope path
[babeltrace.git] / types / array.c
index 01483b520017e4fbfb84fd5800fbb029babdae46..3e1f2181be8d16193966163f158fe7e0a1e46ca2 100644 (file)
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Array Type Converter
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
 
+static
+struct definition *_array_definition_new(struct declaration *declaration,
+                       struct definition_scope *parent_scope,
+                       GQuark field_name, int index);
+static
+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,
-               const struct type_class *type_class)
+               struct definition *definition)
 {
-       struct type_class_array *array_class =
-               container_of(type_class, struct type_class_array, p);
-       unsigned int i;
+       struct definition_array *array =
+               container_of(definition, struct definition_array, p);
+       struct declaration_array *array_declaration = array->declaration;
+       uint64_t i;
 
-       fsrc->array_begin(src, array_class);
-       fdest->array_begin(dest, array_class);
+       fsrc->array_begin(src, array_declaration);
+       fdest->array_begin(dest, array_declaration);
 
-       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);
+       for (i = 0; i < array_declaration->len; i++) {
+               struct definition *elem = array->current_element.definition;
+               elem->declaration->copy(dest, fdest, src, fsrc, elem);
        }
-       fsrc->array_end(src, array_class);
-       fdest->array_end(dest, array_class);
+       fsrc->array_end(src, array_declaration);
+       fdest->array_end(dest, array_declaration);
 }
 
-void array_type_free(struct type_class_array *array_class)
+static
+void _array_declaration_free(struct declaration *declaration)
 {
-       type_unref(array_class->elem);
-       g_free(array_class);
+       struct declaration_array *array_declaration =
+               container_of(declaration, struct declaration_array, p);
+
+       free_declaration_scope(array_declaration->scope);
+       declaration_unref(array_declaration->elem);
+       g_free(array_declaration);
 }
 
-static void _array_type_free(struct type_class *type_class)
+struct declaration_array *
+       array_declaration_new(const char *name, size_t len,
+                             struct declaration *elem_declaration,
+                             struct declaration_scope *parent_scope)
 {
-       struct type_class_array *array_class =
-               container_of(type_class, struct type_class_array, p);
-       array_type_free(array_class);
+       struct declaration_array *array_declaration;
+       struct declaration *declaration;
+
+       array_declaration = g_new(struct declaration_array, 1);
+       declaration = &array_declaration->p;
+       array_declaration->len = len;
+       declaration_ref(elem_declaration);
+       array_declaration->elem = elem_declaration;
+       array_declaration->scope = new_declaration_scope(parent_scope);
+       declaration->id = CTF_TYPE_ARRAY;
+       declaration->name = g_quark_from_string(name);
+       /* No need to align the array, the first element will align itself */
+       declaration->alignment = 1;
+       declaration->copy = array_copy;
+       declaration->declaration_free = _array_declaration_free;
+       declaration->definition_new = _array_definition_new;
+       declaration->definition_free = _array_definition_free;
+       declaration->ref = 1;
+       return array_declaration;
 }
 
-struct type_class_array *array_type_new(const char *name, size_t len,
-                                       struct type_class *elem)
+static
+struct definition *
+       _array_definition_new(struct declaration *declaration,
+                             struct definition_scope *parent_scope,
+                             GQuark field_name, int index)
 {
-       struct type_class_array *array_class;
-       struct type_class *type_class;
-       int ret;
-
-       array_class = g_new(struct type_class_array, 1);
-       type_class = &array_class->p;
+       struct declaration_array *array_declaration =
+               container_of(declaration, struct declaration_array, p);
+       struct definition_array *array;
 
-       array_class->len = len;
-       type_ref(elem);
-       array_class->elem = elem;
-       type_class->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_class->ref = 1;
+       array = g_new(struct definition_array, 1);
+       declaration_ref(&array_declaration->p);
+       array->p.declaration = declaration;
+       array->declaration = array_declaration;
+       array->p.ref = 1;
+       array->p.index = index;
+       array->scope = new_definition_scope(parent_scope, field_name);
+       array->current_element.definition =
+               array_declaration->elem->definition_new(array_declaration->elem,
+                                         parent_scope,
+                                         g_quark_from_static_string("[]"),
+                                         0);
+       return &array->p;
+}
 
-       if (type_class->name) {
-               ret = register_type(type_class);
-               if (ret)
-                       goto error_register;
-       }
-       return array_class;
+static
+void _array_definition_free(struct definition *definition)
+{
+       struct definition_array *array =
+               container_of(definition, struct definition_array, p);
+       struct definition *elem_definition =
+               array->current_element.definition;
 
-error_register:
-       type_unref(array_class->elem);
-       g_free(array_class);
-       return NULL;
+       elem_definition->declaration->definition_free(elem_definition);
+       free_definition_scope(array->scope);
+       declaration_unref(array->p.declaration);
+       g_free(array);
 }
This page took 0.023969 seconds and 4 git commands to generate.