X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-parent-links.c;h=0258fd63591276fff956ebc733c6258c0e0e7aa6;hb=8a9a5dfef0e45118b5735ee444f56247a0cc0e02;hp=8c4b2124c73d3fd8a34dd42015b774a68439b625;hpb=7d4192cb80178ad534e460d56f67e55679c7d8ee;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 8c4b2124..0258fd63 100644
--- a/formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/formats/ctf/metadata/ctf-visitor-parent-links.c
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <inttypes.h>
 #include <errno.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
@@ -80,6 +81,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:
@@ -96,6 +99,17 @@ int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 	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:
@@ -114,14 +128,12 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 
 	depth++;
 
-	if (!cds_list_empty(&node->u.type_declarator.pointers)) {
-		cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
-					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.type_declarator.pointers,
+				siblings) {
+		iter->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+		if (ret)
+			return ret;
 	}
 
 	switch (node->u.type_declarator.type) {
@@ -135,12 +147,14 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
-		cds_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
-					siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
+		if (!node->u.type_declarator.u.nested.abstract_array) {
+			cds_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
+						siblings) {
+				iter->parent = node;
+				ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+				if (ret)
+					return ret;
+			}
 		}
 		if (node->u.type_declarator.bitfield_len) {
 			node->u.type_declarator.bitfield_len = node;
@@ -167,21 +181,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)
@@ -253,12 +253,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);
@@ -269,12 +267,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);
@@ -285,12 +281,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);
@@ -310,6 +304,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)
@@ -357,11 +360,8 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		break;
 	case NODE_ENUM:
 		depth++;
-
-		cds_list_for_each_entry(iter, &node->u._enum.container_type,
-					siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+		if (node->u._enum.container_type) {
+			ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
 			if (ret)
 				return ret;
 		}
@@ -375,12 +375,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);
@@ -403,6 +402,13 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
+		cds_list_for_each_entry(iter, &node->u._struct.min_align,
+					siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
 		break;
 
 	case NODE_UNKNOWN: