X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=eba14cdadf54e76e23d835a6dca3d65e4e963d6c;hp=3d8d8b00d7a056a9797fbb807c5e0258d495453d;hb=e2c76a4d53527de31408fea6535980755c389e68;hpb=b7e35badc2eac52e27b802a9078bfb7c8f3b04a7

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 3d8d8b00..eba14cda 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -22,7 +22,9 @@ enum node_type {
 
 	NODE_EVENT,
 	NODE_STREAM,
+	NODE_ENV,
 	NODE_TRACE,
+	NODE_CLOCK,
 
 	NODE_CTF_EXPRESSION,
 	NODE_UNARY_EXPRESSION,
@@ -69,8 +71,10 @@ struct ctf_node {
 			 */
 			struct cds_list_head declaration_list;
 			struct cds_list_head trace;
+			struct cds_list_head env;
 			struct cds_list_head stream;
 			struct cds_list_head event;
+			struct cds_list_head clock;
 		} root;
 		struct {
 			/*
@@ -86,6 +90,13 @@ struct ctf_node {
 			 */
 			struct cds_list_head declaration_list;
 		} stream;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef,
+			 * typealias and type_specifier_list.
+			 */
+			struct cds_list_head declaration_list;
+		} env;
 		struct {
 			/*
 			 * Children nodes are ctf_expression, typedef,
@@ -93,6 +104,13 @@ struct ctf_node {
 			 */
 			struct cds_list_head declaration_list;
 		} trace;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef,
+			 * typealias and type_specifier_list.
+			 */
+			struct cds_list_head declaration_list;
+		} clock;
 		struct {
 			struct cds_list_head left;	/* Should be string */
 			struct cds_list_head right;	/* Unary exp. or type */
@@ -192,7 +210,7 @@ struct ctf_node {
 					 * unary expression (value) or
 					 * type_specifier_list.
 					 */
-					struct ctf_node *length;
+					struct cds_list_head length;
 					/* for abstract type declarator */
 					unsigned int abstract_array;
 				} nested;