Minor updates for benchmarks.

benchmarks/progs/tree234/tree234x.m: benchmarks/progs/pic/mercury/utils.m: Replace uses of is a synonym for unification. benchmarks/progs/training_cars/*.m: Delete implementation imports that shadow those in the interface.
Mercury-Language · Jan 25, 2021 · c00b42e · c00b42e
1 parent 7162437
commit c00b42e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/benchmarks/progs/pic/mercury/utils.m b/benchmarks/progs/pic/mercury/utils.m
@@ -48,7 +48,7 @@
 map_array2d_with_indices(X, Y, F, !Array) :-
 	(   Y = 0
 	->  true
-	;   Y1 is Y - 1,
+	;   Y1 = Y - 1,
 	    map_array2d_with_indices_row(X, Y1, F, !Array),
 	    map_array2d_with_indices(X, Y1, F, !Array)
 	).

diff --git a/benchmarks/progs/training_cars/training_cars_150.m b/benchmarks/progs/training_cars/training_cars_150.m
@@ -20,7 +20,7 @@
 
 :- implementation.
 
-:- import_module std_util, pair, list, string.
+:- import_module std_util, pair, list.
 
 % automatically generated facts follow:
 

diff --git a/benchmarks/progs/training_cars/training_cars_full.m b/benchmarks/progs/training_cars/training_cars_full.m
@@ -20,7 +20,7 @@
 
 :- implementation.
 
-:- import_module pair, list, string.
+:- import_module pair, list.
 
 % automatically generated facts follow:
 

diff --git a/benchmarks/progs/training_cars/training_cars_one.m b/benchmarks/progs/training_cars/training_cars_one.m
@@ -20,7 +20,7 @@
 
 :- implementation.
 
-:- import_module std_util, pair, list, string.
+:- import_module std_util, pair, list.
 
 % automatically generated facts follow:
 

diff --git a/benchmarks/progs/training_cars/training_cars_small.m b/benchmarks/progs/training_cars/training_cars_small.m
@@ -20,7 +20,7 @@
 
 :- implementation.
 
-:- import_module std_util, pair, list, string.
+:- import_module std_util, pair, list.
 
 % automatically generated facts follow:
 

diff --git a/benchmarks/progs/training_cars/training_cars_three.m b/benchmarks/progs/training_cars/training_cars_three.m
@@ -20,7 +20,7 @@
 
 :- implementation.
 
-:- import_module std_util, pair, list, string.
+:- import_module std_util, pair, list.
 
 % automatically generated facts follow:
 

diff --git a/benchmarks/progs/tree234/tree234x.m b/benchmarks/progs/tree234/tree234x.m
@@ -2491,18 +2491,18 @@
 tree234x__count(two(_, _, T0, T1), N) :-
 	tree234x__count(T0, N0),
 	tree234x__count(T1, N1),
-	N is 1 + N0 + N1.
+	N = 1 + N0 + N1.
 tree234x__count(three(_, _, _, _, T0, T1, T2), N) :-
 	tree234x__count(T0, N0),
 	tree234x__count(T1, N1),
 	tree234x__count(T2, N2),
-	N is 2 + N0 + N1 + N2.
+	N = 2 + N0 + N1 + N2.
 tree234x__count(four(_, _, _, _, _, _, T0, T1, T2, T3), N) :-
 	tree234x__count(T0, N0),
 	tree234x__count(T1, N1),
 	tree234x__count(T2, N2),
 	tree234x__count(T3, N3),
-	N is 3 + N0 + N1 + N2 + N3.
+	N = 3 + N0 + N1 + N2 + N3.
 
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%