X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=540195a34bca41b75268afe8c6c1fd01918fea61;hp=7dcf9f966bb5a9366eb4e15690e52e951b8beca5;hb=67905e421502703d87176702b4844f70fd60ded4;hpb=6dc474b8729f78928cb91e888cd94f3dcba03eb7

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 7dcf9f96..540195a3 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -2,9 +2,9 @@
 #define _CTF_PARSER_H
 
 #include <stdint.h>
-#include <helpers/list.h>
 #include <stdio.h>
 #include <glib.h>
+#include <babeltrace/list.h>
 
 // the parameter name (of the reentrant 'yyparse' function)
 // data is a pointer to a 'SParserParam' structure
@@ -54,6 +54,7 @@ struct ctf_node {
 	 */
 	struct ctf_node *parent;
 	struct cds_list_head siblings;
+	struct cds_list_head tmp_head;
 	struct cds_list_head gc;
 
 	enum node_type type;
@@ -90,8 +91,8 @@ struct ctf_node {
 			struct cds_list_head declaration_list;
 		} trace;
 		struct {
-			struct ctf_node *left;	/* Should be string */
-			struct ctf_node *right;	/* Unary exp. or type */
+			struct cds_list_head left;	/* Should be string */
+			struct cds_list_head right;	/* Unary exp. or type */
 		} ctf_expression;
 		struct {
 			enum {
@@ -100,6 +101,7 @@ struct ctf_node {
 				UNARY_SIGNED_CONSTANT,
 				UNARY_UNSIGNED_CONSTANT,
 				UNARY_SBRAC,
+				UNARY_NESTED,
 			} type;
 			union {
 				/*
@@ -107,14 +109,16 @@ struct ctf_node {
 				 * string literals and character constants.
 				 */
 				char *string;
-				uint64_t unsigned_constant;
 				int64_t signed_constant;
+				uint64_t unsigned_constant;
 				struct ctf_node *sbrac_exp;
+				struct ctf_node *nested_exp;
 			} u;
 			enum {
 				UNARY_LINK_UNKNOWN = 0,
 				UNARY_DOTLINK,
 				UNARY_ARROWLINK,
+				UNARY_DOTDOTDOT,
 			} link;
 		} unary_expression;
 		struct {
@@ -190,8 +194,11 @@ struct ctf_node {
 		} string;
 		struct {
 			char *id;
-			/* first node of range list or single node */
-			struct ctf_node *values;
+			/*
+			 * Range list or single value node. Contains unary
+			 * expressions.
+			 */
+			struct cds_list_head values;
 		} enumerator;
 		struct {
 			char *enum_id;
@@ -204,15 +211,15 @@ struct ctf_node {
 			struct cds_list_head type_declarators;
 		} struct_or_variant_declaration;
 		struct {
-			/* list of typedef, typealias and declarations */
-			struct cds_list_head declaration_list;
 			char *name;
 			char *choice;
+			/* list of typedef, typealias and declarations */
+			struct cds_list_head declaration_list;
 		} variant;
 		struct {
+			char *name;
 			/* list of typedef, typealias and declarations */
 			struct cds_list_head declaration_list;
-			char *name;
 		} _struct;
 	} u;
 };
@@ -222,4 +229,8 @@ struct ctf_ast {
 	struct cds_list_head allocated_nodes;
 };
 
+int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node);
+int ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node);
+int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node);
+
 #endif /* _CTF_PARSER_H */