Avoid warnings in benchmarks.

Mercury-Language · May 16, 2020 · 7437180 · 7437180
1 parent 06c9ecb
commit 7437180
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 27 deletions.
diff --git a/benchmarks/progs/icfp2000_no_iostate/eval_util.m b/benchmarks/progs/icfp2000_no_iostate/eval_util.m
@@ -19,7 +19,7 @@
 
 :- implementation.
 
-:- import_module int, list, exception, map, string, gml.
+:- import_module int, list, exception, map, string.
 :- import_module pprint.
 
 write_nice_exception(E) -->

diff --git a/benchmarks/progs/icfp2000_no_iostate/peephole.m b/benchmarks/progs/icfp2000_no_iostate/peephole.m
@@ -9,7 +9,7 @@
 
 :- implementation.
 
-:- import_module eval, gml, op, vector.
+:- import_module gml, op, vector.
 :- import_module bool, float, int, list, io, map, string.
 :- import_module maybe.
 

diff --git a/benchmarks/progs/icfp2000_no_iostate/precompute_lights.m b/benchmarks/progs/icfp2000_no_iostate/precompute_lights.m
@@ -26,7 +26,7 @@
 :- implementation.
 
 :- import_module exception, float, int.
-:- import_module space_partition, renderer.
+:- import_module renderer.
 :- import_module maybe.
 :- import_module pair.
 %------------------------------------------------------------------------------%

diff --git a/benchmarks/progs/icfp2000_no_iostate/renderer.m b/benchmarks/progs/icfp2000_no_iostate/renderer.m
@@ -32,7 +32,7 @@
 :- import_module transform_object, gml, op.
 :- import_module precompute_lights.
 :- import_module map, array, exception, require, math.
-:- import_module int, float, list, std_util, string.
+:- import_module int, float, std_util, string.
 
 do_rendering(State, !IO) :-
     RenderCommands = State ^ s_render_commands,

diff --git a/benchmarks/progs/icfp2000_no_iostate/trans.m b/benchmarks/progs/icfp2000_no_iostate/trans.m
@@ -198,7 +198,7 @@
 
 :- implementation.
 
-:- import_module exception, string, math, list, std_util.
+:- import_module exception, string, math, std_util.
 
     % NOTE 1: points and vectors are represented using the point/3 type
     % defined in eval.m.  For the purposes, a point (x, y, z) is

diff --git a/benchmarks/progs/icfp2000_no_iostate_no_accum/eval_util.m b/benchmarks/progs/icfp2000_no_iostate_no_accum/eval_util.m
@@ -19,7 +19,7 @@
 
 :- implementation.
 
-:- import_module int, list, exception, map, string, gml.
+:- import_module int, list, exception, map, string.
 :- import_module pprint.
 
 write_nice_exception(E) -->

diff --git a/benchmarks/progs/icfp2000_no_iostate_no_accum/peephole.m b/benchmarks/progs/icfp2000_no_iostate_no_accum/peephole.m
@@ -9,7 +9,7 @@
 
 :- implementation.
 
-:- import_module eval, gml, op, vector.
+:- import_module gml, op, vector.
 :- import_module bool, float, int, list, io, map, string.
 :- import_module maybe.
 

diff --git a/benchmarks/progs/icfp2000_no_iostate_no_accum/renderer.m b/benchmarks/progs/icfp2000_no_iostate_no_accum/renderer.m
@@ -32,7 +32,7 @@
 :- import_module transform_object, gml, op.
 :- import_module precompute_lights.
 :- import_module map, array, exception, require, math.
-:- import_module int, float, list, std_util, string.
+:- import_module int, float, std_util, string.
 :- import_module cord.
 
 do_rendering(State, !IO) :-

diff --git a/benchmarks/progs/icfp2000_no_iostate_no_accum/trans.m b/benchmarks/progs/icfp2000_no_iostate_no_accum/trans.m
@@ -198,7 +198,7 @@
 
 :- implementation.
 
-:- import_module exception, string, math, list, std_util.
+:- import_module exception, string, math, std_util.
 
     % NOTE 1: points and vectors are represented using the point/3 type
     % defined in eval.m.  For the purposes, a point (x, y, z) is

diff --git a/benchmarks/progs/icfp2000_par/eval.m b/benchmarks/progs/icfp2000_par/eval.m
@@ -156,7 +156,6 @@
 
 :- import_module int.
 :- import_module float.
-:- import_module maybe.
 :- import_module pair.
 :- import_module exception.
 :- import_module string.
@@ -614,8 +613,6 @@
 :- pred extra_operator_mode(extra_operator::in,
     extra_operator::out(extra_operator_inst)) is det.
 
-:- pragma promise_pure(extra_operator_mode/2).
-
 :- pragma foreign_proc("C",
     extra_operator_mode(A::in, B::out(extra_operator_inst)),
     [will_not_call_mercury, thread_safe, promise_pure],

diff --git a/benchmarks/progs/icfp2000_par/eval_util.m b/benchmarks/progs/icfp2000_par/eval_util.m
@@ -24,8 +24,6 @@
 
 :- implementation.
 
-:- import_module gml.
-
 :- import_module exception.
 :- import_module int.
 :- import_module list.

diff --git a/benchmarks/progs/icfp2000_par/main.m b/benchmarks/progs/icfp2000_par/main.m
@@ -31,7 +31,7 @@
 
 main(!IO) :-
     io.command_line_arguments(AllArgs, !IO),
-    OptionOps = option_ops(short_option, long_option, option_defaults),
+    OptionOps = option_ops_multi(short_option, long_option, option_defaults),
     getopt.process_options(OptionOps, AllArgs, _OptionArgs, NonOptionArgs,
         OptionResult),
     (
@@ -102,7 +102,7 @@
 long_option("target-parallelism",   target_parallelism).
 long_option("time_filename",        time_filename).
 
-:- pred option_defaults(option::out, option_data::out) is nondet.
+:- pred option_defaults(option::out, option_data::out) is multi.
 
 option_defaults(target_parallelism, int(0)).
 option_defaults(time_filename, string("")).

diff --git a/benchmarks/progs/icfp2000_par/peephole.m b/benchmarks/progs/icfp2000_par/peephole.m
@@ -13,7 +13,6 @@
 
 :- implementation.
 
-:- import_module eval.
 :- import_module gml.
 :- import_module op.
 :- import_module vector.

diff --git a/benchmarks/progs/icfp2000_par/precompute_lights.m b/benchmarks/progs/icfp2000_par/precompute_lights.m
@@ -34,7 +34,6 @@
 :- implementation.
 
 :- import_module renderer.
-:- import_module space_partition.
 
 :- import_module exception.
 :- import_module float.

diff --git a/benchmarks/progs/icfp2000_par/renderer.m b/benchmarks/progs/icfp2000_par/renderer.m
@@ -53,11 +53,8 @@
 :- import_module exception.
 :- import_module float.
 :- import_module int.
-:- import_module list.
 :- import_module map.
 :- import_module math.
-:- import_module maybe.
-:- import_module pair.
 :- import_module require.
 :- import_module string.
 

diff --git a/benchmarks/progs/icfp2000_par/trans.m b/benchmarks/progs/icfp2000_par/trans.m
@@ -179,7 +179,6 @@
 :- implementation.
 
 :- import_module exception.
-:- import_module list.
 :- import_module math.
 :- import_module std_util.
 :- import_module string.

diff --git a/benchmarks/progs/icfp2000_par_pbone/eval_util.m b/benchmarks/progs/icfp2000_par_pbone/eval_util.m
@@ -19,7 +19,7 @@
 
 :- implementation.
 
-:- import_module int, list, exception, map, string, gml.
+:- import_module int, list, exception, map, string.
 :- import_module pprint.
 
 write_nice_exception(E) -->

diff --git a/benchmarks/progs/icfp2000_par_pbone/peephole.m b/benchmarks/progs/icfp2000_par_pbone/peephole.m
@@ -9,7 +9,7 @@
 
 :- implementation.
 
-:- import_module eval, gml, op, vector.
+:- import_module gml, op, vector.
 :- import_module bool, float, int, list, io, map, string.
 :- import_module maybe.
 

diff --git a/benchmarks/progs/icfp2000_par_pbone/precompute_lights.m b/benchmarks/progs/icfp2000_par_pbone/precompute_lights.m
@@ -26,7 +26,7 @@
 :- implementation.
 
 :- import_module exception, float, int.
-:- import_module space_partition, renderer.
+:- import_module renderer.
 :- import_module maybe.
 :- import_module pair.
 %------------------------------------------------------------------------------%

diff --git a/benchmarks/progs/icfp2000_par_pbone/renderer.m b/benchmarks/progs/icfp2000_par_pbone/renderer.m
@@ -32,7 +32,7 @@
 :- import_module transform_object, gml, op.
 :- import_module precompute_lights.
 :- import_module map, array, exception, require, math.
-:- import_module int, float, list, std_util, string.
+:- import_module int, float, std_util, string.
 :- import_module cord.
 
 do_rendering(State, !IO) :-

diff --git a/benchmarks/progs/icfp2000_par_pbone/trans.m b/benchmarks/progs/icfp2000_par_pbone/trans.m
@@ -198,7 +198,7 @@
 
 :- implementation.
 
-:- import_module exception, string, math, list, std_util.
+:- import_module exception, string, math, std_util.
 
     % NOTE 1: points and vectors are represented using the point/3 type
     % defined in eval.m.  For the purposes, a point (x, y, z) is