X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=90720e2bed988b69be1bb820201fa60cf11bc06a;hp=8272b8147db08fdc822a153d44050beabd9fb19c;hb=f66259163f060ada8d0fee348857c968e338ea40;hpb=6ee5115efee00adab0c8f384bc9c0f38fed8a84e

diff --git a/types/types.c b/types/types.c
index 8272b814..90720e2b 100644
--- a/types/types.c
+++ b/types/types.c
@@ -1,5 +1,5 @@
 /*
- * types.c
+ * declarations.c
  *
  * BabelTrace - Converter
  *
@@ -23,70 +23,107 @@
 #include <errno.h>
 
 static
-struct type *lookup_type_scope(GQuark qname, struct declaration_scope *scope)
+struct definition *
+	lookup_typedef_declaration_scope(GQuark declaration_name,
+		struct declaration_scope *scope)
 {
-	return g_hash_table_lookup(scope->types,
-				   (gconstpointer) (unsigned long) qname);
+	return g_hash_table_lookup(scope->typedef_declarations,
+				   (gconstpointer) (unsigned long) declaration_name);
 }
 
-struct type *lookup_type(GQuark qname, struct declaration_scope *scope)
+struct definition *lookup_typedef_declaration(GQuark declaration_name,
+		struct declaration_scope *scope)
 {
-	struct type *type;
+	struct definition *definition;
 
 	while (scope) {
-		type = lookup_type_scope(qname, scope);
-		if (type)
-			return type;
+		definition = lookup_typedef_declaration_scope(declaration_name,
+							      scope);
+		if (definition)
+			return definition;
 		scope = scope->parent_scope;
 	}
 	return NULL;
 }
 
-static void free_type(struct type *type)
+int register_typedef_declaration(GQuark name, struct declaration *declaration,
+		struct declaration_scope *scope)
 {
-	type->type_free(type);
+	if (!name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_typedef_declaration_scope(name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->typedef_declarations,
+			    (gpointer) (unsigned long) name,
+			    declaration);
+	declaration_ref(declaration);
+	return 0;
 }
 
-static void free_declaration(struct declaration *declaration)
+static
+struct definition *
+	lookup_field_definition_scope(GQuark field_name,
+		struct definition_scope *scope)
 {
-	declaration->type->declaration_free(declaration);
+	return g_hash_table_lookup(scope->definitions,
+				   (gconstpointer) (unsigned long) field_name);
 }
 
-int register_type(struct type *type, struct declaration_scope *scope)
+struct definition *
+	lookup_field_definition(GQuark field_name,
+		struct definition_scope *scope)
 {
-	if (!type->name)
+	struct definition *definition;
+
+	while (scope) {
+		definition = lookup_field_definition_scope(field_name, scope);
+		if (definition)
+			return definition;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_field_definition(GQuark field_name, struct definition *definition,
+		struct definition_scope *scope)
+{
+	if (!field_name)
 		return -EPERM;
 
 	/* Only lookup in local scope */
-	if (lookup_type_scope(type->name, scope))
+	if (lookup_field_definition_scope(field_name, scope))
 		return -EEXIST;
 
-	g_hash_table_insert(scope->types,
-			    (gpointer) (unsigned long) type->name,
-			    type);
+	g_hash_table_insert(scope->definitions,
+			    (gpointer) (unsigned long) field_name,
+			    definition);
+	definition_ref(definition);
 	return 0;
 }
 
-void type_ref(struct type *type)
+void declaration_ref(struct declaration *declaration)
 {
-	type->ref++;
+	declaration->ref++;
 }
 
-void type_unref(struct type *type)
+void declaration_unref(struct declaration *declaration)
 {
-	if (!--type->ref)
-		free_type(type);
+	if (!--declaration->ref)
+		declaration->declaration_free(declaration);
 }
 
-void declaration_ref(struct declaration *declaration)
+void definition_ref(struct definition *definition)
 {
-	declaration->ref++;
+	definition->ref++;
 }
 
-void declaration_unref(struct declaration *declaration)
+void definition_unref(struct definition *definition)
 {
-	if (!--declaration->ref)
-		free_declaration(declaration);
+	if (!--definition->ref)
+		definition->declaration->definition_free(definition);
 }
 
 struct declaration_scope *
@@ -94,15 +131,169 @@ struct declaration_scope *
 {
 	struct declaration_scope *scope = g_new(struct declaration_scope, 1);
 
-	scope->types = g_hash_table_new_full(g_direct_hash,
+	scope->typedef_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) definition_unref);
+	scope->struct_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
+	scope->variant_declarations = g_hash_table_new_full(g_direct_hash,
 					g_direct_equal, NULL,
-					(GDestroyNotify) type_unref);
+					(GDestroyNotify) declaration_unref);
+	scope->enum_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
 	scope->parent_scope = parent_scope;
 	return scope;
 }
 
 void free_declaration_scope(struct declaration_scope *scope)
 {
-	g_hash_table_destroy(scope->types);
+	g_hash_table_destroy(scope->enum_declarations);
+	g_hash_table_destroy(scope->variant_declarations);
+	g_hash_table_destroy(scope->struct_declarations);
+	g_hash_table_destroy(scope->typedef_declarations);
+	g_free(scope);
+}
+
+static
+struct declaration_struct *lookup_struct_declaration_scope(GQuark struct_name,
+					     struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->struct_declarations,
+				   (gconstpointer) (unsigned long) struct_name);
+}
+
+struct declaration_struct *lookup_struct_declaration(GQuark struct_name,
+				       struct declaration_scope *scope)
+{
+	struct declaration_struct *declaration;
+
+	while (scope) {
+		declaration = lookup_struct_declaration_scope(struct_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_struct_declaration(GQuark struct_name,
+	struct declaration_struct *struct_declaration,
+	struct declaration_scope *scope)
+{
+	if (!struct_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_struct_declaration_scope(struct_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->struct_declarations,
+			    (gpointer) (unsigned long) struct_name,
+			    struct_declaration);
+	declaration_ref(&struct_declaration->p);
+	return 0;
+}
+
+static
+struct declaration_variant *
+	lookup_variant_declaration_scope(GQuark variant_name,
+		struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->variant_declarations,
+				   (gconstpointer) (unsigned long) variant_name);
+}
+
+struct declaration_variant *
+	lookup_variant_declaration(GQuark variant_name,
+		struct declaration_scope *scope)
+{
+	struct declaration_variant *declaration;
+
+	while (scope) {
+		declaration = lookup_variant_declaration_scope(variant_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_variant_declaration(GQuark variant_name,
+		struct declaration_variant *variant_declaration,
+		struct declaration_scope *scope)
+{
+	if (!variant_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_variant_declaration_scope(variant_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->variant_declarations,
+			    (gpointer) (unsigned long) variant_name,
+			    variant_declaration);
+	declaration_ref(&variant_declaration->p);
+	return 0;
+}
+
+static
+struct declaration_enum *
+	lookup_enum_declaration_scope(GQuark enum_name,
+		struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->enum_declarations,
+				   (gconstpointer) (unsigned long) enum_name);
+}
+
+struct declaration_enum *
+	lookup_enum_declaration(GQuark enum_name,
+		struct declaration_scope *scope)
+{
+	struct declaration_enum *declaration;
+
+	while (scope) {
+		declaration = lookup_enum_declaration_scope(enum_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_enum_declaration(GQuark enum_name,
+		struct declaration_enum *enum_declaration,
+		struct declaration_scope *scope)
+{
+	if (!enum_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_enum_declaration_scope(enum_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->enum_declarations,
+			    (gpointer) (unsigned long) enum_name,
+			    enum_declaration);
+	declaration_ref(&enum_declaration->p);
+	return 0;
+}
+
+struct definition_scope *
+	new_definition_scope(struct definition_scope *parent_scope)
+{
+	struct definition_scope *scope = g_new(struct definition_scope, 1);
+
+	scope->definitions = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) definition_unref);
+	scope->parent_scope = parent_scope;
+	return scope;
+}
+
+void free_definition_scope(struct definition_scope *scope)
+{
+	g_hash_table_destroy(scope->definitions);
 	g_free(scope);
 }