Remove unneeded declaration "name", work in progress for gen io struct
[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c
index d3ee63fa99d4788c76bde546bf38b874684c6a97..bd0a845f8fd1327ea2c00062e2259a109b5510fe 100644 (file)
 #include <assert.h>
 #include <glib.h>
 #include <inttypes.h>
+#include <endian.h>
 #include <errno.h>
 #include <babeltrace/list.h>
+#include <uuid/uuid.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
        cds_list_entry((ptr)->next, type, member)
 
 static
-int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
-{
-       print_tabs(fd, depth);
-       fprintf(fd, "<type_specifier \"");
+struct declaration *ctf_declaration_specifier_visit(FILE *fd,
+               int depth, struct cds_list_head *head,
+               struct declaration_scope *declaration_scope,
+               struct ctf_trace *trace);
 
-       switch (node->u.type_specifier.type) {
-       case TYPESPEC_VOID:
-               fprintf(fd, "void");
-               break;
-       case TYPESPEC_CHAR:
-               fprintf(fd, "char");
-               break;
-       case TYPESPEC_SHORT:
-               fprintf(fd, "short");
-               break;
-       case TYPESPEC_INT:
-               fprintf(fd, "int");
-               break;
-       case TYPESPEC_LONG:
-               fprintf(fd, "long");
-               break;
-       case TYPESPEC_FLOAT:
-               fprintf(fd, "float");
-               break;
-       case TYPESPEC_DOUBLE:
-               fprintf(fd, "double");
-               break;
-       case TYPESPEC_SIGNED:
-               fprintf(fd, "signed");
-               break;
-       case TYPESPEC_UNSIGNED:
-               fprintf(fd, "unsigned");
-               break;
-       case TYPESPEC_BOOL:
-               fprintf(fd, "bool");
-               break;
-       case TYPESPEC_COMPLEX:
-               fprintf(fd, "complex");
-               break;
-       case TYPESPEC_CONST:
-               fprintf(fd, "const");
-               break;
-       case TYPESPEC_ID_TYPE:
-               fprintf(fd, "%s", node->u.type_specifier.id_type);
-               break;
+/*
+ * String returned must be freed by the caller using g_free.
+ */
+static
+char *concatenate_unary_strings(struct cds_list_head *head)
+{
+       struct ctf_node *node;
+       GString *str;
+       int i = 0;
+
+       str = g_string_new();
+       cds_list_for_each_entry(node, head, siblings) {
+               char *src_string;
+
+               assert(node->type == NODE_UNARY_EXPRESSION);
+               assert(node->u.unary_expression.type == UNARY_STRING);
+               assert((node->u.unary_expression.link == UNARY_LINK_UNKNOWN)
+                       ^ (i != 0))
+               switch (node->u.unary_expression.link) {
+               case UNARY_DOTLINK:
+                       g_string_append(str, ".")
+                       break;
+               case UNARY_ARROWLINK:
+                       g_string_append(str, "->")
+                       break;
+               case UNARY_DOTDOTDOT:
+                       g_string_append(str, "...")
+                       break;
+               }
+               src_string = u.unary_expression.u.string;
+               g_string_append(str, src_string);
+               i++;
+       }
+       return g_string_free(str, FALSE);
+}
 
-       case TYPESPEC_UNKNOWN:
-       default:
-               fprintf(stderr, "[error] %s: unknown type specifier %d\n", __func__,
-                       (int) node->u.type_specifier.type);
-               return -EINVAL;
+static
+int get_unary_unsigned(struct cds_list_head *head, uint64_t *value)
+{
+       struct ctf_node *node;
+       int i = 0;
+
+       cds_list_for_each_entry(node, head, siblings) {
+               assert(node->type == NODE_UNARY_EXPRESSION);
+               assert(node->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT);
+               assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN);
+               assert(i == 0);
+               *value = node->u.unary_expression.unsigned_constant
+               i++;
        }
-       fprintf(fd, "\"/>\n");
        return 0;
 }
 
 static
-int ctf_visitor_print_type_declarator(FILE *fd, int depth, struct ctf_node *node)
+int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid)
 {
-       int ret = 0;
-       struct ctf_node *iter;
+       struct ctf_node *node;
+       int i = 0;
+       int ret = -1;
+
+       cds_list_for_each_entry(node, head, siblings) {
+               const char *src_string;
+
+               assert(node->type == NODE_UNARY_EXPRESSION);
+               assert(node->u.unary_expression.type == UNARY_STRING);
+               assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN);
+               assert(i == 0);
+               src_string = u.unary_expression.u.string;
+               ret = uuid_parse(u.unary_expression.u.string, *uuid);
+       }
+       return ret;
+}
 
-       print_tabs(fd, depth);
-       fprintf(fd, "<type_declarator>\n");
-       depth++;
+static
+struct ctf_stream *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
+{
+       if (trace->streams->len <= stream_id)
+               return NULL;
+       return g_ptr_array_index(trace->streams, stream_id);
+}
 
-       if (!cds_list_empty(&node->u.type_declarator.pointers)) {
-               print_tabs(fd, depth);
-               fprintf(fd, "<pointers>\n");
-               cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
-                                       siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
+static
+void visit_declaration_specifier(struct cds_list_head *declaration_specifier, GString *str)
+{
+       struct ctf_node *iter;
+       int alias_item_nr = 0;
+       int err;
+
+       cds_list_for_each_entry(iter, declaration_specifier, siblings) {
+               if (alias_item_nr != 0)
+                       g_string_append(str, " ");
+               alias_item_nr++;
+
+               switch (iter->type) {
+               case NODE_TYPE_SPECIFIER:
+                       switch (iter->u.type_specifier.type) {
+                       case TYPESPEC_VOID:
+                               g_string_append(str, "void");
+                               break;
+                       case TYPESPEC_CHAR:
+                               g_string_append(str, "char");
+                               break;
+                       case TYPESPEC_SHORT:
+                               g_string_append(str, "short");
+                               break;
+                       case TYPESPEC_INT:
+                               g_string_append(str, "int");
+                               break;
+                       case TYPESPEC_LONG:
+                               g_string_append(str, "long");
+                               break;
+                       case TYPESPEC_FLOAT:
+                               g_string_append(str, "float");
+                               break;
+                       case TYPESPEC_DOUBLE:
+                               g_string_append(str, "double");
+                               break;
+                       case TYPESPEC_SIGNED:
+                               g_string_append(str, "signed");
+                               break;
+                       case TYPESPEC_UNSIGNED:
+                               g_string_append(str, "unsigned");
+                               break;
+                       case TYPESPEC_BOOL:
+                               g_string_append(str, "bool");
+                               break;
+                       case TYPESPEC_COMPLEX:
+                               g_string_append(str, "_Complex");
+                               break;
+                       case TYPESPEC_IMAGINARY:
+                               g_string_append(str, "_Imaginary");
+                               break;
+                       case TYPESPEC_CONST:
+                               g_string_append(str, "const");
+                               break;
+                       case TYPESPEC_ID_TYPE:
+                               if (iter->u.type_specifier.id_type)
+                                       g_string_append(str, iter->u.type_specifier.id_type);
+                               break;
+                       default:
+                               fprintf(stderr, "[error] %s: unknown specifier\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       break;
+               case NODE_ENUM:
+                       if (!iter->u._enum.enum_id) {
+                               fprintf(stderr, "[error] %s: unexpected empty enum ID\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "enum ");
+                       g_string_append(str, iter->u._enum.enum_id);
+                       break;
+               case NODE_VARIANT:
+                       if (!iter->u.variant.name) {
+                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "variant ");
+                       g_string_append(str, iter->u.variant.name);
+                       break;
+               case NODE_STRUCT:
+                       if (!iter->u._struct.name) {
+                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "struct ");
+                       g_string_append(str, iter->u._struct.name);
+                       break;
+               default:
+                       fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
+                       err = -EINVAL;
+                       goto error;
                }
-               print_tabs(fd, depth);
-               fprintf(fd, "</pointers>\n");
        }
+       return 0;
+error:
+       return err;
+}
 
-       switch (node->u.type_declarator.type) {
-       case TYPEDEC_ID:
-               if (node->u.type_declarator.u.id) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<id \"");
-                       fprintf(fd, "%s", node->u.type_declarator.u.id);
-                       fprintf(fd, "\" />\n");
-               }
-               break;
-       case TYPEDEC_NESTED:
-               if (node->u.type_declarator.u.nested.type_declarator) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<type_declarator>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.u.nested.type_declarator);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</type_declarator>\n");
-               }
-               if (node->u.type_declarator.u.nested.length) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<length>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.u.nested.length);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</length>\n");
-               }
-               if (node->u.type_declarator.u.nested.abstract_array) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<length>\n");
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</length>\n");
-               }
-               if (node->u.type_declarator.bitfield_len) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<bitfield_len>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.bitfield_len);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</bitfield_len>\n");
+static
+GQuark create_typealias_identifier(int fd, int depth,
+       struct cds_list_head *declaration_specifier,
+       struct ctf_node *node_type_declarator)
+{
+       GString *str;
+       const char *str_c;
+       GQuark alias_q;
+       int ret;
+
+       str = g_string_new();
+       ret = visit_declaration_specifier(declaration_specifier, str);
+       if (ret) {
+               g_string_free(str, TRUE);
+               return 0;
+       }
+       cds_list_for_each_entry(iter, &node_type_declarator->u.type_declarator.pointers, siblings) {
+               g_string_append(str, " *");
+               if (iter->u.pointer.const_qualifier)
+                       g_string_append(str, " const");
+       }
+       str_c = g_string_free(str, FALSE);
+       alias_q = g_quark_from_string(str_c);
+       g_free(str_c);
+       return alias_q;
+}
+
+static
+struct declaration *ctf_type_declarator_visit(int fd, int depth,
+       struct cds_list_head *declaration_specifier,
+       GQuark *field_name,
+       struct ctf_node *node_type_declarator,
+       struct declaration_scope *declaration_scope,
+       struct declaration *nested_declaration)
+{
+       /*
+        * Visit type declarator by first taking care of sequence/array
+        * (recursively). Then, when we get to the identifier, take care
+        * of pointers.
+        */
+
+       assert(node_type_declarator->u.type_declarator.type != TYPEDEC_UNKNOWN);
+
+       /* TODO: gcc bitfields not supported yet. */
+       if (node_type_declarator->u.type_declarator.bitfield_len != NULL) {
+               fprintf(stderr, "[error] %s: gcc bitfields are not supported yet.\n", __func__);
+               return NULL;
+       }
+
+       if (!nested_declaration) {
+               if (!cds_list_empty(&node_type_declarator->u.type_declarator.pointers)) {
+                       GQuark alias_q;
+
+                       /*
+                        * If we have a pointer declarator, it _has_ to be present in
+                        * the typealiases (else fail).
+                        */
+                       alias_q = create_typealias_identifier(fd, depth,
+                               declaration_specifier, node_type_declarator);
+                       nested_declaration = lookup_declaration(alias_q, declaration_scope);
+                       if (!nested_declaration) {
+                               fprintf(stderr, "[error] %s: cannot find typealias \"%s\".\n", __func__, g_quark_to_string(alias_q));
+                               return NULL;
+                       }
+               } else {
+                       nested_declaration = /* parse declaration_specifier */;
                }
-               break;
-       case TYPEDEC_UNKNOWN:
-       default:
-               fprintf(stderr, "[error] %s: unknown type declarator %d\n", __func__,
-                       (int) node->u.type_declarator.type);
-               return -EINVAL;
        }
 
-       depth--;
-       print_tabs(fd, depth);
-       fprintf(fd, "</type_declarator>\n");
-       return 0;
+       if (node_type_declarator->u.type_declarator.type == TYPEDEC_ID) {
+               if (node_type_declarator->u.type_declarator.u.id)
+                       *field_name = g_quark_from_string(node_type_declarator->u.type_declarator.u.id);
+               else
+                       *field_name = 0;
+               return nested_declaration;
+       } else {
+               struct declaration *declaration;
+               struct node *length;
+
+               /* TYPEDEC_NESTED */
+
+               /* create array/sequence, pass nested_declaration as child. */
+               length = node_type_declarator->u.type_declarator.u.nested.length;
+               if (length) {
+                       switch (length->type) {
+                       case NODE_UNARY_EXPRESSION:
+                               /* Array */
+                               /* TODO */
+               .............
+                               declaration = /* create array */;
+                               break;
+                       case NODE_TYPE_SPECIFIER:
+                               /* Sequence */
+                               declaration = /* create sequence */;
+                               break;
+                       default:
+                               assert(0);
+                       }
+               }
+
+               /* Pass it as content of outer container */
+               declaration = ctf_type_declarator_visit(fd, depth,
+                               declaration_specifier, field_name,
+                               node_type_declarator->u.type_declarator.u.nested.type_declarator,
+                               declaration_scope, declaration);
+               return declaration;
+       }
 }
 
-/*
- * String returned must be freed by the caller.
- */
 static
-char *concatenate_unary_strings(struct list_head *head)
+int ctf_struct_type_declarators_visit(int fd, int depth,
+       struct declaration_struct *struct_declaration,
+       struct cds_list_head *declaration_specifier,
+       struct cds_list_head *type_declarators,
+       struct declaration_scope *declaration_scope)
 {
+       struct ctf_node *iter;
+       GQuark field_name;
 
+       cds_list_for_each_entry(iter, type_declarators, siblings) {
+               struct declaration *field_declaration;
+
+               field_declaration = ctf_type_declarator_visit(fd, depth,
+                                               declaration_specifier,
+                                               &field_name, iter,
+                                               struct_declaration->scope,
+                                               NULL);
+               struct_declaration_add_field(struct_declaration,
+                                            g_quark_to_string(field_name),
+                                            field_declaration);
+       }
+       return 0;
 }
 
 static
-int get_unary_unsigned(struct list_head *head, uint64_t *value)
+int ctf_variant_type_declarators_visit(int fd, int depth,
+       struct declaration_variant *variant_declaration,
+       struct cds_list_head *declaration_specifier,
+       struct cds_list_head *type_declarators,
+       struct declaration_scope *declaration_scope)
 {
+       struct ctf_node *iter;
+       GQuark field_name;
 
+       cds_list_for_each_entry(iter, type_declarators, siblings) {
+               struct declaration *field_declaration;
+
+               field_declaration = ctf_type_declarator_visit(fd, depth,
+                                               declaration_specifier,
+                                               &field_name, iter,
+                                               variant_declaration->scope,
+                                               NULL);
+               variant_declaration_add_field(variant_declaration,
+                                             g_quark_to_string(field_name),
+                                             field_declaration);
+       }
+       return 0;
 }
 
 static
-int get_unary_uuid(struct list_head *head, uuid_t *uuid)
+int ctf_typedef_visit(int fd, int depth, struct declaration_scope *scope,
+               struct cds_list_head *declaration_specifier,
+               struct cds_list_head *type_declarators)
 {
+       struct ctf_node *iter;
+       GQuark identifier;
 
+       cds_list_for_each_entry(iter, type_declarators, siblings) {
+               struct declaration *type_declaration;
+               int ret;
+       
+               type_declaration = ctf_type_declarator_visit(fd, depth,
+                                       declaration_specifier,
+                                       &identifier, iter,
+                                       scope, NULL);
+               ret = register_declaration(identifier, type_declaration, scope);
+               if (ret) {
+                       type_declaration->declaration_free(type_declaration);
+                       return ret;
+               }
+       }
+       return 0;
 }
 
 static
-struct ctf_stream *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
+int ctf_typealias_visit(int fd, int depth, struct declaration_scope *scope,
+               struct ctf_node *target, struct ctf_node *alias)
 {
-       if (trace->streams->len <= stream_id)
-               return NULL;
-       return g_ptr_array_index(trace->streams, stream_id);
+       struct declaration *type_declaration;
+       struct ctf_node *iter, *node;
+       GQuark dummy_id;
+       GQuark alias_q;
+
+       /* See ctf_visitor_type_declarator() in the semantic validator. */
+
+       /*
+        * Create target type declaration.
+        */
+
+       type_declaration = ctf_type_declarator_visit(fd, depth,
+               &target->u.typealias_target.declaration_specifier,
+               &dummy_id, &target->u.typealias_target.type_declarators,
+               scope, NULL);
+       if (!type_declaration) {
+               fprintf(stderr, "[error] %s: problem creating type declaration\n", __func__);
+               err = -EINVAL;
+               goto error;
+       }
+       /*
+        * The semantic validator does not check whether the target is
+        * abstract or not (if it has an identifier). Check it here.
+        */
+       if (dummy_id != 0) {
+               fprintf(stderr, "[error] %s: expecting empty identifier\n", __func__);
+               err = -EINVAL;
+               goto error;
+       }
+       /*
+        * Create alias identifier.
+        */
+
+       node = _cds_list_first_entry(&alias->u.typealias_alias.type_declarators,
+                               struct node, siblings);
+       alias_q = create_typealias_identifier(fd, depth,
+                       &alias->u.typealias_alias.declaration_specifier, node);
+       ret = register_declaration(alias_q, type_declaration, scope);
+       if (ret)
+               goto error;
+       return 0;
+
+error:
+       type_declaration->declaration_free(type_declaration);
+       return ret;
 }
 
-/*
- * Also add named variant, struct or enum to the current type scope.
- */
 static
-struct ctf_type *ctf_type_specifier_visit(FILE *fd,
-                                         int depth, struct list_head *head,
-                                         struct type_scope *type_scope,
-                                         struct declaration_scope *declaration_scope)
+int ctf_struct_declaration_list_visit(int fd, int depth,
+       struct ctf_node *iter, struct declaration_struct *struct_declaration)
 {
-       struct ctf_type *type;
-       struct node *first;
+       struct declaration *declaration;
+       int ret;
 
-       first = _cds_list_first_entry(head, struct node, siblings);
-
-       switch (first->type) {
-       case NODE_STRUCT:
-               /* For named struct (without body), lookup in type scope */
-               /* For named struct (with body), create type and add to type scope */
-               /* For unnamed struct, create type */
+       switch (iter->type) {
+       case NODE_TYPEDEF:
+               /* For each declarator, declare type and add type to struct declaration scope */
+               ret = ctf_typedef_visit(fd, depth,
+                       struct_declaration->scope,
+                       &iter->u._typedef.declaration_specifier,
+                       &iter->u._typedef.type_declarators);
+               if (ret)
+                       return ret;
                break;
-       case NODE_VARIANT:
-               /* For named variant (without body), lookup in type scope */
-               /* For named variant (with body), create type and add to type scope */
-               /* For unnamed variant, create type */
+       case NODE_TYPEALIAS:
+               /* Declare type with declarator and add type to struct declaration scope */
+               ret = ctf_typealias_visit(fd, depth,
+                       struct_declaration->scope,
+                       iter->u.typealias.target,
+                       iter->u.typealias.alias);
+               if (ret)
+                       return ret;
                break;
-       case NODE_ENUM:
-               /* For named enum (without body), lookup in type scope */
-               /* For named enum (with body), create type and add to type scope */
-               /* For unnamed enum, create type */
+       case NODE_STRUCT_OR_VARIANT_DECLARATION:
+               /* Add field to structure declaration */
+               ret = ctf_struct_type_declarators_visit(fd, depth,
+                               struct_declaration,
+                               &iter->u.struct_or_variant_declaration.declaration_specifier,
+                               &iter->u.struct_or_variant_declaration.type_declarators);
+               if (ret)
+                       return ret;
                break;
-       case NODE_INTEGER:
+       default:
+               fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
+               assert(0);
+       }
+       return 0;
+}
+
+static
+int ctf_variant_declaration_list_visit(int fd, int depth,
+       struct ctf_node *iter, struct declaration_variant *variant_declaration)
+{
+       struct declaration *declaration;
+       int ret;
+
+       switch (iter->type) {
+       case NODE_TYPEDEF:
+               /* For each declarator, declare type and add type to variant declaration scope */
+               ret = ctf_typedef_visit(fd, depth,
+                       variant_declaration->scope,
+                       &iter->u._typedef.declaration_specifier,
+                       &iter->u._typedef.type_declarators);
+               if (ret)
+                       return ret;
                break;
-       case NODE_FLOATING_POINT:
+       case NODE_TYPEALIAS:
+               /* Declare type with declarator and add type to variant declaration scope */
+               ret = ctf_typealias_visit(fd, depth,
+                       variant_declaration->scope,
+                       iter->u.typealias.target,
+                       iter->u.typealias.alias);
+               if (ret)
+                       return ret;
                break;
-       case NODE_TYPE_SPECIFIER:
+       case NODE_STRUCT_OR_VARIANT_DECLARATION:
+               /* Add field to structure declaration */
+               ret = ctf_variant_type_declarators_visit(fd, depth,
+                               variant_declaration,
+                               &iter->u.struct_or_variant_declaration.declaration_specifier,
+                               &iter->u.struct_or_variant_declaration.type_declarators);
+               if (ret)
+                       return ret;
                break;
+       default:
+               fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
+               assert(0);
+       }
+       return 0;
+}
 
+static
+struct declaration_struct *ctf_declaration_struct_visit(FILE *fd,
+       int depth, const char *name, struct cds_list_head *declaration_list,
+       int has_body, struct declaration_scope *declaration_scope)
+{
+       struct declaration *declaration;
+       struct declaration_struct *struct_declaration;
+       struct ctf_node *iter;
+
+       /*
+        * For named struct (without body), lookup in
+        * declaration scope. Don't take reference on struct
+        * declaration: ref is only taken upon definition.
+        */
+       if (!has_body) {
+               assert(name);
+               struct_declaration =
+                       lookup_struct_declaration(g_quark_from_string(name),
+                                                 declaration_scope);
+               return struct_declaration;
+       } else {
+               /* For unnamed struct, create type */
+               /* For named struct (with body), create type and add to declaration scope */
+               if (name) {
+                       if (lookup_struct_declaration(g_quark_from_string(name),
+                                                     declaration_scope)) {
+                               
+                               fprintf(stderr, "[error] %s: struct %s already declared in scope\n", __func__, name);
+                               return NULL;
+                       }
+               }
+               struct_declaration = struct_declaration_new(name, declaration_scope);
+               cds_list_for_each_entry(iter, declaration_list, siblings) {
+                       ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter, struct_declaration);
+                       if (ret)
+                               goto error;
+               }
+               if (name) {
+                       ret = register_struct_declaration(g_quark_from_string(name),
+                                       struct_declaration,
+                                       declaration_scope);
+                       assert(!ret);
+               }
+               return struct_declaration;
        }
+error:
+       struct_declaration->p.declaration_free(&struct_declaration->p);
+       return NULL;
 }
 
 static
-struct ctf_declaration *ctf_declaration_specifier_visit(FILE *fd,
-                                       int depth, struct list_head *head,
-                                       struct type_scope *type_scope,
-                                       struct declaration_scope *declaration_scope)
+struct declaration_variant *ctf_declaration_variant_visit(FILE *fd,
+       int depth, const char *name, struct cds_list_head *declaration_list,
+       int has_body, struct declaration_scope *declaration_scope)
 {
-       struct ctf_declaration *declaration;
-       struct ctf_type *type;
+       struct declaration *declaration;
+       struct declaration_variant *variant_declaration;
+       struct ctf_node *iter;
 
-       type = ctf_type_specifier_visit(fd, depth, head, type_scope,
+       /*
+        * For named variant (without body), lookup in
+        * declaration scope. Don't take reference on variant
+        * declaration: ref is only taken upon definition.
+        */
+       if (!has_body) {
+               assert(name);
+               variant_declaration =
+                       lookup_variant_declaration(g_quark_from_string(name),
+                                                  declaration_scope);
+               return variant_declaration;
+       } else {
+               /* For unnamed variant, create type */
+               /* For named variant (with body), create type and add to declaration scope */
+               if (name) {
+                       if (lookup_variant_declaration(g_quark_from_string(name),
+                                                      declaration_scope)) {
+                               
+                               fprintf(stderr, "[error] %s: variant %s already declared in scope\n", __func__, name);
+                               return NULL;
+                       }
+               }
+               variant_declaration = variant_declaration_new(name, declaration_scope);
+               cds_list_for_each_entry(iter, declaration_list, siblings) {
+                       ret = ctf_variant_declaration_list_visit(fd, depth + 1, iter, variant_declaration);
+                       if (ret)
+                               goto error;
+               }
+               if (name) {
+                       ret = register_variant_declaration(g_quark_from_string(name),
+                                       variant_declaration,
                                        declaration_scope);
-       declaration = type->declaration_new(type, declaration_scope);
-       if (type->id == CTF_TYPE_VARIANT) {
-               struct declaration_variant *variant =
-                       container_of(declaration, struct declaration_variant, p);
-               struct declaration *enum_tag =
-                       lookup_field_declaration(enum_tag_name, declaration_scope);
-               if (!enum_tag) {
-                       fprintf(fd, "[error]: expected enumeration tag field %s for variant\n",
-                               enum_tag_name);
-                       goto error;
+                       assert(!ret);
                }
-               /* TODO find enum tag */
-               ret = variant_declaration_set_tag(variant, enum_tag);
+               return variant_declaration;
        }
-       return declaration;
 error:
-       declaration_unref(declaration);
-       type_unref(type);
+       variant_declaration->p.declaration_free(&variant_declaration->p);
        return NULL;
 }
 
 static
-int ctf_typedef_declarator_visit(FILE *fd, int depth,
-                               struct list_head *declaration_specifier,
-                               struct node *type_declarator, struct type_scope *type_scope,
-                               struct declaration_scope *declaration_scope)
+int ctf_enumerator_list_visit(int fd, int depth,
+               struct ctf_node *enumerator,
+               struct declaration_enum *enum_declaration)
 {
+       /* TODO */
+........
+       return 0;
+}
+
+static
+struct declaration *ctf_declaration_enum_visit(int fd, int depth,
+                       const char *name,
+                       struct ctf_node *container_type,
+                       struct cds_list_head *enumerator_list,
+                       int has_body)
+{
+       struct declaration *declaration;
+       struct declaration_enum *enum_declaration;
+       struct declaration_integer *integer_declaration;
+       struct ctf_node *iter;
+
        /*
-        * Build the type using declaration specifier (creating
-        * declaration from type_specifier), then apply type declarator,
-        * add the resulting type to the current type scope.
+        * For named enum (without body), lookup in
+        * declaration scope. Don't take reference on enum
+        * declaration: ref is only taken upon definition.
         */
-       cds_list_for_each_entry(iter, declaration_specifier, siblings) {
+       if (!has_body) {
+               assert(name);
+               enum_declaration =
+                       lookup_enum_declaration(g_quark_from_string(name),
+                                               declaration_scope);
+               return enum_declaration;
+       } else {
+               /* For unnamed enum, create type */
+               /* For named enum (with body), create type and add to declaration scope */
+               if (name) {
+                       if (lookup_enum_declaration(g_quark_from_string(name),
+                                                   declaration_scope)) {
+                               
+                               fprintf(stderr, "[error] %s: enum %s already declared in scope\n", __func__, name);
+                               return NULL;
+                       }
+               }
 
+               /* TODO CHECK Enumerations need to have their size/type specifier (< >). */
+               integer_declaration = integer_declaration_new(); /* TODO ... */
+               .....
+               enum_declaration = enum_declaration_new(name, integer_declaration);
+               declaration_unref(&integer_declaration->p);     /* leave ref to enum */
+               cds_list_for_each_entry(iter, enumerator_list, siblings) {
+                       ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration);
+                       if (ret)
+                               goto error;
+               }
+               if (name) {
+                       ret = register_enum_declaration(g_quark_from_string(name),
+                                       enum_declaration,
+                                       declaration_scope);
+                       assert(!ret);
+               }
+               return enum_declaration;
+       }
+error:
+       enum_declaration->p.declaration_free(&enum_declaration->p);
+       return NULL;
+}
+
+static
+struct declaration *ctf_declaration_type_specifier_visit(int fd, int depth,
+               struct cds_list_head *declaration_specifier,
+               struct declaration_scope *declaration_scope)
+{
+       GString *str;
+       struct declaration *declaration;
+       const char *str_c;
+
+       str = g_string_new();
+       ret = visit_declaration_specifier(declaration_specifier, str);
+       if (ret)
+               return NULL;
+       str_c = g_string_free(str, FALSE);
+       id_q = g_quark_from_string(str_c);
+       g_free(str_c);
+       declaration = lookup_declaration(id_q, declaration_scope);
+       return declaration;
+}
 
+/*
+ * Returns 0/1 boolean, or < 0 on error.
+ */
+static
+int get_boolean(int fd, int depth, struct node *unary_expression)
+{
+       if (unary_expression->type != NODE_UNARY_EXPRESSION) {
+               fprintf(stderr, "[error] %s: expecting unary expression\n",
+                       __func__);
+               return -EINVAL;
        }
-       return 0;
+       switch (unary_expression->u.unary_expression.type) {
+       case UNARY_UNSIGNED_CONSTANT:
+               if (unary_expression->u.unary_expression.u.unsigned_constant == 0)
+                       return 0;
+               else
+                       return 1;
+       case UNARY_SIGNED_CONSTANT:
+               if (unary_expression->u.unary_expression.u.signed_constant == 0)
+                       return 0;
+               else
+                       return 1;
+       case UNARY_STRING:
+               if (!strcmp(unary_expression->u.unary_expression.u.string, "true"))
+                       return 1;
+               else if (!strcmp(unary_expression->u.unary_expression.u.string, "TRUE"))
+                       return 1;
+               else if (!strcmp(unary_expression->u.unary_expression.u.string, "false"))
+                       return 0;
+               else if (!strcmp(unary_expression->u.unary_expression.u.string, "FALSE"))
+                       return 0;
+               else {
+                       fprintf(stderr, "[error] %s: unexpected string \"%s\"\n",
+                               __func__, unary_expression->u.unary_expression.u.string);
+                       return -EINVAL;
+               }
+               break;
+       default:
+               fprintf(stderr, "[error] %s: unexpected unary expression type\n",
+                       __func__);
+               return -EINVAL;
+       } 
+
 }
 
 static
-int ctf_typedef_visit(FILE *fd, int depth,
-                     struct list_head *declaration_specifier,
-                     struct list_head *type_declarators,
-                     struct type_scope *type_scope,
-                     struct declaration_scope *declaration_scope)
+int get_byte_order(int fd, int depth, struct node *unary_expression)
 {
-       struct ctf_node *iter;
+       int byte_order;
 
-       cds_list_for_each_entry(iter, type_declarators, siblings) {
-               ret = ctf_typedef_declarator_visit(fd, depth + 1,
-                       &node->u._typedef.declaration_specifier, iter,
-                       type_scope, declaration_scope);
-               if (ret)
-                       return ret;
+       if (unary_expression->u.unary_expression.type != UNARY_STRING) {
+               fprintf(stderr, "[error] %s: byte_order: expecting string\n",
+                       __func__);
+               return -EINVAL;
        }
-       return 0;
+       if (!strcmp(unary_expression->u.unary_expression.u.string, "native"))
+               byte_order = trace->byte_order;
+       else if (!strcmp(unary_expression->u.unary_expression.u.string, "network"))
+               byte_order = BIG_ENDIAN;
+       else if (!strcmp(unary_expression->u.unary_expression.u.string, "be"))
+               byte_order = BIG_ENDIAN;
+       else if (!strcmp(unary_expression->u.unary_expression.u.string, "le"))
+               byte_order = LITTLE_ENDIAN;
+       else {
+               fprintf(stderr, "[error] %s: unexpected string \"%s\". Should be \"native\", \"network\", \"be\" or \"le\".\n",
+                       __func__, right->u.unary_expression.u.string);
+               return -EINVAL;
+       }
+       return byte_order;
 }
 
 static
-int ctf_typealias_visit(FILE *fd, int depth, struct ctf_node *target,
-                       struct ctf_node *alias, struct type_scope *type_scope,
-                       struct declaration_scope *declaration_scope)
+struct declaration *ctf_declaration_integer_visit(int fd, int depth,
+               struct cds_list_head *expressions,
+               struct ctf_trace *trace)
 {
-       /* Build target type, check that it is reachable in current type scope. */
-       /* Only one type declarator is allowed */
+       struct node *expression;
+       uint64_t alignment, size;
+       int byte_order = trace->byte_order;
+       int signedness = 0;
+       int has_alignment = 0, has_size = 0;
+       struct declaration_integer *integer_declaration;
+
+       cds_list_for_each_entry(expression, expressions, siblings) {
+               struct node *left, *right;
+
+               left = expression->u.ctf_expression.left;
+               right = expression->u.ctf_expression.right;
+               assert(left->u.unary_expression.type == UNARY_STRING);
+               if (!strcmp(left->u.unary_expression.u.string, "signed")) {
+                       signedness = get_boolean(fd, depth, right);
+                       if (signedness < 0)
+                               return NULL;
+               } else if (!strcmp(left->u.unary_expression.u.string, "byte_order")) {
+                       byte_order = get_byte_order(fd, depth, right);
+                       if (byte_order < 0)
+                               return NULL;
+               } else if (!strcmp(left->u.unary_expression.u.string, "size")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
+                               fprintf(stderr, "[error] %s: size: expecting unsigned constant\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       size = right->u.unary_expression.u.unsigned_constant;
+                       has_size = 1;
+               } else if (!strcmp(left->u.unary_expression.u.string, "align")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
+                               fprintf(stderr, "[error] %s: align: expecting unsigned constant\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       alignment = right->u.unary_expression.u.unsigned_constant;
+                       has_alignment = 1;
+               } else {
+                       fprintf(stderr, "[error] %s: unknown attribute name %s\n",
+                               __func__, left->u.unary_expression.u.string);
+                       return NULL;
+               }
+       }
+       if (!has_size) {
+               fprintf(stderr, "[error] %s: missing size attribute\n", __func__);
+               return NULL;
+       }
+       if (!has_alignment) {
+               if (size % CHAR_BIT) {
+                       /* bit-packed alignment */
+                       alignment = 1;
+               } else {
+                       /* byte-packed alignment */
+                       alignment = CHAR_BIT;
+               }
+       }
+       integer_declaration = integer_declaration_new(size,
+                               byte_order, signedness, alignment);
+       return &integer_declaration->p;
+}
 
-       /* Build alias type, add to current type scope. */
-       /* Only one type declarator is allowed */
+static
+struct declaration *ctf_declaration_floating_point_visit(int fd, int depth,
+               struct cds_list_head *expressions,
+               struct ctf_trace *trace)
+{
+       struct node *expression;
+       uint64_t alignment, exp_dig, mant_dig, byte_order = trace->byte_order;
+       int has_alignment = 0, has_exp_dig = 0, has_mant_dig = 0;
+       struct declaration_float *float_declaration;
+
+       cds_list_for_each_entry(expression, expressions, siblings) {
+               struct node *left, *right;
+
+               left = expression->u.ctf_expression.left;
+               right = expression->u.ctf_expression.right;
+               assert(left->u.unary_expression.type == UNARY_STRING);
+               if (!strcmp(left->u.unary_expression.u.string, "byte_order")) {
+                       byte_order = get_byte_order(fd, depth, right);
+                       if (byte_order < 0)
+                               return NULL;
+               } else if (!strcmp(left->u.unary_expression.u.string, "exp_dig")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
+                               fprintf(stderr, "[error] %s: exp_dig: expecting unsigned constant\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       exp_dig = right->u.unary_expression.u.unsigned_constant;
+                       has_exp_dig = 1;
+               } else if (!strcmp(left->u.unary_expression.u.string, "mant_dig")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
+                               fprintf(stderr, "[error] %s: mant_dig: expecting unsigned constant\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       mant_dig = right->u.unary_expression.u.unsigned_constant;
+                       has_mant_dig = 1;
+               } else if (!strcmp(left->u.unary_expression.u.string, "align")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
+                               fprintf(stderr, "[error] %s: align: expecting unsigned constant\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       alignment = right->u.unary_expression.u.unsigned_constant;
+                       has_alignment = 1;
+               } else {
+                       fprintf(stderr, "[error] %s: unknown attribute name %s\n",
+                               __func__, left->u.unary_expression.u.string);
+                       return NULL;
+               }
+       }
+       if (!has_mant_dig) {
+               fprintf(stderr, "[error] %s: missing mant_dig attribute\n", __func__);
+               return NULL;
+       }
+       if (!has_exp_dig) {
+               fprintf(stderr, "[error] %s: missing exp_dig attribute\n", __func__);
+               return NULL;
+       }
+       if (!has_alignment) {
+               if ((mant_dig + exp_dig) % CHAR_BIT) {
+                       /* bit-packed alignment */
+                       alignment = 1;
+               } else {
+                       /* byte-packed alignment */
+                       alignment = CHAR_BIT;
+               }
+       }
+       float_declaration = float_declaration_new(mant_dig, exp_dig,
+                               byte_order, alignment);
+       return &float_declaration->p;
+}
+
+static
+struct declaration *ctf_declaration_string_visit(int fd, int depth,
+               struct cds_list_head *expressions,
+               struct ctf_trace *trace)
+{
+       struct node *expression;
+       const char *encoding_c = NULL;
+       enum ctf_string_encoding encoding = CTF_STRING_UTF8;
+       struct declaration_string *string_declaration;
+
+       cds_list_for_each_entry(expression, expressions, siblings) {
+               struct node *left, *right;
+
+               left = expression->u.ctf_expression.left;
+               right = expression->u.ctf_expression.right;
+               assert(left->u.unary_expression.type == UNARY_STRING);
+               if (!strcmp(left->u.unary_expression.u.string, "encoding")) {
+                       if (right->u.unary_expression.type != UNARY_UNSIGNED_STRING) {
+                               fprintf(stderr, "[error] %s: encoding: expecting string\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       encoding_c = right->u.unary_expression.u.string;
+               } else {
+                       fprintf(stderr, "[error] %s: unknown attribute name %s\n",
+                               __func__, left->u.unary_expression.u.string);
+                       return NULL;
+               }
+       }
+       if (encoding_c && !strcmp(encoding_c, "ASCII"))
+               encoding = CTF_STRING_ASCII;
+       string_declaration = string_declaration_new(encoding);
+       return &string_declaration->p;
+}
+
+
+/*
+ * Also add named variant, struct or enum to the current declaration scope.
+ */
+static
+struct declaration *ctf_declaration_specifier_visit(FILE *fd,
+               int depth, struct cds_list_head *head,
+               struct declaration_scope *declaration_scope,
+               struct ctf_trace *trace)
+{
+       struct declaration *declaration;
+       struct node *first;
+
+       first = _cds_list_first_entry(head, struct node, siblings);
+
+       switch (first->type) {
+       case NODE_STRUCT:
+               return ctf_declaration_struct_visit(fd, depth,
+                       first->u._struct.name,
+                       &first->u._struct.declaration_list,
+                       first->u._struct.has_body,
+                       declaration_scope,
+                       trace);
+       case NODE_VARIANT:
+               return ctf_declaration_variant_visit(fd, depth,
+                       first->u.variant.name,
+                       &first->u.variant.declaration_list,
+                       first->u.variant.has_body,
+                       declaration_scope,
+                       trace);
+       case NODE_ENUM:
+               return ctf_declaration_enum_visit(fd, depth,
+                       first->u._enum.enum_id,
+                       first->u._enum.container_type,
+                       &first->u._enum.enumerator_list,
+                       first->u._enum.has_body,
+                       trace);
+       case NODE_INTEGER:
+               return ctf_declaration_integer_visit(fd, depth,
+                       &first->u.integer.expressions, trace);
+       case NODE_FLOATING_POINT:
+               return ctf_declaration_floating_point_visit(fd, depth,
+                       &first->u.floating_point.expressions, trace);
+       case NODE_STRING:
+               return ctf_declaration_string_visit(fd, depth,
+                       &first->u.string.expressions, trace);
+       case NODE_TYPE_SPECIFIER:
+               return ctf_declaration_type_specifier_visit(fd, depth,
+                               head, declaration_scope, trace);
+       }
 }
 
 static
@@ -334,14 +1038,14 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                ret = ctf_typedef_visit(fd, depth + 1,
                                        &node->u._typedef.declaration_specifier,
                                        &node->u._typedef.type_declarators,
-                                       event->type_scope, event->declaration_scope);
+                                       event->declaration_scope);
                if (ret)
                        return ret;
                break;
        case NODE_TYPEALIAS:
                ret = ctf_typealias_visit(fd, depth + 1,
                                &node->u.typealias.target, &node->u.typealias.alias
-                               event->type_scope, event->declaration_scope);
+                               event->declaration_scope);
                if (ret)
                        return ret;
                break;
@@ -361,7 +1065,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                return -EINVAL;
                        }
                        event->name = g_quark_from_string(right);
-                       free(right);
+                       g_free(right);
                        CTF_EVENT_SET_FIELD(event, name);
                } else if (!strcmp(left, "id")) {
                        if (CTF_EVENT_FIELD_IS_SET(event, id))
@@ -385,40 +1089,35 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                fprintf(stderr, "[error] %s: stream id %" PRIu64 " cannot be found\n", __func__, event->stream_id);
                                return -EINVAL;
                        }
-                       event->declaration_scope = new_declaration_scope(stream->declaration_scope);
-                       if (!event->declaration_scope) {
-                               fprintf(stderr, "[error] %s: Error allocating declaration scope\n", __func__);
-                               return -EPERM;
-                       }
                        CTF_EVENT_SET_FIELD(event, stream_id);
                } else if (!strcmp(left, "context")) {
                        struct declaration *declaration;
 
-                       if (!event->declaration_scope)
+                       if (!event->definition_scope)
                                return -EPERM;
                        declaration = ctf_declaration_specifier_visit(fd, depth,
                                        &node->u.ctf_expression.right,
-                                       event->type_scope, event->declaration_scope);
+                                       event->declaration_scope, trace);
                        if (!declaration)
                                return -EPERM;
                        if (declaration->type->id != CTF_TYPE_STRUCT)
                                return -EPERM;
-                       event->context = container_of(declaration, struct declaration_struct, p);
+                       event->context_decl = container_of(declaration, struct declaration_struct, p);
                } else if (!strcmp(left, "fields")) {
                        struct declaration *declaration;
 
-                       if (!event->declaration_scope)
+                       if (!event->definition_scope)
                                return -EPERM;
                        declaration = ctf_declaration_specifier_visit(fd, depth,
                                        &node->u.ctf_expression.right,
-                                       event->type_scope, event->declaration_scope);
+                                       event->declaration_scope, trace);
                        if (!declaration)
                                return -EPERM;
                        if (declaration->type->id != CTF_TYPE_STRUCT)
                                return -EPERM;
-                       event->fields = container_of(declaration, struct declaration_struct, p);
+                       event->fields_decl = container_of(declaration, struct declaration_struct, p);
                }
-               free(left);
+               g_free(left);
                break;
        }
        default:
@@ -431,14 +1130,15 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
 
 static
 int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
-                   struct type_scope *parent_type_scope, struct ctf_trace *trace)
+                   struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace)
 {
        int ret = 0;
        struct ctf_node *iter;
        struct ctf_event *event;
+       struct definition_scope *parent_def_scope;
 
        event = g_new0(struct ctf_event, 1);
-       event->type_scope = new_type_scope(parent_type_scope);
+       event->declaration_scope = new_declaration_scope(parent_declaration_scope);
        cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
                ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace);
                if (ret)
@@ -462,13 +1162,34 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
        g_hash_table_insert(event->stream->event_quark_to_id,
                            (gpointer)(unsigned long) event->name,
                            &event->id);
+       parent_def_scope = stream->definition_scope;
+       if (event->context_decl) {
+               event->context =
+                       event->context_decl->definition_new(event->context_decl,
+                               parent_def_scope, 0, 0);
+               set_dynamic_definition_scope(&event->context->p,
+                                            event->context->scope,
+                                            "event.context");
+               parent_def_scope = event->context->scope;
+               declaration_unref(event->context_decl);
+       }
+       if (event->fields_decl) {
+               event->fields =
+                       event->fields_decl->definition_new(event->fields_decl,
+                               parent_def_scope, 0, 0);
+               set_dynamic_definition_scope(&event->fields->p,
+                                            event->fields->scope,
+                                            "event.fields");
+               parent_def_scope = event->fields->scope;
+               declaration_unref(event->fields_decl);
+       }
        return 0;
 
 error:
-       declaration_unref(event->fields);
-       declaration_unref(event->context);
+       declaration_unref(event->fields_decl);
+       declaration_unref(event->context_decl);
+       free_definition_scope(event->definition_scope);
        free_declaration_scope(event->declaration_scope);
-       free_type_scope(event->type_scope);
        g_free(event);
        return ret;
 }
@@ -484,14 +1205,14 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
                ret = ctf_typedef_visit(fd, depth + 1,
                                        &node->u._typedef.declaration_specifier,
                                        &node->u._typedef.type_declarators,
-                                       stream->type_scope, stream->declaration_scope);
+                                       stream->declaration_scope);
                if (ret)
                        return ret;
                break;
        case NODE_TYPEALIAS:
                ret = ctf_typealias_visit(fd, depth + 1,
                                &node->u.typealias.target, &node->u.typealias.alias
-                               stream->type_scope, stream->declaration_scope);
+                               stream->declaration_scope);
                if (ret)
                        return ret;
                break;
@@ -509,41 +1230,41 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
                                return -EINVAL;
                        }
                        CTF_EVENT_SET_FIELD(event, stream_id);
-               } else if (!strcmp(left, "event_header")) {
+               } else if (!strcmp(left, "event.header")) {
                        struct declaration *declaration;
 
                        declaration = ctf_declaration_specifier_visit(fd, depth,
                                        &node->u.ctf_expression.right,
-                                       stream->type_scope, stream->declaration_scope);
+                                       stream->declaration_scope, stream->definition_scope, trace);
                        if (!declaration)
                                return -EPERM;
                        if (declaration->type->id != CTF_TYPE_STRUCT)
                                return -EPERM;
-                       stream->event_header = container_of(declaration, struct declaration_struct, p);
-               } else if (!strcmp(left, "event_context")) {
+                       stream->event_header_decl = container_of(declaration, struct declaration_struct, p);
+               } else if (!strcmp(left, "event.context")) {
                        struct declaration *declaration;
 
                        declaration = ctf_declaration_specifier_visit(fd, depth,
                                        &node->u.ctf_expression.right,
-                                       stream->type_scope, stream->declaration_scope);
+                                       stream->declaration_scope, trace);
                        if (!declaration)
                                return -EPERM;
                        if (declaration->type->id != CTF_TYPE_STRUCT)
                                return -EPERM;
-                       stream->event_context = container_of(declaration, struct declaration_struct, p);
-               } else if (!strcmp(left, "packet_context")) {
+                       stream->event_context_decl = container_of(declaration, struct declaration_struct, p);
+               } else if (!strcmp(left, "packet.context")) {
                        struct declaration *declaration;
 
                        declaration = ctf_declaration_specifier_visit(fd, depth,
                                        &node->u.ctf_expression.right,
-                                       stream->type_scope, stream->declaration_scope);
+                                       stream->declaration_scope, trace);
                        if (!declaration)
                                return -EPERM;
                        if (declaration->type->id != CTF_TYPE_STRUCT)
                                return -EPERM;
-                       stream->packet_context = container_of(declaration, struct declaration_struct, p);
+                       stream->packet_context_decl = container_of(declaration, struct declaration_struct, p);
                }
-               free(left);
+               g_free(left);
                break;
        }
        default:
@@ -556,15 +1277,15 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
 
 static
 int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
-                    struct type_scope *parent_type_scope, struct ctf_trace *trace)
+                    struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace)
 {
        int ret = 0;
        struct ctf_node *iter;
        struct ctf_stream *stream;
+       struct definition_scope *parent_def_scope;
 
        stream = g_new0(struct ctf_stream, 1);
-       stream->type_scope = new_type_scope(parent_type_scope);
-       stream->declaration_scope = new_declaration_scope(trace->declaration_scope);
+       stream->declaration_scope = new_declaration_scope(parent_declaration_scope);
        stream->events_by_id = g_ptr_array_new();
        stream->event_quark_to_id = g_hash_table_new(g_int_hash, g_int_equal);
        cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
@@ -579,6 +1300,40 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
        if (trace->streams->len <= stream->stream_id)
                g_ptr_array_set_size(trace->streams, stream->stream_id + 1);
        g_ptr_array_index(trace->streams, stream->stream_id) = stream;
+
+       parent_def_scope = NULL;
+       if (stream->packet_context_decl) {
+               stream->packet_context =
+                       stream->packet_context_decl->definition_new(stream->packet_context_decl,
+                               parent_def_scope, 0, 0);
+               set_dynamic_definition_scope(&stream->packet_context->p,
+                                            stream->packet_context->scope,
+                                            "stream.packet.context");
+               parent_def_scope = stream->packet_context->scope;
+               declaration_unref(stream->packet_context_decl);
+       }
+       if (stream->event_header_decl) {
+               stream->event_header =
+                       stream->event_header_decl->definition_new(stream->event_header_decl,
+                               parent_def_scope, 0, 0);
+               set_dynamic_definition_scope(&stream->event_header->p,
+                                            stream->event_header->scope,
+                                            "stream.event.header");
+               parent_def_scope = stream->event_header->scope;
+               declaration_unref(stream->event_header_decl);
+       }
+       if (stream->event_context_decl) {
+               stream->event_context =
+                       stream->event_context_decl->definition_new(stream->event_context_decl,
+                               parent_def_scope, 0, 0);
+               set_dynamic_definition_scope(&stream->event_context->p,
+                                            stream->event_context->scope,
+                                            "stream.event.context");
+               parent_def_scope = stream->event_context->scope;
+               declaration_unref(stream->event_context_decl);
+       }
+       stream->definition_scope = parent_def_scope;
+
        return 0;
 
 error:
@@ -587,8 +1342,8 @@ error:
        declaration_unref(stream->packet_context);
        g_ptr_array_free(stream->events_by_id, TRUE);
        g_hash_table_free(stream->event_quark_to_id);
+       free_definition_scope(stream->definition_scope);
        free_declaration_scope(stream->declaration_scope);
-       free_type_scope(stream->type_scope);
        g_free(stream);
        return ret;
 }
@@ -603,14 +1358,14 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                ret = ctf_typedef_visit(fd, depth + 1,
                                        &node->u._typedef.declaration_specifier,
                                        &node->u._typedef.type_declarators,
-                                       trace->type_scope, trace->declaration_scope);
+                                       trace->declaration_scope);
                if (ret)
                        return ret;
                break;
        case NODE_TYPEALIAS:
                ret = ctf_typealias_visit(fd, depth + 1,
                                &node->u.typealias.target, &node->u.typealias.alias
-                               trace->type_scope, trace->declaration_scope);
+                               trace->declaration_scope);
                if (ret)
                        return ret;
                break;
@@ -656,7 +1411,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                        }
                        CTF_EVENT_SET_FIELD(trace, uuid);
                }
-               free(left);
+               g_free(left);
                break;
        }
        default:
@@ -667,17 +1422,16 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
        return 0;
 }
 
-
 static
 int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
 {
        int ret = 0;
        struct ctf_node *iter;
 
-       if (trace->type_scope)
+       if (trace->declaration_scope)
                return -EEXIST;
-       trace->type_scope = new_type_scope(trace->root_type_scope);
        trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope);
+       trace->definition_scope = new_dynamic_definition_scope(trace->root_definition_scope);
        trace->streams = g_ptr_array_new();
        cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
                ret = ctf_trace_declaration_visit(fd, depth + 1, iter, trace);
@@ -704,16 +1458,19 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 
 error:
        g_ptr_array_free(trace->streams, TRUE);
+       free_definition_scope(stream->definition_scope);
        free_declaration_scope(stream->declaration_scope);
-       free_type_scope(stream->type_scope);
        return ret;
 }
 
-int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
+int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
+               struct ctf_trace *trace, int byte_order)
 {
        int ret = 0;
        struct ctf_node *iter;
 
+       trace->byte_order = byte_order;
+
        switch (node->type) {
        case NODE_ROOT:
                cds_list_for_each_entry(iter, &node->u.root._typedef,
@@ -721,7 +1478,7 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                        ret = ctf_typedef_visit(fd, depth + 1,
                                                &iter->u._typedef.declaration_specifier,
                                                &iter->u._typedef.type_declarators,
-                                               trace->type_scope, trace->declaration_scope);
+                                               trace->root_declaration_scope);
                        if (ret)
                                return ret;
                }
@@ -729,14 +1486,13 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                                        siblings) {
                        ret = ctf_typealias_visit(fd, depth + 1,
                                        &iter->u.typealias.target, &iter->u.typealias.alias
-                                       trace->type_scope, trace->declaration_scope);
+                                       trace->root_declaration_scope);
                        if (ret)
                                return ret;
                }
                cds_list_for_each_entry(iter, &node->u.root.declaration_specifier, siblings) {
                        ret = ctf_declaration_specifier_visit(fd, depth, iter,
-                                       trace->root_type_scope,
-                                       trace->root_declaration_scope);
+                                       trace->root_declaration_scope, trace);
                        if (ret)
                                return ret;
                }
@@ -747,240 +1503,17 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                }
                cds_list_for_each_entry(iter, &node->u.root.stream, siblings) {
                        ret = ctf_stream_visit(fd, depth + 1, iter,
-                                              trace->type_scope, trace);
+                                              trace->root_declaration_scope, trace);
                        if (ret)
                                return ret;
                }
                cds_list_for_each_entry(iter, &node->u.root.event, siblings) {
                        ret = ctf_event_visit(fd, depth + 1, iter,
-                                             trace->type_scope, trace);
-                       if (ret)
-                               return ret;
-               }
-               break;
-
-       case NODE_TYPEALIAS_TARGET:
-               print_tabs(fd, depth);
-               fprintf(fd, "<target>\n");
-               depth++;
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_target.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</target>\n");
-               break;
-       case NODE_TYPEALIAS_ALIAS:
-               print_tabs(fd, depth);
-               fprintf(fd, "<alias>\n");
-               depth++;
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_alias.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
+                                             trace->root_declaration_scope, trace);
                        if (ret)
                                return ret;
                }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</alias>\n");
                break;
-       case NODE_TYPEALIAS:
-               print_tabs(fd, depth);
-               fprintf(fd, "<typealias>\n");
-               ret = ctf_visitor_print_xml(fd, depth + 1, node->u.typealias.target);
-               if (ret)
-                       return ret;
-               ret = ctf_visitor_print_xml(fd, depth + 1, node->u.typealias.alias);
-               if (ret)
-                       return ret;
-               print_tabs(fd, depth);
-               fprintf(fd, "</typealias>\n");
-               break;
-
-       case NODE_TYPE_SPECIFIER:
-               ret = ctf_visitor_print_type_specifier(fd, depth, node);
-               if (ret)
-                       return ret;
-               break;
-       case NODE_POINTER:
-               print_tabs(fd, depth);
-               if (node->u.pointer.const_qualifier)
-                       fprintf(fd, "<const_pointer />\n");
-               else
-                       fprintf(fd, "<pointer />\n");
-               break;
-       case NODE_TYPE_DECLARATOR:
-               ret = ctf_visitor_print_type_declarator(fd, depth, node);
-               if (ret)
-                       return ret;
-               break;
-
-       case NODE_FLOATING_POINT:
-               print_tabs(fd, depth);
-               fprintf(fd, "<floating_point>\n");
-               cds_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</floating_point>\n");
-               break;
-       case NODE_INTEGER:
-               print_tabs(fd, depth);
-               fprintf(fd, "<integer>\n");
-               cds_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</integer>\n");
-               break;
-       case NODE_STRING:
-               print_tabs(fd, depth);
-               fprintf(fd, "<string>\n");
-               cds_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</string>\n");
-               break;
-       case NODE_ENUMERATOR:
-               print_tabs(fd, depth);
-               fprintf(fd, "<enumerator");
-               if (node->u.enumerator.id)
-                       fprintf(fd, " id=\"%s\"", node->u.enumerator.id);
-               fprintf(fd, ">\n");
-               cds_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</enumerator>\n");
-               break;
-       case NODE_ENUM:
-               print_tabs(fd, depth);
-               if (node->u._struct.name)
-                       fprintf(fd, "<enum name=\"%s\">\n",
-                               node->u._enum.enum_id);
-               else
-                       fprintf(fd, "<enum >\n");
-               depth++;
-
-               if (node->u._enum.container_type) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<container_type>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1, node->u._enum.container_type);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</container_type>\n");
-               }
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<enumerator_list>\n");
-               cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</enumerator_list>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</enum>\n");
-               break;
-       case NODE_STRUCT_OR_VARIANT_DECLARATION:
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-               break;
-       case NODE_VARIANT:
-               print_tabs(fd, depth);
-               fprintf(fd, "<variant");
-               if (node->u.variant.name)
-                       fprintf(fd, " name=\"%s\"", node->u.variant.name);
-               if (node->u.variant.choice)
-                       fprintf(fd, " choice=\"%s\"", node->u.variant.choice);
-               fprintf(fd, ">\n");
-               cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</variant>\n");
-               break;
-       case NODE_STRUCT:
-               print_tabs(fd, depth);
-               if (node->u._struct.name)
-                       fprintf(fd, "<struct name=\"%s\">\n",
-                               node->u._struct.name);
-               else
-                       fprintf(fd, "<struct>\n");
-               cds_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</struct>\n");
-               break;
-
        case NODE_UNKNOWN:
        default:
                fprintf(stderr, "[error] %s: unknown node type %d\n", __func__,
This page took 0.045378 seconds and 4 git commands to generate.