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:
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:
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 (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);
if (ret)
return ret;
}
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)
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);
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);
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);
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)
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 (ret)
- return ret;
- }
+ ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
+ if (ret)
+ return ret;
cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
iter->parent = 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);