X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=2ba6e860f4d7c920be57e6fc6f90626cb841e5a8;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=042726e9edc35d9dea049b3ee235701b74da0e0d;hpb=5c5c3455f616fba4e525d483735dc01a657f4519;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 042726e9..2ba6e860 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -26,45 +26,42 @@
 // data is a pointer to a 'SParserParam' structure
 //#define YYPARSE_PARAM	scanner
 
-// the argument for the 'yylex' function
-#define YYLEX_PARAM	((struct ctf_scanner *) scanner)->scanner
-
 struct ctf_node;
 struct ctf_parser;
 
-enum node_type {
-	NODE_UNKNOWN = 0,
-	NODE_ROOT,
-
-	NODE_EVENT,
-	NODE_STREAM,
-	NODE_ENV,
-	NODE_TRACE,
-	NODE_CLOCK,
-	NODE_CALLSITE,
-
-	NODE_CTF_EXPRESSION,
-	NODE_UNARY_EXPRESSION,
-
-	NODE_TYPEDEF,
-	NODE_TYPEALIAS_TARGET,
-	NODE_TYPEALIAS_ALIAS,
-	NODE_TYPEALIAS,
-
-	NODE_TYPE_SPECIFIER,
-	NODE_TYPE_SPECIFIER_LIST,
-	NODE_POINTER,
-	NODE_TYPE_DECLARATOR,
-
-	NODE_FLOATING_POINT,
-	NODE_INTEGER,
-	NODE_STRING,
-	NODE_ENUMERATOR,
-	NODE_ENUM,
-	NODE_STRUCT_OR_VARIANT_DECLARATION,
-	NODE_VARIANT,
-	NODE_STRUCT,
+#define FOREACH_CTF_NODES(F) \
+	F(NODE_UNKNOWN) \
+	F(NODE_ROOT) \
+	F(NODE_ERROR) \
+	F(NODE_EVENT) \
+	F(NODE_STREAM) \
+	F(NODE_ENV) \
+	F(NODE_TRACE) \
+	F(NODE_CLOCK) \
+	F(NODE_CALLSITE) \
+	F(NODE_CTF_EXPRESSION) \
+	F(NODE_UNARY_EXPRESSION) \
+	F(NODE_TYPEDEF) \
+	F(NODE_TYPEALIAS_TARGET) \
+	F(NODE_TYPEALIAS_ALIAS) \
+	F(NODE_TYPEALIAS) \
+	F(NODE_TYPE_SPECIFIER) \
+	F(NODE_TYPE_SPECIFIER_LIST) \
+	F(NODE_POINTER) \
+	F(NODE_TYPE_DECLARATOR) \
+	F(NODE_FLOATING_POINT) \
+	F(NODE_INTEGER) \
+	F(NODE_STRING) \
+	F(NODE_ENUMERATOR) \
+	F(NODE_ENUM) \
+	F(NODE_STRUCT_OR_VARIANT_DECLARATION) \
+	F(NODE_VARIANT) \
+	F(NODE_STRUCT)
 
+enum node_type {
+#define ENTRY(S)	S,
+	FOREACH_CTF_NODES(ENTRY)
+#undef ENTRY
 	NR_NODE_TYPES,
 };
 
@@ -75,8 +72,15 @@ struct ctf_node {
 	struct ctf_node *parent;
 	struct bt_list_head siblings;
 	struct bt_list_head tmp_head;
-	struct bt_list_head gc;
 	unsigned int lineno;
+	/*
+	 * We mark nodes visited in the generate-io-struct phase (last
+	 * phase). We only mark the 1-depth level nodes as visited
+	 * (never the root node, and not their sub-nodes). This allows
+	 * skipping already visited nodes when doing incremental
+	 * metadata append.
+	 */
+	int visited;
 
 	enum node_type type;
 	union {
@@ -148,7 +152,6 @@ struct ctf_node {
 				UNARY_SIGNED_CONSTANT,
 				UNARY_UNSIGNED_CONSTANT,
 				UNARY_SBRAC,
-				UNARY_NESTED,
 			} type;
 			union {
 				/*
@@ -159,7 +162,6 @@ struct ctf_node {
 				int64_t signed_constant;
 				uint64_t unsigned_constant;
 				struct ctf_node *sbrac_exp;
-				struct ctf_node *nested_exp;
 			} u;
 			enum {
 				UNARY_LINK_UNKNOWN = 0,
@@ -296,7 +298,6 @@ struct ctf_node {
 
 struct ctf_ast {
 	struct ctf_node root;
-	struct bt_list_head allocated_nodes;
 };
 
 const char *node_type(struct ctf_node *node);