[m-rev.] trivial diff: update module qualifiers in extras/complex

Julien Fischer juliensf at cs.mu.OZ.AU
Wed Feb 9 23:47:29 AEDT 2005


Estimated hours taken: 0.1
Branches: main, release

extras/complex_numbers/*.m:
extras/complex_numbers/samples/fft.m:
extras/complex_numbers/tests/complex_test.m:
	Standardize the module qualifier used in this modules
	to `.'.

Julien.

Index: complex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/complex.m,v
retrieving revision 1.6
diff -u -r1.6 complex.m
--- complex.m	23 Sep 2001 06:35:20 -0000	1.6
+++ complex.m	9 Feb 2005 12:36:08 -0000
@@ -19,7 +19,7 @@
 %
 %---------------------------------------------------------------------------%

-:- module complex_numbers:complex.
+:- module complex_numbers.complex.
 :- interface.

 :- type complex ---> cmplx(float, float).	% real part, imag part
Index: complex_float.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/complex_float.m,v
retrieving revision 1.6
diff -u -r1.6 complex_float.m
--- complex_float.m	30 Jul 2004 07:02:42 -0000	1.6
+++ complex_float.m	9 Feb 2005 12:36:36 -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.
@@ -51,7 +51,7 @@

 pow(Z0, P) = Z :-
 	complex_to_polar(Z0, L0, Th0),
-	L = math__pow(L0, P),
+	L = math.pow(L0, P),
 	Th = Th0 * P,
 	Z = polar_to_complex(L, Th).

Index: complex_imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/complex_imag.m,v
retrieving revision 1.6
diff -u -r1.6 complex_imag.m
--- complex_imag.m	30 Jul 2004 07:02:42 -0000	1.6
+++ complex_imag.m	9 Feb 2005 12:37:12 -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: float_complex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/float_complex.m,v
retrieving revision 1.6
diff -u -r1.6 float_complex.m
--- float_complex.m	30 Jul 2004 07:02:42 -0000	1.6
+++ float_complex.m	9 Feb 2005 12:37:46 -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: float_imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/float_imag.m,v
retrieving revision 1.6
diff -u -r1.6 float_imag.m
--- float_imag.m	30 Jul 2004 07:02:42 -0000	1.6
+++ float_imag.m	9 Feb 2005 12:38:03 -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: imag.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag.m,v
retrieving revision 1.6
diff -u -r1.6 imag.m
--- imag.m	30 Jul 2004 07:02:42 -0000	1.6
+++ imag.m	9 Feb 2005 12:38:19 -0000
@@ -26,7 +26,7 @@
 %
 %---------------------------------------------------------------------------%

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

Index: imag_complex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag_complex.m,v
retrieving revision 1.6
diff -u -r1.6 imag_complex.m
--- imag_complex.m	30 Jul 2004 07:02:42 -0000	1.6
+++ imag_complex.m	9 Feb 2005 12:38:34 -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: imag_float.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/imag_float.m,v
retrieving revision 1.6
diff -u -r1.6 imag_float.m
--- imag_float.m	30 Jul 2004 07:02:42 -0000	1.6
+++ imag_float.m	9 Feb 2005 12:38:46 -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: samples/fft.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/samples/fft.m,v
retrieving revision 1.5
diff -u -r1.5 fft.m
--- samples/fft.m	30 Jul 2004 07:02:43 -0000	1.5
+++ samples/fft.m	9 Feb 2005 12:39:26 -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.
@@ -38,8 +38,8 @@
 fft(Ins, Outs) :-
 		% First put the list into bit-reversed order.
 	bit_rev(Ins, Shuffle),
-	list__length(Shuffle, NInt),
-	int__log2(NInt, R),
+	list.length(Shuffle, NInt),
+	int.log2(NInt, R),
 	N = float(NInt),
 		% Now recombine the component transforms
 	combine(N, 1.0, R, Shuffle, Outs).
@@ -53,7 +53,7 @@
 	split([X1,X2|Xs], List1, List2),
 	bit_rev(List1, List3),
 	bit_rev(List2, List4),
-	list__append(List3, List4, List).
+	list.append(List3, List4, List).

 :- pred split(list(T), list(T), list(T)).
 :- mode split(in, out, out) is det.
@@ -83,7 +83,7 @@
 		combine(N, K2, R1, Ss0, Ss),
 			% Now perform the 'butterfly'
 		xform(Fs, Ss, complex(1.0), w(K, N), Rs0, Rs1),
-		list__append(Rs0, Rs1, Outs)
+		list.append(Rs0, Rs1, Outs)
 	).

 :- pred xform(list(complex), list(complex), complex, complex,
Index: tests/complex_test.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/complex_numbers/tests/complex_test.m,v
retrieving revision 1.3
diff -u -r1.3 complex_test.m
--- tests/complex_test.m	30 Jul 2004 07:02:43 -0000	1.3
+++ tests/complex_test.m	9 Feb 2005 12:39:54 -0000
@@ -9,9 +9,9 @@
 :- 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,

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



More information about the reviews mailing list