[m-rev.] diff: fix up some minor things in extras

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Fix up some minor things in the extras distribution.

extras/cgi/Mmakefile:
	Don't warn about mercury_www not exporting anything.

extras/complex_numbers/*.m:
	Replace `:' as the module qualifier.

	Use float.float/1 instead of the now obsolete
	int.to_float/2.

extras/concurrency/midimon.m:
	Replace `:' as the module qualifier.

extras/trailed_update/Mmakefile:
	Don't warn about trailed_update not exporting anything.

extras/xml/*.m:
	Replace `:' as the module qualifier.
	Remove some unnecessary imports.
	Put an underscore in front of an unused variable.

Julien.

Index: cgi/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/cgi/Mmakefile,v
retrieving revision 1.4
diff -u -r1.4 Mmakefile
--- cgi/Mmakefile	16 Jan 2003 10:44:10 -0000	1.4
+++ cgi/Mmakefile	24 Jul 2004 17:10:58 -0000
@@ -12,6 +12,8 @@

 MAIN_TARGET = $(LIBRARY)

+MCFLAGS-mercury_www = --no-warn-nothing-exported
+
 depend: mercury_www.depend

 distclean: realclean
Index: complex_numbers/complex_float.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/complex_float.m,v
retrieving revision 1.5
diff -u -r1.5 complex_float.m
--- complex_numbers/complex_float.m	23 Sep 2001 06:35:20 -0000	1.5
+++ complex_numbers/complex_float.m	24 Jul 2004 17:12:03 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:complex_float.
+:- module complex_numbers__complex_float.
 :- interface.
-:- import_module complex_numbers:complex, float.
+:- import_module complex_numbers__complex, float.

 	% addition
 :- func complex + float = complex.
Index: complex_numbers/complex_imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/complex_imag.m,v
retrieving revision 1.5
diff -u -r1.5 complex_imag.m
--- complex_numbers/complex_imag.m	23 Sep 2001 06:35:21 -0000	1.5
+++ complex_numbers/complex_imag.m	24 Jul 2004 17:12:53 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:complex_imag.
+:- module complex_numbers__complex_imag.
 :- interface.
-:- import_module complex_numbers:complex, complex_numbers:imag.
+:- import_module complex_numbers__complex, complex_numbers__imag.

 	% addition
 :- func complex + imag = complex.
Index: complex_numbers/float_complex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/float_complex.m,v
retrieving revision 1.5
diff -u -r1.5 float_complex.m
--- complex_numbers/float_complex.m	23 Sep 2001 06:35:23 -0000	1.5
+++ complex_numbers/float_complex.m	24 Jul 2004 17:13:54 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:float_complex.
+:- module complex_numbers__float_complex.
 :- interface.
-:- import_module float, complex_numbers:complex.
+:- import_module float, complex_numbers__complex.

 	% addition
 :- func float + complex = complex.
@@ -38,7 +38,7 @@
 %---------------------------------------------------------------------------%

 :- implementation.
-:- import_module complex_numbers:complex_float.
+:- import_module complex_numbers__complex_float.

 XR + cmplx(YR, YI) = cmplx(XR + YR, + YI).
 XR - cmplx(YR, YI) = cmplx(XR - YR, - YI).
Index: complex_numbers/float_imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/float_imag.m,v
retrieving revision 1.5
diff -u -r1.5 float_imag.m
--- complex_numbers/float_imag.m	23 Sep 2001 06:35:24 -0000	1.5
+++ complex_numbers/float_imag.m	24 Jul 2004 17:14:29 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:float_imag.
+:- module complex_numbers__float_imag.
 :- interface.
-:- import_module float, complex_numbers:imag, complex_numbers:complex.
+:- import_module float, complex_numbers__imag, complex_numbers__complex.

 	% addition
 :- func float + imag = complex.
Index: complex_numbers/imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag.m,v
retrieving revision 1.5
diff -u -r1.5 imag.m
--- complex_numbers/imag.m	23 Sep 2001 06:35:24 -0000	1.5
+++ complex_numbers/imag.m	24 Jul 2004 17:16:02 -0000
@@ -26,7 +26,7 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:imag.
+:- module complex_numbers__imag.
 :- interface.
 :- import_module float.

Index: complex_numbers/imag_complex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag_complex.m,v
retrieving revision 1.5
diff -u -r1.5 imag_complex.m
--- complex_numbers/imag_complex.m	23 Sep 2001 06:35:24 -0000	1.5
+++ complex_numbers/imag_complex.m	24 Jul 2004 17:16:37 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:imag_complex.
+:- module complex_numbers__imag_complex.
 :- interface.
-:- import_module complex_numbers:imag, complex_numbers:complex.
+:- import_module complex_numbers__imag, complex_numbers__complex.

 	% addition
 :- func imag + complex = complex.
Index: complex_numbers/imag_float.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag_float.m,v
retrieving revision 1.5
diff -u -r1.5 imag_float.m
--- complex_numbers/imag_float.m	23 Sep 2001 06:35:24 -0000	1.5
+++ complex_numbers/imag_float.m	24 Jul 2004 17:17:31 -0000
@@ -15,9 +15,9 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:imag_float.
+:- module complex_numbers__imag_float.
 :- interface.
-:- import_module complex_numbers:imag, float, complex_numbers:complex.
+:- import_module complex_numbers__imag, float, complex_numbers__complex.

 	% addition
 :- func imag + float = complex.
Index: complex_numbers/samples/fft.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/samples/fft.m,v
retrieving revision 1.4
diff -u -r1.4 fft.m
--- complex_numbers/samples/fft.m	18 Nov 1998 16:29:40 -0000	1.4
+++ complex_numbers/samples/fft.m	24 Jul 2004 17:18:47 -0000
@@ -25,7 +25,7 @@
 %------------------------------------------------------------------------------%
 :- interface.

-:- import_module list, complex_numbers, complex_numbers:complex.
+:- import_module list, complex_numbers, complex_numbers__complex.

 :- pred fft(list(complex), list(complex)).
 :- mode fft(in, out) is det.
@@ -40,7 +40,7 @@
 	bit_rev(Ins, Shuffle),
 	list__length(Shuffle, NInt),
 	int__log2(NInt, R),
-	int__to_float(NInt, N),
+	N = float(NInt),
 		% Now recombine the component transforms
 	combine(N, 1.0, R, Shuffle, Outs).

Index: complex_numbers/tests/complex_test.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/tests/complex_test.m,v
retrieving revision 1.2
diff -u -r1.2 complex_test.m
--- complex_numbers/tests/complex_test.m	29 May 1998 09:08:43 -0000	1.2
+++ complex_numbers/tests/complex_test.m	24 Jul 2004 17:20:09 -0000
@@ -4,14 +4,14 @@
 :- interface.
 :- import_module io.

-:- pred main(state::di, state::uo) is det.
+:- pred main(io::di, io::uo) is det.

 :- implementation.
 :- import_module float.
 :- import_module complex_numbers.
-:- import_module complex_numbers:complex, complex_numbers:imag.
-:- import_module complex_numbers:complex_imag, complex_numbers:imag_complex.
-:- import_module complex_numbers:float_imag, complex_numbers:imag_float.
+:- import_module complex_numbers__complex, complex_numbers__imag.
+:- import_module complex_numbers__complex_imag, complex_numbers__imag_complex.
+:- import_module complex_numbers__float_imag, complex_numbers__imag_float.

 main -->
 	print("tests of (complex op complex)"), nl,
Index: concurrency/midimon.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/concurrency/midimon.m,v
retrieving revision 1.1
diff -u -r1.1 midimon.m
--- concurrency/midimon.m	29 Feb 2000 22:37:14 -0000	1.1
+++ concurrency/midimon.m	24 Jul 2004 17:22:32 -0000
@@ -4,7 +4,7 @@

 :- import_module io.

-:- pred main(io:state, io:state).
+:- pred main(io__state, io__state).
 :- mode main(di, uo) is cc_multi.

 :- implementation.
Index: trailed_update/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/Mmakefile,v
retrieving revision 1.12
diff -u -r1.12 Mmakefile
--- trailed_update/Mmakefile	18 May 2001 14:23:51 -0000	1.12
+++ trailed_update/Mmakefile	24 Jul 2004 17:37:48 -0000
@@ -18,6 +18,8 @@

 MAIN_TARGET = libtrailed_update

+MCFLAGS-trailed_update=--no-warn-nothing-exported
+
 .PHONY: depend
 depend: trailed_update.depend
 	cd samples && mmake $(MMAKEFLAGS) depend
Index: xml/tryit.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/tryit.m,v
retrieving revision 1.4
diff -u -r1.4 tryit.m
--- xml/tryit.m	22 Jan 2002 14:21:51 -0000	1.4
+++ xml/tryit.m	24 Jul 2004 17:29:14 -0000
@@ -13,11 +13,12 @@

 :- import_module io.

-:- pred main(io__state::di, io__state::uo) is cc_multi.
+:- pred main(io__state::di, io__state::uo) is det.

 :- implementation.

-:- import_module parsing, xml, xml:cat, xml:encoding, xml:parse, xml:ns.
+:- import_module parsing, xml, xml__cat, xml__encoding.
+:- import_module xml__parse, xml__ns.
 :- import_module char, list, map, std_util, string.

 main -->
Index: xml/unicode.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/unicode.m,v
retrieving revision 1.1
diff -u -r1.1 unicode.m
--- xml/unicode.m	5 Sep 2000 22:33:58 -0000	1.1
+++ xml/unicode.m	24 Jul 2004 17:23:45 -0000
@@ -11,8 +11,6 @@

 :- interface.

-:- import_module list.
-
 :- type unicode == int.

 :- func ('!') = unicode.
Index: xml/xml.ns.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.ns.m,v
retrieving revision 1.1
diff -u -r1.1 xml.ns.m
--- xml/xml.ns.m	5 Jan 2001 04:15:44 -0000	1.1
+++ xml/xml.ns.m	24 Jul 2004 17:29:42 -0000
@@ -123,7 +123,7 @@
 		),

 		% extract any namespace declaration and insert into tree
-		extractNamespaceDecls(Attrs1, NSList, Attrs2),
+		extractNamespaceDecls(Attrs1, NSList, _Attrs2),
 		list__foldl((pred((Pref - URI)::in, NSs1::in,
 			NSs2::out) is det :-
 			map__set(NSs1, Pref, URI, NSs2)

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------