projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add type_specifier list node
[babeltrace.git] / formats / ctf / metadata / ctf-visitor-xml.c
diff --git a/formats/ctf/metadata/ctf-visitor-xml.c b/formats/ctf/metadata/ctf-visitor-xml.c
index 22829d9b47401ab1132cfcf0465fb113267bdce4..d1c0751c51e3c8c548144c087cd1834c05d6fa52 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-xml.c
+++ b/formats/ctf/metadata/ctf-visitor-xml.c
@@ -21,16 +21,18 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <helpers/list.h>
 #include <glib.h>
+#include <inttypes.h>
 #include <errno.h>
+#include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-#define printf_dbg(fmt, args...)       fprintf(stderr, "%s: " fmt, __func__, ## args)
+#define fprintf_dbg(fd, fmt, args...)  fprintf(fd, "%s: " fmt, __func__, ## args)
 
-static void print_tabs(FILE *fd, int depth)
+static
+void print_tabs(FILE *fd, int depth)
 {
        int i;
 
@@ -38,6 +40,7 @@ static void print_tabs(FILE *fd, int depth)
                fprintf(fd, "\t");
 }
 
+static
 int ctf_visitor_print_unary_expression(FILE *fd, int depth, struct ctf_node *node)
 {
        int ret = 0;
@@ -73,34 +76,34 @@ int ctf_visitor_print_unary_expression(FILE *fd, int depth, struct ctf_node *nod
        case UNARY_SIGNED_CONSTANT:
                print_tabs(fd, depth);
                fprintf(fd, "<unary_expression value=");
-               fprintf(fd, "%lld", node->u.unary_expression.u.signed_constant);
+               fprintf(fd, "%" PRId64, node->u.unary_expression.u.signed_constant);
                fprintf(fd, " />\n");
                break;
        case UNARY_UNSIGNED_CONSTANT:
                print_tabs(fd, depth);
                fprintf(fd, "<unary_expression value=");
-               fprintf(fd, "%llu", node->u.unary_expression.u.signed_constant);
+               fprintf(fd, "%" PRIu64, node->u.unary_expression.u.signed_constant);
                fprintf(fd, " />\n");
                break;
        case UNARY_SBRAC:
                print_tabs(fd, depth);
-               fprintf(fd, "<unary_expression_sbrac>");
+               fprintf(fd, "<unary_expression_sbrac>\n");
                ret = ctf_visitor_print_unary_expression(fd, depth + 1,
                        node->u.unary_expression.u.sbrac_exp);
                if (ret)
                        return ret;
                print_tabs(fd, depth);
-               fprintf(fd, "</unary_expression_sbrac>");
+               fprintf(fd, "</unary_expression_sbrac>\n");
                break;
        case UNARY_NESTED:
                print_tabs(fd, depth);
-               fprintf(fd, "<unary_expression_nested>");
+               fprintf(fd, "<unary_expression_nested>\n");
                ret = ctf_visitor_print_unary_expression(fd, depth + 1,
                        node->u.unary_expression.u.nested_exp);
                if (ret)
                        return ret;
                print_tabs(fd, depth);
-               fprintf(fd, "</unary_expression_nested>");
+               fprintf(fd, "</unary_expression_nested>\n");
                break;
 
        case UNARY_UNKNOWN:
@@ -112,10 +115,61 @@ int ctf_visitor_print_unary_expression(FILE *fd, int depth, struct ctf_node *nod
        return 0;
 }
 
+static
+int ctf_visitor_print_type_specifier_list(FILE *fd, int depth, struct ctf_node *node)
+{
+       struct ctf_node *iter;
+       int ret;
+
+       print_tabs(fd, depth);
+       fprintf(fd, "<type_specifier_list>\n");
+       cds_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) {
+               ret = ctf_visitor_print_xml(fd, depth + 1, iter);
+               if (ret)
+                       return ret;
+       }
+       print_tabs(fd, depth);
+       fprintf(fd, "</type_specifier_list>\n");
+       return 0;
+}
+
+static
 int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 {
        print_tabs(fd, depth);
-       fprintf(fd, "<type_specifier \"");
+
+       switch (node->u.type_specifier.type) {
+       case TYPESPEC_VOID:
+       case TYPESPEC_CHAR:
+       case TYPESPEC_SHORT:
+       case TYPESPEC_INT:
+       case TYPESPEC_LONG:
+       case TYPESPEC_FLOAT:
+       case TYPESPEC_DOUBLE:
+       case TYPESPEC_SIGNED:
+       case TYPESPEC_UNSIGNED:
+       case TYPESPEC_BOOL:
+       case TYPESPEC_COMPLEX:
+       case TYPESPEC_IMAGINARY:
+       case TYPESPEC_CONST:
+       case TYPESPEC_ID_TYPE:
+               fprintf(fd, "<type_specifier \"");
+               break;
+       case TYPESPEC_FLOATING_POINT:
+       case TYPESPEC_INTEGER:
+       case TYPESPEC_STRING:
+       case TYPESPEC_STRUCT:
+       case TYPESPEC_VARIANT:
+       case TYPESPEC_ENUM:
+               fprintf(fd, "<type_specifier>\n");
+               depth++;
+               break;
+       case TYPESPEC_UNKNOWN:
+       default:
+               fprintf(stderr, "[error] %s: unknown type specifier %d\n", __func__,
+                       (int) node->u.type_specifier.type);
+               return -EINVAL;
+       }
 
        switch (node->u.type_specifier.type) {
        case TYPESPEC_VOID:
@@ -149,7 +203,10 @@ int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
                fprintf(fd, "bool");
                break;
        case TYPESPEC_COMPLEX:
-               fprintf(fd, "complex");
+               fprintf(fd, "_Complex");
+               break;
+       case TYPESPEC_IMAGINARY:
+               fprintf(fd, "_Imaginary");
                break;
        case TYPESPEC_CONST:
                fprintf(fd, "const");
@@ -157,17 +214,58 @@ int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
        case TYPESPEC_ID_TYPE:
                fprintf(fd, "%s", node->u.type_specifier.id_type);
                break;
+       case TYPESPEC_FLOATING_POINT:
+       case TYPESPEC_INTEGER:
+       case TYPESPEC_STRING:
+       case TYPESPEC_STRUCT:
+       case TYPESPEC_VARIANT:
+       case TYPESPEC_ENUM:
+               return ctf_visitor_print_xml(fd, depth, node->u.type_specifier.node);
+       case TYPESPEC_UNKNOWN:
+       default:
+               fprintf(stderr, "[error] %s: unknown type specifier %d\n", __func__,
+                       (int) node->u.type_specifier.type);
+               return -EINVAL;
+       }
 
+       switch (node->u.type_specifier.type) {
+       case TYPESPEC_VOID:
+       case TYPESPEC_CHAR:
+       case TYPESPEC_SHORT:
+       case TYPESPEC_INT:
+       case TYPESPEC_LONG:
+       case TYPESPEC_FLOAT:
+       case TYPESPEC_DOUBLE:
+       case TYPESPEC_SIGNED:
+       case TYPESPEC_UNSIGNED:
+       case TYPESPEC_BOOL:
+       case TYPESPEC_COMPLEX:
+       case TYPESPEC_IMAGINARY:
+       case TYPESPEC_CONST:
+       case TYPESPEC_ID_TYPE:
+               fprintf(fd, "\"/>\n");
+               break;
+       case TYPESPEC_FLOATING_POINT:
+       case TYPESPEC_INTEGER:
+       case TYPESPEC_STRING:
+       case TYPESPEC_STRUCT:
+       case TYPESPEC_VARIANT:
+       case TYPESPEC_ENUM:
+               print_tabs(fd, depth);
+               fprintf(fd, "</type_specifier>\n");
+               depth--;
+               break;
        case TYPESPEC_UNKNOWN:
        default:
                fprintf(stderr, "[error] %s: unknown type specifier %d\n", __func__,
                        (int) node->u.type_specifier.type);
                return -EINVAL;
        }
-       fprintf(fd, "\"/>\n");
+
        return 0;
 }
 
+static
 int ctf_visitor_print_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 {
        int ret = 0;
@@ -192,10 +290,12 @@ int ctf_visitor_print_type_declarator(FILE *fd, int depth, struct ctf_node *node
 
        switch (node->u.type_declarator.type) {
        case TYPEDEC_ID:
-               print_tabs(fd, depth);
-               fprintf(fd, "<id \"");
-               fprintf(fd, "%s", node->u.type_declarator.u.id);
-               fprintf(fd, "\" />\n");
+               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) {
@@ -211,8 +311,7 @@ int ctf_visitor_print_type_declarator(FILE *fd, int depth, struct ctf_node *node
                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);
+                       ret = ctf_visitor_print_xml(fd, depth + 1, node->u.type_declarator.u.nested.length);
                        if (ret)
                                return ret;
                        print_tabs(fd, depth);
@@ -257,23 +356,12 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
        case NODE_ROOT:
                print_tabs(fd, depth);
                fprintf(fd, "<root>\n");
-               cds_list_for_each_entry(iter, &node->u.root._typedef,
+               cds_list_for_each_entry(iter, &node->u.root.declaration_list,
                                        siblings) {
                        ret = ctf_visitor_print_xml(fd, depth + 1, iter);
                        if (ret)
                                return ret;
                }
-               cds_list_for_each_entry(iter, &node->u.root.typealias,
-                                       siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               cds_list_for_each_entry(iter, &node->u.root.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
                cds_list_for_each_entry(iter, &node->u.root.trace, siblings) {
                        ret = ctf_visitor_print_xml(fd, depth + 1, iter);
                        if (ret)
@@ -362,25 +450,19 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                print_tabs(fd, depth);
                fprintf(fd, "<typedef>\n");
                depth++;
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u._typedef.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");
+               ret = ctf_visitor_print_xml(fd, depth + 1, node->u._typedef.type_specifier_list);
+               if (ret)
+                       return ret;
 
                print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
+               fprintf(fd, "<type_declarator_list>\n");
                cds_list_for_each_entry(iter, &node->u._typedef.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");
+               fprintf(fd, "</type_declarator_list>\n");
                depth--;
                print_tabs(fd, depth);
                fprintf(fd, "</typedef>\n");
@@ -390,25 +472,19 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                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");
+               ret = ctf_visitor_print_xml(fd, depth, node->u.typealias_target.type_specifier_list);
+               if (ret)
+                       return ret;
 
                print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
+               fprintf(fd, "<type_declarator_list>\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");
+               fprintf(fd, "</type_declarator_list>\n");
 
                depth--;
                print_tabs(fd, depth);
@@ -419,25 +495,19 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                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);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
+               ret = ctf_visitor_print_xml(fd, depth, node->u.typealias_alias.type_specifier_list);
+               if (ret)
+                       return ret;
 
                print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
+               fprintf(fd, "<type_declarator_list>\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");
+               fprintf(fd, "</type_declarator_list>\n");
 
                depth--;
                print_tabs(fd, depth);
@@ -456,6 +526,12 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                fprintf(fd, "</typealias>\n");
                break;
 
+       case NODE_TYPE_SPECIFIER_LIST:
+               ret = ctf_visitor_print_type_specifier_list(fd, depth, node);
+               if (ret)
+                       return ret;
+               break;
+
        case NODE_TYPE_SPECIFIER:
                ret = ctf_visitor_print_type_specifier(fd, depth, node);
                if (ret)
@@ -533,9 +609,12 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                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;
+               }
+
+               ret = ctf_visitor_print_xml(fd, depth + 1, node->u._enum.container_type);
+               if (ret)
+                       return ret;
+               if (node->u._enum.container_type) {
                        print_tabs(fd, depth);
                        fprintf(fd, "</container_type>\n");
                }
@@ -555,25 +634,20 @@ int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node)
                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");
+               ret = ctf_visitor_print_xml(fd, depth,
+                       node->u.struct_or_variant_declaration.type_specifier_list);
+               if (ret)
+                       return ret;
 
                print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
+               fprintf(fd, "<type_declarator_list>\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");
+               fprintf(fd, "</type_declarator_list>\n");
                break;
        case NODE_VARIANT:
                print_tabs(fd, depth);
BabelTrace - Trace Format Babel Tower
This page took 0.028287 seconds and 4 git commands to generate.