[m-rev.] trivial diff: fix nightly builds on jupiter and saturn

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Nov 2 23:11:42 AEDT 2006


Estimated hours taken: 0.1
Branches: main

Fix a problem that broke the nightly builds on jupiter and saturn.

compiler/handle_options.m:
 	Module qualify a call to list.member to avoid ambiguity errors
 	when compiling with intermodule optimization enabled.

 	Unqualify a call to solutions/2 - module qualifying calls to
 	solutions/2 is no longer necessary on the main branch.

Julien.

Index: handle_options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/handle_options.m,v
retrieving revision 1.278
diff -u -r1.278 handle_options.m
--- handle_options.m	1 Nov 2006 06:32:51 -0000	1.278
+++ handle_options.m	2 Nov 2006 11:34:56 -0000
@@ -2065,7 +2065,7 @@
      list(pair(grade_component, string))::out) is det.

  compute_grade_components(Options, GradeComponents) :-
-    solutions.solutions((pred(CompData::out) is nondet :-
+    solutions((pred(CompData::out) is nondet :-
          grade_component_table(Name, Comp, CompOpts, MaybeTargets,
              IncludeInGradeString),

@@ -2073,7 +2073,7 @@
          % actual grade string if all the option settings that it implies
          % are true.
          all [Opt, Value] (
-            member(Opt - Value, CompOpts)
+            list.member(Opt - Value, CompOpts)
          =>
              map.search(Options, Opt, Value)
          ),

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list