X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=db297afdbd3864f121adad80b44e0c6e6fd70043;hb=ae5193a6f3a1b717175f4cc864e730c24ce0f264;hp=34d00367fc396ab93af2775c1dd677c6a563ae59;hpb=34d3acc4fc9f020b0e2616a29a339b5c546a05c1;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 34d00367..db297afd 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -1,6 +1,7 @@
 #ifndef _CTF_PARSER_H
 #define _CTF_PARSER_H
 
+#include <stdint.h>
 #include <helpers/list.h>
 #include <stdio.h>
 #include <glib.h>
@@ -18,29 +19,208 @@ struct ctf_parser;
 enum node_type {
 	NODE_UNKNOWN,
 	NODE_ROOT,
+
 	NODE_EVENT,
 	NODE_STREAM,
-	NODE_TYPE,
 	NODE_TRACE,
 
+	NODE_CTF_EXPRESSION,
+
+	NODE_TYPEDEF,
+	NODE_TYPEALIAS,
+
+	NODE_TYPE_SPECIFIER,
+	NODE_DECLARATION_SPECIFIER,
+	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,
+
 	NR_NODE_TYPES,
 };
 
 struct ctf_node {
-	enum node_type type;
-	char *str;
-	long long ll;
 	struct ctf_node *parent;
-	char *ident;
 	struct cds_list_head siblings;
-	struct cds_list_head children;
 	struct cds_list_head gc;
-};
 
-struct scope;
-struct scope {
-	struct scope *parent;
-	GHashTable *types;
+	enum node_type type;
+	union {
+		struct {
+		} unknown;
+		struct {
+		} root;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef or
+			 * typealias.
+			 */
+			struct cds_list_head _typedef;
+			struct cds_list_head typealias;
+			struct cds_list_head ctf_expression;
+		} event;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef or
+			 * typealias.
+			 */
+			struct cds_list_head _typedef;
+			struct cds_list_head typealias;
+			struct cds_list_head ctf_expression;
+		} stream;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef or
+			 * typealias.
+			 */
+			struct cds_list_head _typedef;
+			struct cds_list_head typealias;
+			struct cds_list_head ctf_expression;
+		} trace;
+		struct {
+			char *left_id;
+			enum {
+				EXP_ID,
+				EXP_TYPE,
+			} type;
+			union {
+				char *id;
+				struct ctf_node *type;
+			} right;
+		} ctf_expression;
+		struct {
+			struct ctf_node *declaration_specifier;
+			struct cds_list_head type_declarator;
+		} _typedef;
+		struct {
+			/* new type is "alias", existing type "target" */
+			struct ctf_node *target_declaration_specifier;
+			struct cds_list_head target_type_declarator;
+			struct ctf_node *alias_declaration_specifier;
+			struct cds_list_head alias_type_declarator;
+		} typealias;
+		struct {
+			enum {
+				TYPESPEC_VOID,
+				TYPESPEC_CHAR,
+				TYPESPEC_SHORT,
+				TYPESPEC_INT,
+				TYPESPEC_LONG,
+				TYPESPEC_FLOAT,
+				TYPESPEC_DOUBLE,
+				TYPESPEC_SIGNED,
+				TYPESPEC_UNSIGNED,
+				TYPESPEC_BOOL,
+				TYPESPEC_COMPLEX,
+				TYPESPEC_ID_TYPE,
+
+				TYPESPEC_FLOATING_POINT,
+				TYPESPEC_INTEGER,
+				TYPESPEC_STRING,
+				TYPESPEC_ENUM,
+				TYPESPEC_VARIANT,
+				TYPESPEC_STRUCT,
+			} type;
+			union {
+				struct ctf_node *floating_point;
+				struct ctf_node *integer;
+				struct ctf_node *string;
+				struct ctf_node *_enum;
+				struct ctf_node *variant;
+				struct ctf_node *_struct;
+			} u;
+		} type_specifier;
+		struct {
+			/* drop "const" specifier */
+			/* Children nodes are type_specifiers */
+			struct cds_list_head type_specifiers;
+		} declaration_specifier;
+		struct {
+		} pointer;
+		struct {
+			struct cds_list_head pointers;
+			enum {
+				TYPEDEC_ID,	/* identifier */
+				TYPEDEC_TYPEDEC,/* nested with () */
+				TYPEDEC_DIRECT,	/* array or sequence */
+			} type;
+			union {
+				char *id;
+				struct ctf_node *typedec;
+				struct {
+					/* typedec has no pointer list */
+					struct ctf_node *typedec;
+					struct {
+						enum {
+							TYPEDEC_TYPE_VALUE, /* must be > 0 */
+							TYPEDEC_TYPE_TYPE,
+						} type;
+						union {
+							uint64_t value;
+							struct ctf_node *declaration_specifier;
+						} u;
+					} length;
+				} direct;
+			} u;
+		} type_declarator;
+		struct {
+			/* Children nodes are ctf_expression. */
+			struct cds_list_head expressions;
+		} floating_point;
+		struct {
+			/* Children nodes are ctf_expression. */
+			struct cds_list_head expressions;
+		} integer;
+		struct {
+			/* Children nodes are ctf_expression. */
+			struct cds_list_head expressions;
+		} string;
+		struct {
+			char *id;
+			union {		/* inclusive start/end of range */
+				struct {
+					int64_t start, end;
+				} _signed;
+				struct {
+					uint64_t start, end;
+				} _unsigned;
+			} u;
+		} enumerator;
+		struct {
+			char *enum_id;
+			struct {
+				enum {
+					ENUM_TYPE_VALUE, /* must be > 0 */
+					ENUM_TYPE_TYPE,
+				} type;
+				union {
+					uint64_t value;
+					struct ctf_node *declaration_specifier;
+				} u;
+			} container_type;
+			struct cds_list_head enumerator_list;
+		} _enum;
+		struct {
+			struct ctf_node *declaration_specifier;
+		} struct_or_variant_declaration;
+		struct {
+			struct cds_list_head _typedef;
+			struct cds_list_head typealias;
+			struct cds_list_head declaration_list;
+		} variant;
+		struct {
+			struct cds_list_head _typedef;
+			struct cds_list_head typealias;
+			struct cds_list_head declaration_list;
+		} _struct;
+	} u;
 };
 
 struct ctf_ast {