X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=3641fa05d16b69a22074170917f5f653eaa17d4e;hp=ed2955031786ad3087cdf10fe9f572f404908b31;hb=d80f08379f65bcb7eb3af1f8be6d7b3f66f4e830;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b

diff --git a/types/variant.c b/types/variant.c
index ed295503..3641fa05 100644
--- a/types/variant.c
+++ b/types/variant.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 
 static
-struct bt_definition *_variant_definition_new(struct declaration *declaration,
+struct bt_definition *_variant_definition_new(struct bt_declaration *declaration,
 				struct definition_scope *parent_scope,
 				GQuark field_name, int index,
 				const char *root_name);
@@ -50,7 +50,7 @@ int bt_variant_rw(struct bt_stream_pos *ppos, struct bt_definition *definition)
 }
 
 static
-void _untagged_variant_declaration_free(struct declaration *declaration)
+void _untagged_variant_declaration_free(struct bt_declaration *declaration)
 {
 	struct declaration_untagged_variant *untagged_variant_declaration =
 		container_of(declaration, struct declaration_untagged_variant, p);
@@ -73,7 +73,7 @@ struct declaration_untagged_variant *bt_untagged_bt_variant_declaration_new(
 				      struct declaration_scope *parent_scope)
 {
 	struct declaration_untagged_variant *untagged_variant_declaration;
-	struct declaration *declaration;
+	struct bt_declaration *declaration;
 
 	untagged_variant_declaration = g_new(struct declaration_untagged_variant, 1);
 	declaration = &untagged_variant_declaration->p;
@@ -93,7 +93,7 @@ struct declaration_untagged_variant *bt_untagged_bt_variant_declaration_new(
 }
 
 static
-void _variant_declaration_free(struct declaration *declaration)
+void _variant_declaration_free(struct bt_declaration *declaration)
 {
 	struct declaration_variant *variant_declaration =
 		container_of(declaration, struct declaration_variant, p);
@@ -107,7 +107,7 @@ struct declaration_variant *
 	bt_variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag)
 {
 	struct declaration_variant *variant_declaration;
-	struct declaration *declaration;
+	struct bt_declaration *declaration;
 
 	variant_declaration = g_new(struct declaration_variant, 1);
 	declaration = &variant_declaration->p;
@@ -124,56 +124,9 @@ struct declaration_variant *
 	return variant_declaration;
 }
 
-/*
- * tag_instance is assumed to be an enumeration.
- * Returns 0 if OK, < 0 if error.
- */
-static
-int check_enum_tag(struct definition_variant *variant,
-		   struct bt_definition *enum_tag)
-{
-	struct definition_enum *_enum =
-		container_of(enum_tag, struct definition_enum, p);
-	struct declaration_enum *enum_declaration = _enum->declaration;
-	int missing_field = 0;
-	unsigned long i;
-
-	/*
-	 * Strictly speaking, each enumerator must map to a field of the
-	 * variant. However, we are even stricter here by requiring that each
-	 * variant choice map to an enumerator too. We then validate that the
-	 * number of enumerators equals the number of variant choices.
-	 */
-	if (variant->declaration->untagged_variant->fields->len != bt_enum_get_nr_enumerators(enum_declaration))
-		return -EPERM;
-
-	for (i = 0; i < variant->declaration->untagged_variant->fields->len; i++) {
-		struct declaration_field *field_declaration =
-			&g_array_index(variant->declaration->untagged_variant->fields,
-				       struct declaration_field, i);
-		if (!bt_enum_quark_to_range_set(enum_declaration, field_declaration->name)) {
-			missing_field = 1;
-			break;
-		}
-	}
-	if (missing_field)
-		return -EPERM;
-
-	/*
-	 * Check the enumeration: it must map each value to one and only one
-	 * enumerator tag.
-	 * TODO: we should also check that each range map to one and only one
-	 * tag. For the moment, we will simply check this dynamically in
-	 * variant_declaration_get_current_field().
-	 */
-	return 0;
-}
-
-
-
 static
 struct bt_definition *
-	_variant_definition_new(struct declaration *declaration,
+	_variant_definition_new(struct bt_declaration *declaration,
 				struct definition_scope *parent_scope,
 				GQuark field_name, int index,
 				const char *root_name)
@@ -206,8 +159,7 @@ struct bt_definition *
 						   variant_declaration->tag_name,
 						   parent_scope);
 					      
-	if (!variant->enum_tag
-	    || check_enum_tag(variant, variant->enum_tag) < 0)
+	if (!variant->enum_tag)
 		goto error;
 	bt_definition_ref(variant->enum_tag);
 	variant->fields = g_ptr_array_sized_new(variant_declaration->untagged_variant->fields->len);
@@ -259,7 +211,7 @@ void _variant_definition_free(struct bt_definition *definition)
 
 void bt_untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration,
 			    const char *field_name,
-			    struct declaration *field_declaration)
+			    struct bt_declaration *field_declaration)
 {
 	struct declaration_field *field;
 	unsigned long index;