Update pretty-print

[babeltrace.git] / types / types.c

diff --git a/types/types.c b/types/types.c
index 327ddbb3a1102976ebcb3733affd547eba7cf660..7369f30d09ffb5a272c3d54f14e5466ac3b005b2 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -1,5 +1,5 @@
 /*
- * declarations.c
+ * types.c
  *
  * BabelTrace - Converter
  *
@@ -24,37 +24,49 @@
 #include <errno.h>
 
 static
-struct definition *
-       lookup_typedef_declaration_scope(GQuark declaration_name,
+GQuark prefix_quark(const char *prefix, GQuark quark)
+{
+       GQuark nq;
+       GString *str;
+
+       str = g_string_new(prefix);
+       g_string_append(str, g_quark_to_string(quark));
+       nq = g_quark_from_string(g_string_free(str, FALSE));
+       return nq;
+}
+
+static
+struct declaration *
+       lookup_declaration_scope(GQuark declaration_name,
                struct declaration_scope *scope)
 {
        return g_hash_table_lookup(scope->typedef_declarations,
                                   (gconstpointer) (unsigned long) declaration_name);
 }
 
-struct definition *lookup_typedef_declaration(GQuark declaration_name,
+struct declaration *lookup_declaration(GQuark declaration_name,
                struct declaration_scope *scope)
 {
-       struct definition *definition;
+       struct declaration *declaration;
 
        while (scope) {
-               definition = lookup_typedef_declaration_scope(declaration_name,
-                                                             scope);
-               if (definition)
-                       return definition;
+               declaration = lookup_declaration_scope(declaration_name,
+                                                      scope);
+               if (declaration)
+                       return declaration;
                scope = scope->parent_scope;
        }
        return NULL;
 }
 
-int register_typedef_declaration(GQuark name, struct declaration *declaration,
+int register_declaration(GQuark name, struct declaration *declaration,
                struct declaration_scope *scope)
 {
        if (!name)
                return -EPERM;
 
        /* Only lookup in local scope */
-       if (lookup_typedef_declaration_scope(name, scope))
+       if (lookup_declaration_scope(name, scope))
                return -EEXIST;
 
        g_hash_table_insert(scope->typedef_declarations,
@@ -243,6 +255,8 @@ void declaration_ref(struct declaration *declaration)
 
 void declaration_unref(struct declaration *declaration)
 {
+       if (!declaration)
+               return;
        if (!--declaration->ref)
                declaration->declaration_free(declaration);
 }
@@ -254,6 +268,8 @@ void definition_ref(struct definition *definition)
 
 void definition_unref(struct definition *definition)
 {
+       if (!definition)
+               return;
        if (!--definition->ref)
                definition->declaration->definition_free(definition);
 }
@@ -314,6 +330,9 @@ int register_struct_declaration(GQuark struct_name,
        struct declaration_struct *struct_declaration,
        struct declaration_scope *scope)
 {
+       GQuark prefix_name;
+       int ret;
+
        if (!struct_name)
                return -EPERM;
 
@@ -325,6 +344,11 @@ int register_struct_declaration(GQuark struct_name,
                            (gpointer) (unsigned long) struct_name,
                            struct_declaration);
        declaration_ref(&struct_declaration->p);
+
+       /* Also add in typedef/typealias scopes */
+       prefix_name = prefix_quark("struct ", struct_name);
+       ret = register_declaration(prefix_name, &struct_declaration->p, scope);
+       assert(!ret);
        return 0;
 }
 
@@ -356,6 +380,9 @@ int register_variant_declaration(GQuark variant_name,
                struct declaration_untagged_variant *untagged_variant_declaration,
                struct declaration_scope *scope)
 {
+       GQuark prefix_name;
+       int ret;
+
        if (!variant_name)
                return -EPERM;
 
@@ -367,6 +394,12 @@ int register_variant_declaration(GQuark variant_name,
                            (gpointer) (unsigned long) variant_name,
                            untagged_variant_declaration);
        declaration_ref(&untagged_variant_declaration->p);
+
+       /* Also add in typedef/typealias scopes */
+       prefix_name = prefix_quark("variant ", variant_name);
+       ret = register_declaration(prefix_name,
+                       &untagged_variant_declaration->p, scope);
+       assert(!ret);
        return 0;
 }
 
@@ -398,6 +431,9 @@ int register_enum_declaration(GQuark enum_name,
                struct declaration_enum *enum_declaration,
                struct declaration_scope *scope)
 {
+       GQuark prefix_name;
+       int ret;
+
        if (!enum_name)
                return -EPERM;
 
@@ -409,6 +445,11 @@ int register_enum_declaration(GQuark enum_name,
                            (gpointer) (unsigned long) enum_name,
                            enum_declaration);
        declaration_ref(&enum_declaration->p);
+
+       /* Also add in typedef/typealias scopes */
+       prefix_name = prefix_quark("enum ", enum_name);
+       ret = register_declaration(prefix_name, &enum_declaration->p, scope);
+       assert(!ret);
        return 0;
 }
 
@@ -428,6 +469,30 @@ static struct definition_scope *
        return scope;
 }
 
+GQuark new_definition_path(struct definition_scope *parent_scope, GQuark field_name)
+{
+       GQuark path;
+       GString *str;
+       gchar *c_str;
+       int i;
+
+       str = g_string_new("");
+       if (parent_scope) {
+               for (i = 0; i < parent_scope->scope_path->len; i++) {
+                       GQuark q = g_array_index(parent_scope->scope_path,
+                                                GQuark, i);
+
+                       g_string_append(str, g_quark_to_string(q));
+                       g_string_append(str, ".");
+               }
+       }
+       g_string_append(str, g_quark_to_string(field_name));
+       c_str = g_string_free(str, FALSE);
+       path = g_quark_from_string(c_str);
+       g_free(c_str);
+       return path;
+}
+
 struct definition_scope *
        new_definition_scope(struct definition_scope *parent_scope,
                             GQuark field_name)
@@ -471,6 +536,7 @@ void append_scope_path(const char *path, GArray *q)
                quark = g_quark_from_string(str);
                g_array_append_val(q, quark);
                g_free(str);
+               ptrend++;       /* skip current dot */
        }
        /* last. Check for trailing dot (and discard). */
        if (ptrbegin[0] != '\0') {