Cleanup parser code, add some node IDs to AST

[babeltrace.git] / formats / ctf / metadata / ctf-ast.h

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 34d00367fc396ab93af2775c1dd677c6a563ae59..0e37d81850d2209990cda9f1f31bf52a8905e2be 100644 (file)
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -18,11 +18,26 @@ 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_DECLARATION_SPECIFIER,
+       NODE_TYPE_DECLARATOR,
+
+       NODE_FLOATING_POINT,
+       NODE_INTEGER,
+       NODE_STRING,
+       NODE_ENUM,
+       NODE_VARIANT,
+       NODE_STRUCT,
+
        NR_NODE_TYPES,
 };
 
@@ -37,12 +52,6 @@ struct ctf_node {
        struct cds_list_head gc;
 };
 
-struct scope;
-struct scope {
-       struct scope *parent;
-       GHashTable *types;
-};
-
 struct ctf_ast {
        struct ctf_node root;
 };