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

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 6ee937b6..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,
@@ -33,6 +35,7 @@ enum node_type {
 	NODE_TYPEALIAS,
 
 	NODE_TYPE_SPECIFIER,
+	NODE_TYPE_SPECIFIER_LIST,
 	NODE_POINTER,
 	NODE_TYPE_DECLARATOR,
 
@@ -62,34 +65,52 @@ struct ctf_node {
 		struct {
 		} unknown;
 		struct {
-			struct cds_list_head _typedef;
-			struct cds_list_head typealias;
-			struct cds_list_head declaration_specifier;
+			/*
+			 * Children nodes are ctf_expression, typedef,
+			 * typealias and type_specifier_list.
+			 */
+			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 {
 			/*
 			 * Children nodes are ctf_expression, typedef,
-			 * typealias and declaration specifiers.
+			 * typealias and type_specifier_list.
 			 */
 			struct cds_list_head declaration_list;
 		} event;
 		struct {
 			/*
 			 * Children nodes are ctf_expression, typedef,
-			 * typealias and declaration specifiers.
+			 * typealias and type_specifier_list.
 			 */
 			struct cds_list_head declaration_list;
 		} stream;
 		struct {
 			/*
 			 * Children nodes are ctf_expression, typedef,
-			 * typealias and declaration specifiers.
+			 * typealias and type_specifier_list.
+			 */
+			struct cds_list_head declaration_list;
+		} env;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef,
+			 * typealias and type_specifier_list.
 			 */
 			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 */
@@ -122,16 +143,16 @@ struct ctf_node {
 			} link;
 		} unary_expression;
 		struct {
-			struct cds_list_head declaration_specifier;
+			struct ctf_node *type_specifier_list;
 			struct cds_list_head type_declarators;
 		} _typedef;
 		/* new type is "alias", existing type "target" */
 		struct {
-			struct cds_list_head declaration_specifier;
+			struct ctf_node *type_specifier_list;
 			struct cds_list_head type_declarators;
 		} typealias_target;
 		struct {
-			struct cds_list_head declaration_specifier;
+			struct ctf_node *type_specifier_list;
 			struct cds_list_head type_declarators;
 		} typealias_alias;
 		struct {
@@ -155,9 +176,21 @@ struct ctf_node {
 				TYPESPEC_IMAGINARY,
 				TYPESPEC_CONST,
 				TYPESPEC_ID_TYPE,
+				TYPESPEC_FLOATING_POINT,
+				TYPESPEC_INTEGER,
+				TYPESPEC_STRING,
+				TYPESPEC_STRUCT,
+				TYPESPEC_VARIANT,
+				TYPESPEC_ENUM,
 			} type;
+			/* For struct, variant and enum */
+			struct ctf_node *node;
 			const char *id_type;
 		} type_specifier;
+		struct {
+			/* list of type_specifier */
+			struct cds_list_head head;
+		} type_specifier_list;
 		struct {
 			unsigned int const_qualifier;
 		} pointer;
@@ -173,8 +206,11 @@ struct ctf_node {
 				struct {
 					/* typedec has no pointer list */
 					struct ctf_node *type_declarator;
-					/* value or first node of declaration specifier list */
-					struct ctf_node *length;
+					/*
+					 * unary expression (value) or
+					 * type_specifier_list.
+					 */
+					struct cds_list_head length;
 					/* for abstract type declarator */
 					unsigned int abstract_array;
 				} nested;
@@ -203,13 +239,16 @@ struct ctf_node {
 		} enumerator;
 		struct {
 			char *enum_id;
-			/* NULL, value or declaration specifier */
+			/*
+			 * Either NULL, or points to unary expression or
+			 * type_specifier_list.
+			 */
 			struct ctf_node *container_type;
 			struct cds_list_head enumerator_list;
 			int has_body;
 		} _enum;
 		struct {
-			struct cds_list_head declaration_specifier;
+			struct ctf_node *type_specifier_list;
 			struct cds_list_head type_declarators;
 		} struct_or_variant_declaration;
 		struct {
@@ -224,6 +263,7 @@ struct ctf_node {
 			/* list of typedef, typealias and declarations */
 			struct cds_list_head declaration_list;
 			int has_body;
+			struct cds_list_head min_align;	/* align() attribute */
 		} _struct;
 	} u;
 };