X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=93bce7d82860be6ef492fc650d1866a605cee79a;hb=a7dd15ff1b8b60bd1defe71ce536464a050b028e;hp=3fb38b2d6295c4eca0f0500374c68e7f17bd307d;hpb=590ca879d080e496026281003b6455a7db5d5ee9;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 3fb38b2d..93bce7d8 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -26,15 +26,13 @@
 // 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;
 
 #define FOREACH_CTF_NODES(F) \
 	F(NODE_UNKNOWN) \
 	F(NODE_ROOT) \
+	F(NODE_ERROR) \
 	F(NODE_EVENT) \
 	F(NODE_STREAM) \
 	F(NODE_ENV) \
@@ -74,7 +72,6 @@ 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;
 
 	enum node_type type;
@@ -147,7 +144,6 @@ struct ctf_node {
 				UNARY_SIGNED_CONSTANT,
 				UNARY_UNSIGNED_CONSTANT,
 				UNARY_SBRAC,
-				UNARY_NESTED,
 			} type;
 			union {
 				/*
@@ -158,7 +154,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,
@@ -295,7 +290,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);