X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-parent-links.c;h=707f03a5c20af4e71fe626985ce68e97b958f9ee;hp=44e2031535839ff3d9fac0e707dfa737e22b8715;hb=0f980a3595f61930659e392b1248c59490dd5a22;hpb=67905e421502703d87176702b4844f70fd60ded4

diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 44e20315..707f03a5 100644
--- a/formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/formats/ctf/metadata/ctf-visitor-parent-links.c
@@ -29,7 +29,7 @@
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-#define printf_dbg(fmt, args...)	fprintf(fd, "%s: " fmt, __func__, ## args)
+#define fprintf_dbg(fd, fmt, args...)	fprintf(fd, "%s: " fmt, __func__, ## args)
 
 static
 int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
@@ -80,6 +80,8 @@ int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
 static
 int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 {
+	int ret;
+
 	switch (node->u.type_specifier.type) {
 	case TYPESPEC_VOID:
 	case TYPESPEC_CHAR:
@@ -92,9 +94,21 @@ int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 	case TYPESPEC_UNSIGNED:
 	case TYPESPEC_BOOL:
 	case TYPESPEC_COMPLEX:
+	case TYPESPEC_IMAGINARY:
 	case TYPESPEC_CONST:
 	case TYPESPEC_ID_TYPE:
 		break;
+	case TYPESPEC_FLOATING_POINT:
+	case TYPESPEC_INTEGER:
+	case TYPESPEC_STRING:
+	case TYPESPEC_STRUCT:
+	case TYPESPEC_VARIANT:
+	case TYPESPEC_ENUM:
+		node->u.type_specifier.node->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, node->u.type_specifier.node);
+		if (ret)
+			return ret;
+		break;
 
 	case TYPESPEC_UNKNOWN:
 	default:
@@ -136,8 +150,7 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 		}
 		if (node->u.type_declarator.u.nested.length) {
 			node->u.type_declarator.u.nested.length->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1,
-				node->u.type_declarator.u.nested.length);
+			ret = ctf_visitor_parent_links(fd, depth + 1, node->u.type_declarator.u.nested.length);
 			if (ret)
 				return ret;
 		}
@@ -166,21 +179,7 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 
 	switch (node->type) {
 	case NODE_ROOT:
-		cds_list_for_each_entry(iter, &node->u.root._typedef,
-					siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
-		cds_list_for_each_entry(iter, &node->u.root.typealias,
-					siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
-		cds_list_for_each_entry(iter, &node->u.root.declaration_specifier, siblings) {
+		cds_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
 			if (ret)
@@ -252,12 +251,10 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 
 	case NODE_TYPEDEF:
 		depth++;
-		cds_list_for_each_entry(iter, &node->u._typedef.declaration_specifier, siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
+		node->u._typedef.type_specifier_list->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, node->u._typedef.type_specifier_list);
+		if (ret)
+			return ret;
 		cds_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@ -268,12 +265,10 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		break;
 	case NODE_TYPEALIAS_TARGET:
 		depth++;
-		cds_list_for_each_entry(iter, &node->u.typealias_target.declaration_specifier, siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
+		node->u.typealias_target.type_specifier_list->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_target.type_specifier_list);
+		if (ret)
+			return ret;
 		cds_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@ -284,12 +279,10 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		break;
 	case NODE_TYPEALIAS_ALIAS:
 		depth++;
-		cds_list_for_each_entry(iter, &node->u.typealias_alias.declaration_specifier, siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
+		node->u.typealias_alias.type_specifier_list->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_alias.type_specifier_list);
+		if (ret)
+			return ret;
 		cds_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@ -309,6 +302,15 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 			return ret;
 		break;
 
+	case NODE_TYPE_SPECIFIER_LIST:
+		cds_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
+		break;
+
 	case NODE_TYPE_SPECIFIER:
 		ret = ctf_visitor_type_specifier(fd, depth, node);
 		if (ret)
@@ -347,9 +349,6 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		}
 		break;
 	case NODE_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) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@ -358,15 +357,8 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		}
 		break;
 	case NODE_ENUM:
-		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) {
-			node->u._enum.container_type->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
 			if (ret)
 				return ret;
@@ -381,12 +373,11 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		depth--;
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
-		cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.declaration_specifier, siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
+		node->u.struct_or_variant_declaration.type_specifier_list->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1,
+			node->u.struct_or_variant_declaration.type_specifier_list);
+		if (ret)
+			return ret;
 		cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@ -395,8 +386,6 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		}
 		break;
 	case NODE_VARIANT:
-		if (node->u.variant.choice)
-			fprintf(fd, " choice=\"%s\"", node->u.variant.choice);
 		cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
 			iter->parent = node;
 			ret = ctf_visitor_parent_links(fd, depth + 1, iter);