Modules - overwite import with local definition, re issue #625

trealla-prolog · Nov 12, 2024 · 465bb45 · 465bb45
1 parent ff50e2a
commit 465bb45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/module.c b/src/module.c
@@ -1484,10 +1484,10 @@ static bool check_not_multifile(module *m, predicate *pr, rule *dbe_orig)
 		}
 	}
 
-	if (pr->alias) {
-		//fprintf(stderr, "Warning: overwriting %s:'%s'/%u\n", pr->m->name, C_STR(m, &pr->key), pr->key.arity);
-		//pr->meta_args = NULL;
-		//pr->alias = NULL;
+	if (pr->alias && (m == m->pl->user_m)) {
+		fprintf(stderr, "Warning: overwriting %s:'%s'/%u\n", pr->m->name, C_STR(m, &pr->key), pr->key.arity);
+		pr->meta_args = NULL;
+		pr->alias = NULL;
 	}
 
 	return true;

diff --git a/tests/tests/test072.pl b/tests/tests/test072.pl
@@ -20,7 +20,7 @@
 var_list(N, L) :-
     length(L, N).
 
-transpose(M, T) :-
+my_transpose(M, T) :-
     [H|_] = M,
     length(H, NCols),
     from_to(1, NCols, L),
@@ -188,7 +188,7 @@
     ad_partition(Size, Partition),
     rep_perm(Size, Partition, Permutation),
     list_permute(Permutation, M, P),
-    transpose(P, M),
+    my_transpose(P, M),
     distinct(M),
     eval_matrix(M, Frequencies),
     total(Frequencies, Total).