X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Ftypes.c;h=327ddbb3a1102976ebcb3733affd547eba7cf660;hb=b9e662acc05d66a1eddda359712281fde8e6b120;hp=fe1538f0102c6a1824bac0485eef3e2cb8125fed;hpb=6a36ddcab611cb253bc589c61a2ef87a6d033867;p=babeltrace.git

diff --git a/types/types.c b/types/types.c
index fe1538f0..327ddbb3 100644
--- a/types/types.c
+++ b/types/types.c
@@ -329,7 +329,7 @@ int register_struct_declaration(GQuark struct_name,
 }
 
 static
-struct declaration_variant *
+struct declaration_untagged_variant *
 	lookup_variant_declaration_scope(GQuark variant_name,
 		struct declaration_scope *scope)
 {
@@ -337,11 +337,11 @@ struct declaration_variant *
 				   (gconstpointer) (unsigned long) variant_name);
 }
 
-struct declaration_variant *
+struct declaration_untagged_variant *
 	lookup_variant_declaration(GQuark variant_name,
 		struct declaration_scope *scope)
 {
-	struct declaration_variant *declaration;
+	struct declaration_untagged_variant *declaration;
 
 	while (scope) {
 		declaration = lookup_variant_declaration_scope(variant_name, scope);
@@ -353,7 +353,7 @@ struct declaration_variant *
 }
 
 int register_variant_declaration(GQuark variant_name,
-		struct declaration_variant *variant_declaration,
+		struct declaration_untagged_variant *untagged_variant_declaration,
 		struct declaration_scope *scope)
 {
 	if (!variant_name)
@@ -365,8 +365,8 @@ int register_variant_declaration(GQuark variant_name,
 
 	g_hash_table_insert(scope->variant_declarations,
 			    (gpointer) (unsigned long) variant_name,
-			    variant_declaration);
-	declaration_ref(&variant_declaration->p);
+			    untagged_variant_declaration);
+	declaration_ref(&untagged_variant_declaration->p);
 	return 0;
 }
 
@@ -446,12 +446,45 @@ struct definition_scope *
 	return scope;
 }
 
+/*
+ * in: path (dot separated), out: q (GArray of GQuark)
+ */
+void append_scope_path(const char *path, GArray *q)
+{
+	const char *ptrbegin, *ptrend = path;
+	GQuark quark;
+
+	for (;;) {
+		char *str;
+		size_t len;
+
+		ptrbegin = ptrend;
+		ptrend = strchr(ptrbegin, '.');
+		if (!ptrend)
+			break;
+		len = ptrend - ptrbegin;
+		/* Don't accept two consecutive dots */
+		assert(len != 0);
+		str = g_new(char, len + 1);	/* include \0 */
+		memcpy(str, ptrbegin, len);
+		str[len] = '\0';
+		quark = g_quark_from_string(str);
+		g_array_append_val(q, quark);
+		g_free(str);
+	}
+	/* last. Check for trailing dot (and discard). */
+	if (ptrbegin[0] != '\0') {
+		quark = g_quark_from_string(ptrbegin);
+		g_array_append_val(q, quark);
+	}
+}
+
 void set_dynamic_definition_scope(struct definition *definition,
 				  struct definition_scope *scope,
-				  GQuark root_name)
+				  const char *root_name)
 {
-	g_array_set_size(scope->scope_path, 1);
-	g_array_index(scope->scope_path, GQuark, 0) = root_name;
+	g_array_set_size(scope->scope_path, 0);
+	append_scope_path(root_name, scope->scope_path);
 	/*
 	 * Use INT_MAX order to ensure that all fields of the parent
 	 * scope are seen as being prior to this scope.