[m-rev.] trivial diff: fix compilation of compiler with `--intermodule-optimization'

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

compiler/mcsolver.m:
	Add module qualifiers in order to avoid ambiguous overloadings
	when compile with `--intermodule-optimization'.

Julien.

Index: mcsolver.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mcsolver.m,v
retrieving revision 1.1
diff -u -r1.1 mcsolver.m
--- mcsolver.m	2 Feb 2006 00:37:58 -0000	1.1
+++ mcsolver.m	2 Feb 2006 12:52:36 -0000
@@ -383,25 +383,25 @@
     Eqvs = PCs ^ prep_eqv_vars,

     Assgts =
-        map(
+        list.map(
             func(X == V) = (eqv_var(Eqvs, X) == V),
             PCs ^ prep_assgts
         ),

     Impls =
-        map(
+        list.map(
             func((X == VX) `implies` (Y == VY)) =
                 ((eqv_var(Eqvs, X) == VX) `implies` (eqv_var(Eqvs, Y) == VY)),
             PCs ^ prep_impls
         ),

     ComplexCstrts =
-        map(eqv_complex_cstrt(Eqvs), PCs ^ prep_complex_cstrts),
+        list.map(eqv_complex_cstrt(Eqvs), PCs ^ prep_complex_cstrts),

         % Construct the propagation graph.
         %
     PropGraph =
-        foldl(
+        list.foldl(
             func(((X == VX) `implies` (Y == VY)), YesPG - NoPG) =
                 ( if   VX = yes then set(YesPG, X, (Y == VY)) - NoPG
                                 else YesPG - set(NoPG, X, (Y == VY))
@@ -413,7 +413,7 @@
         % Construct the complex constraints map.
         %
     ComplexCstrtsMap =
-        foldl(
+        list.foldl(
             func(ComplexCstrt, CCM) =
                 foldl(
                     func(Z, CCMa) = multi_map.set(CCMa, Z, ComplexCstrt),
@@ -427,21 +427,21 @@
         % Find the set of variables we have to solve for.
         %
     AssgtVars =
-        foldl(
+        list.foldl(
             func((X == _V), Vars) = [X | Vars],
             Assgts,
             []
         ),

     AndImplVars =
-        foldl(
+        list.foldl(
             func((X == _VX) `implies` (Y == _VY), Vars) = [X, Y | Vars],
             Impls,
             AssgtVars
         ),

     AndComplexCstrtVars =
-        foldl(
+        list.foldl(
             func(ComplexCstrt, Vars) =
                 complex_cstrt_vars(ComplexCstrt) ++ Vars,
             ComplexCstrts,
@@ -466,7 +466,7 @@
     %
 :- func eqv_vars(eqv_vars, vars) = vars.

-eqv_vars(Eqvs, Xs) = map(eqv_var(Eqvs), Xs).
+eqv_vars(Eqvs, Xs) = list.map(eqv_var(Eqvs), Xs).

     % Returns all the variables that participate in this constraint.
     %
@@ -621,7 +621,7 @@
         ;
             V  = no,
 % unsafe.io(write_string("0<")),
-            solve_assgts(SCs, map(func(Z) = (Z == no), Zs), Bs0, Bs)
+            solve_assgts(SCs, list.map(func(Z) = (Z == no), Zs), Bs0, Bs)
         )
       else /* X in Zs */
         (
@@ -645,7 +645,7 @@
     ;
         V  = yes,
         list.delete_first(Ys0, X, Ys),
-        solve_assgts(SCs, map(func(Y) = (Y == no), Ys), Bs0, Bs)
+        solve_assgts(SCs, list.map(func(Y) = (Y == no), Ys), Bs0, Bs)
     ).

 solve_complex_cstrt(SCs, X, V, exactly_one(Ys0), Bs0, Bs) :-
@@ -666,7 +666,7 @@
     ;
         V  = yes,
         list.delete_first(Ys0, X, Ys),
-        solve_assgts(SCs, map(func(Y) = (Y == no), Ys), Bs0, Bs)
+        solve_assgts(SCs, list.map(func(Y) = (Y == no), Ys), Bs0, Bs)
     ).

 solve_complex_cstrt(SCs, X, V, disj_of_assgts(Assgtss), Bs0, Bs) :-
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------