[m-rev.] trivial diff: fix benchmarks test failures

Simon Taylor stayl at cs.mu.OZ.AU
Fri Mar 15 18:28:49 AEDT 2002



Estimated hours taken: 0.1
Branches: main

tests/benchmarks/poly.m:
tests/benchmarks/crypt.m:
	Add module qualifiers on calls to `odd' and `even', to avoid
	ambiguities with the versions in the standard library.

Index: crypt.m
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/crypt.m,v
retrieving revision 1.5
diff -u -u -r1.5 crypt.m
--- crypt.m	18 Sep 2000 01:24:20 -0000	1.5
+++ crypt.m	15 Mar 2002 07:27:07 -0000
@@ -71,13 +71,14 @@
 :- mode lefteven(out) is multidet.
 
 crypt([A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P]) :-
-	odd(A), even(B), even(C), even(E),
+	crypt__odd(A), crypt__even(B), crypt__even(C), crypt__even(E),
 	mult([C, B, A], E, [I, H, G, F | X]),
-	lefteven(F), odd(G), even(H), even(I), zero(X), lefteven(D),
+	lefteven(F), crypt__odd(G), crypt__even(H), crypt__even(I),
+	zero(X), lefteven(D),
 	mult([C, B, A], D, [L, K, J | Y]),
-	lefteven(J), odd(K), even(L), zero(Y),
+	lefteven(J), crypt__odd(K), crypt__even(L), zero(Y),
 	sum2([I, H, G, F], [0, L, K, J], [P, O, N, M | Z]),
-	odd(M), odd(N), even(O), even(P), zero(Z).
+	crypt__odd(M), crypt__odd(N), crypt__even(O), crypt__even(P), zero(Z).
 	% write(' '), write(A), write(B), write(C), nl,
 	% write('  '), write(D), write(E), nl,
 	% write(F), write(G), write(H), write(I), nl,
Index: poly.m
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/poly.m,v
retrieving revision 1.2
diff -u -u -r1.2 poly.m
--- poly.m	9 Sep 1995 00:08:29 -0000	1.2
+++ poly.m	15 Mar 2002 07:26:51 -0000
@@ -221,7 +221,7 @@
 poly_exp(N, Poly, Result) :-
 	( N = 0 ->
 		Result = const(1)
-	; even(N) ->
+	; poly__even(N) ->
 		M is N // 2,
 		poly_exp(M, Poly, Part),
 		poly_mul(Part, Part, Result)
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list