Add info about duplicated symbols.

Author: viferga

source/adt/include/adt/adt_set.h

@@ -66,6 +66,8 @@ ADT_API int set_contains(set s, set_key key);
 
 ADT_API int set_contains_any(set dest, set src);
 
+ADT_API int set_contains_which(set dest, set src, set_key *key);
+
 ADT_API set_value set_remove(set s, set_key key);
 
 ADT_API void set_iterate(set s, set_cb_iterate iterate_cb, set_cb_iterate_args args);

source/adt/source/adt_set.c

@@ -55,7 +55,15 @@ struct set_contains_any_cb_iterator_type
 	int result;
 };
 
+struct set_contains_which_cb_iterator_type
+{
+	set s;
+	int result;
+	set_key *key;
+};
+
 typedef struct set_contains_any_cb_iterator_type *set_contains_any_cb_iterator;
+typedef struct set_contains_which_cb_iterator_type *set_contains_which_cb_iterator;
 
 /* -- Methods -- */
 
@@ -311,6 +319,40 @@ int set_contains_any(set dest, set src)
 	return args.result;
 }
 
+static int set_contains_which_cb_iterate(set s, set_key key, set_value value, set_cb_iterate_args args)
+{
+	set_contains_which_cb_iterator iterator = (set_contains_which_cb_iterator)args;
+
+	(void)s;
+	(void)value;
+
+	iterator->result = set_contains(iterator->s, key);
+
+	if (iterator->result == 0)
+	{
+		iterator->key = key;
+	}
+
+	/* Stop iteration if we found an element */
+	return !iterator->result;
+}
+
+int set_contains_which(set dest, set src, set_key *key)
+{
+	struct set_contains_which_cb_iterator_type args;
+
+	args.s = dest;
+	args.result = 1;
+	args.key = NULL;
+
+	set_iterate(src, &set_contains_which_cb_iterate, (set_cb_iterate_args)&args);
+
+	/* Return which is the duplicated key if any */
+	*key = args.key;
+
+	return args.result;
+}
+
 set_value set_remove(set s, set_key key)
 {
 	set_hash h;

source/loader/source/loader_impl.c

@@ -664,10 +664,12 @@ int loader_impl_handle_register(loader_impl impl, char *name, loader_handle_impl
 {
 	if (handle_ptr == NULL)
 	{
-		if (context_contains(impl->ctx, handle_impl->ctx) == 0)
+		char *duplicated_key = NULL;
+
+		if (context_contains(impl->ctx, handle_impl->ctx, &duplicated_key) == 0)
 		{
 			/* TODO: This still does not protect duplicated names between different loaders global scope */
-			log_write("metacall", LOG_LEVEL_ERROR, "There are duplicated symbols already loaded in the global scope conflicting with handle: %s", name);
+			log_write("metacall", LOG_LEVEL_ERROR, "Duplicated symbol found named '%s' already defined in the global scope by handle: %s", duplicated_key, name);
 		}
 		else if (context_append(impl->ctx, handle_impl->ctx) == 0)
 		{

source/reflect/include/reflect/reflect_context.h

@@ -41,7 +41,7 @@ REFLECT_API scope context_scope(context ctx);
 
 REFLECT_API int context_append(context dest, context src);
 
-REFLECT_API int context_contains(context dest, context src);
+REFLECT_API int context_contains(context dest, context src, char **duplicated);
 
 REFLECT_API int context_remove(context dest, context src);
 

source/reflect/include/reflect/reflect_scope.h

@@ -52,7 +52,7 @@ REFLECT_API value scope_undef(scope sp, const char *key);
 
 REFLECT_API int scope_append(scope dest, scope src);
 
-REFLECT_API int scope_contains(scope dest, scope src);
+REFLECT_API int scope_contains(scope dest, scope src, char **duplicated);
 
 REFLECT_API int scope_remove(scope dest, scope src);
 

source/reflect/source/reflect_context.c

@@ -87,9 +87,9 @@ int context_append(context dest, context src)
 	return scope_append(dest->sp, src->sp);
 }
 
-int context_contains(context dest, context src)
+int context_contains(context dest, context src, char **duplicated)
 {
-	return scope_contains(dest->sp, src->sp);
+	return scope_contains(dest->sp, src->sp, duplicated);
 }
 
 int context_remove(context dest, context src)

source/reflect/source/reflect_scope.c

@@ -457,9 +457,9 @@ int scope_append(scope dest, scope src)
 	return set_append(dest->objects, src->objects);
 }
 
-int scope_contains(scope dest, scope src)
+int scope_contains(scope dest, scope src, char **duplicated)
 {
-	return set_contains_any(dest->objects, src->objects);
+	return set_contains_which(dest->objects, src->objects, (set_key*)duplicated);
 }
 
 int scope_remove(scope dest, scope src)