Dynamic definition scope hierarchy

[babeltrace.git] / include / babeltrace / ctf / metadata.h

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 5547480922ede2466ea78fac251caad80404797c..a60f17763c239e4bac7023d51c8d436b622542ce 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -46,11 +46,11 @@ struct ctf_event;
 
 struct ctf_trace {
        /* root scope */
-       struct type_scope *root_type_scope;
+       struct declaration_scope *root_declaration_scope;
        /* root scope */
        struct definition_scope *root_definition_scope;
 
-       struct type_scope *type_scope;
+       struct declaration_scope *declaration_scope;
        struct definition_scope *definition_scope;
        GPtrArray *streams;                     /* Array of struct ctf_stream pointers*/
 
@@ -85,15 +85,21 @@ struct ctf_trace {
 struct ctf_stream {
        struct ctf_trace *trace;
        /* parent is lexical scope conaining the stream scope */
-       struct type_scope *type_scope;
+       struct declaration_scope *declaration_scope;
        /* parent is trace scope */
        struct definition_scope *definition_scope;
        GPtrArray *events_by_id;                /* Array of struct ctf_event pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 
+       /* Declarations only used when parsing */
+       struct declaration_struct *packet_context_decl;
+       struct declaration_struct *event_header_decl;
+       struct declaration_struct *event_context_decl;
+
+       /* Definitions used afterward */
+       struct definition_struct *packet_context;
        struct definition_struct *event_header;
        struct definition_struct *event_context;
-       struct definition_struct *packet_context;
 
        uint64_t stream_id;
 
@@ -120,9 +126,15 @@ struct ctf_event {
        /* stream mapped by stream_id */
        struct ctf_stream *stream;
        /* parent is lexical scope conaining the event scope */
-       struct type_scope *type_scope;
+       struct declaration_scope *declaration_scope;
        /* parent is stream scope */
        struct definition_scope *definition_scope;
+
+       /* Declarations only used when parsing */
+       struct declaration_struct *context_decl;
+       struct declaration_struct *fields_decl;
+
+       /* Definitions used afterward */
        struct definition_struct *context;
        struct definition_struct *fields;