projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Remove leading underscores from identifiers directly in lexer"
[babeltrace.git]
/
formats
/
ctf
/
metadata
/
ctf-visitor-parent-links.c
diff --git
a/formats/ctf/metadata/ctf-visitor-parent-links.c
b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 44e2031535839ff3d9fac0e707dfa737e22b8715..4f987211cd276595f4013da17dd1647634768b8e 100644
(file)
--- a/
formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/
formats/ctf/metadata/ctf-visitor-parent-links.c
@@
-24,12
+24,13
@@
#include <glib.h>
#include <inttypes.h>
#include <errno.h>
#include <glib.h>
#include <inttypes.h>
#include <errno.h>
+#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/list.h>
#include "ctf-scanner.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
#include <babeltrace/list.h>
#include "ctf-scanner.h"
#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)
static
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
@@
-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)
{
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:
switch (node->u.type_specifier.type) {
case TYPESPEC_VOID:
case TYPESPEC_CHAR:
@@
-92,9
+95,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_UNSIGNED:
case TYPESPEC_BOOL:
case TYPESPEC_COMPLEX:
+ case TYPESPEC_IMAGINARY:
case TYPESPEC_CONST:
case TYPESPEC_ID_TYPE:
break;
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:
case TYPESPEC_UNKNOWN:
default:
@@
-113,14
+128,12
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
depth++;
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) {
}
switch (node->u.type_declarator.type) {
@@
-134,12
+147,14
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
if (ret)
return ret;
}
if (ret)
return ret;
}
- 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;
+ 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;
}
if (node->u.type_declarator.bitfield_len) {
node->u.type_declarator.bitfield_len = node;
@@
-166,39
+181,31
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
switch (node->type) {
case NODE_ROOT:
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) {
+ 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)
return ret;
}
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.
trace
, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
return ret;
}
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.
trace
, siblings) {
+ cds_list_for_each_entry(iter, &node->u.root.
stream
, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
return ret;
}
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.
stream
, siblings) {
+ cds_list_for_each_entry(iter, &node->u.root.
event
, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
return ret;
}
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.
event
, siblings) {
+ cds_list_for_each_entry(iter, &node->u.root.
clock
, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
@@
-230,6
+237,14
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
return ret;
}
break;
return ret;
}
break;
+ case NODE_CLOCK:
+ cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+ iter->parent = node;
+ ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ break;
case NODE_CTF_EXPRESSION:
depth++;
case NODE_CTF_EXPRESSION:
depth++;
@@
-252,12
+267,10
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
case NODE_TYPEDEF:
depth++;
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);
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
+281,10
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
break;
case NODE_TYPEALIAS_TARGET:
depth++;
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);
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
+295,10
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
break;
case NODE_TYPEALIAS_ALIAS:
depth++;
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);
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
+318,15
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
return ret;
break;
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)
case NODE_TYPE_SPECIFIER:
ret = ctf_visitor_type_specifier(fd, depth, node);
if (ret)
@@
-347,9
+365,6
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
}
break;
case NODE_ENUMERATOR:
}
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);
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
+373,8
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
}
break;
case NODE_ENUM:
}
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++;
depth++;
-
if (node->u._enum.container_type) {
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;
ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
if (ret)
return ret;
@@
-381,12
+389,11
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
depth--;
break;
case NODE_STRUCT_OR_VARIANT_DECLARATION:
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);
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
+402,6
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
}
break;
case NODE_VARIANT:
}
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);
cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
@@
-411,6
+416,13
@@
int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
if (ret)
return ret;
}
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:
break;
case NODE_UNKNOWN:
This page took
0.028473 seconds
and
4
git commands to generate.