CTF metadata: AST nodes

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 0e37d81850d2209990cda9f1f31bf52a8905e2be..db297afdbd3864f121adad80b44e0c6e6fd70043 100644 (file)
--- 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>
@@ -28,13 +29,17 @@ enum node_type {
        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,
 
@@ -42,14 +47,180 @@ enum node_type {
 };
 
 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;
+
+       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 {