X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=2f262987f4d3a2b4997887ee96dc4d3be6cdda80;hp=54116540762c01e99c96ee0d19b4ea2bd9e47d78;hb=c13cbf74f302eb64e051045ce31f712a5e05203c;hpb=05628561ca57ff5d269571a72a12cb86854c5f70

diff --git a/types/types.c b/types/types.c
index 54116540..2f262987 100644
--- a/types/types.c
+++ b/types/types.c
@@ -23,57 +23,58 @@
 #include <errno.h>
 
 static
-struct type *
-	lookup_type_scope(GQuark type_name, struct type_scope *scope)
+struct declaration *
+	lookup_type_declaration_scope(GQuark type_name, struct type_scope *scope)
 {
-	return g_hash_table_lookup(scope->types,
+	return g_hash_table_lookup(scope->type_declarations,
 				   (gconstpointer) (unsigned long) type_name);
 }
 
-struct type *lookup_type(GQuark type_name, struct type_scope *scope)
+struct declaration *lookup_type_declaration(GQuark type_name, struct type_scope *scope)
 {
-	struct type *type;
+	struct declaration *declaration;
 
 	while (scope) {
-		type = lookup_type_scope(type_name, scope);
-		if (type)
-			return type;
+		declaration = lookup_type_declaration_scope(type_name, scope);
+		if (declaration)
+			return declaration;
 		scope = scope->parent_scope;
 	}
 	return NULL;
 }
 
-int register_type(GQuark name, struct type *type, struct type_scope *scope)
+int register_type_declaration(GQuark name, struct declaration *declaration,
+			      struct type_scope *scope)
 {
 	if (!name)
 		return -EPERM;
 
 	/* Only lookup in local scope */
-	if (lookup_type_scope(name, scope))
+	if (lookup_type_declaration_scope(name, scope))
 		return -EEXIST;
 
-	g_hash_table_insert(scope->types,
+	g_hash_table_insert(scope->type_declarations,
 			    (gpointer) (unsigned long) name,
-			    type);
-	type_ref(type);
+			    declaration);
+	declaration_ref(declaration);
 	return 0;
 }
 
 static
 struct declaration *
-	lookup_declaration_scope(GQuark field_name, struct declaration_scope *scope)
+	lookup_field_declaration_scope(GQuark field_name, struct declaration_scope *scope)
 {
 	return g_hash_table_lookup(scope->declarations,
 				   (gconstpointer) (unsigned long) field_name);
 }
 
 struct declaration *
-	lookup_declaration(GQuark field_name, struct declaration_scope *scope)
+	lookup_field_declaration(GQuark field_name, struct declaration_scope *scope)
 {
 	struct declaration *declaration;
 
 	while (scope) {
-		declaration = lookup_declaration_scope(field_name, scope);
+		declaration = lookup_field_declaration_scope(field_name, scope);
 		if (declaration)
 			return declaration;
 		scope = scope->parent_scope;
@@ -81,14 +82,14 @@ struct declaration *
 	return NULL;
 }
 
-int register_declaration(GQuark field_name, struct declaration *declaration,
-			 struct declaration_scope *scope)
+int register_field_declaration(GQuark field_name, struct declaration *declaration,
+			       struct declaration_scope *scope)
 {
 	if (!field_name)
 		return -EPERM;
 
 	/* Only lookup in local scope */
-	if (lookup_declaration_scope(field_name, scope))
+	if (lookup_field_declaration_scope(field_name, scope))
 		return -EEXIST;
 
 	g_hash_table_insert(scope->declarations,
@@ -125,7 +126,16 @@ struct type_scope *
 {
 	struct type_scope *scope = g_new(struct type_scope, 1);
 
-	scope->types = g_hash_table_new_full(g_direct_hash,
+	scope->type_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
+	scope->struct_types = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) type_unref);
+	scope->variant_types = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) type_unref);
+	scope->enum_types = g_hash_table_new_full(g_direct_hash,
 					g_direct_equal, NULL,
 					(GDestroyNotify) type_unref);
 	scope->parent_scope = parent_scope;
@@ -134,10 +144,131 @@ struct type_scope *
 
 void free_type_scope(struct type_scope *scope)
 {
-	g_hash_table_destroy(scope->types);
+	g_hash_table_destroy(scope->enum_types);
+	g_hash_table_destroy(scope->variant_types);
+	g_hash_table_destroy(scope->struct_types);
+	g_hash_table_destroy(scope->type_declarations);
 	g_free(scope);
 }
 
+static
+struct type_struct *lookup_struct_type_scope(GQuark struct_name,
+					     struct type_scope *scope)
+{
+	return g_hash_table_lookup(scope->struct_types,
+				   (gconstpointer) (unsigned long) struct_name);
+}
+
+struct type_struct *lookup_struct_type(GQuark struct_name,
+				       struct type_scope *scope)
+{
+	struct type_struct *type;
+
+	while (scope) {
+		type = lookup_struct_type_scope(struct_name, scope);
+		if (type)
+			return type;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_struct_type(GQuark struct_name, struct type_struct *struct_type,
+			 struct type_scope *scope)
+{
+	if (!struct_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_struct_type_scope(struct_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->struct_types,
+			    (gpointer) (unsigned long) struct_name,
+			    struct_type);
+	type_ref(&struct_type->p);
+	return 0;
+}
+
+static
+struct type_variant *lookup_variant_type_scope(GQuark variant_name,
+					       struct type_scope *scope)
+{
+	return g_hash_table_lookup(scope->variant_types,
+				   (gconstpointer) (unsigned long) variant_name);
+}
+
+struct type_variant *lookup_variant_type(GQuark variant_name,
+					 struct type_scope *scope)
+{
+	struct type_variant *type;
+
+	while (scope) {
+		type = lookup_variant_type_scope(variant_name, scope);
+		if (type)
+			return type;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_variant_type(GQuark variant_name,
+			  struct type_variant *variant_type,
+		          struct type_scope *scope)
+{
+	if (!variant_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_variant_type_scope(variant_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->variant_types,
+			    (gpointer) (unsigned long) variant_name,
+			    variant_type);
+	type_ref(&variant_type->p);
+	return 0;
+}
+
+static
+struct type_enum *lookup_enum_type_scope(GQuark enum_name,
+					 struct type_scope *scope)
+{
+	return g_hash_table_lookup(scope->enum_types,
+				   (gconstpointer) (unsigned long) enum_name);
+}
+
+struct type_enum *lookup_enum_type(GQuark enum_name,
+				   struct type_scope *scope)
+{
+	struct type_enum *type;
+
+	while (scope) {
+		type = lookup_enum_type_scope(enum_name, scope);
+		if (type)
+			return type;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_enum_type(GQuark enum_name, struct type_enum *enum_type,
+		       struct type_scope *scope)
+{
+	if (!enum_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_enum_type_scope(enum_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->enum_types,
+			    (gpointer) (unsigned long) enum_name,
+			    enum_type);
+	type_ref(&enum_type->p);
+	return 0;
+}
+
 struct declaration_scope *
 	new_declaration_scope(struct declaration_scope *parent_scope)
 {