[m-rev.] diff: replace old module qualifier in tests/invalid

Julien Fischer juliensf at cs.mu.OZ.AU
Wed Feb 9 14:38:33 AEDT 2005


Estimated hours taken: 0.1
Branches: main, release

tests/invalid/children.m:
tests/invalid/children2.m:
tests/invalid/duplicate_module.m:
tests/invalid/missing_parent_import.m:
tests/invalid/nested_impl_in_int.m:
tests/invalid/qual_basic_test2.m
tests/invalid/qualified_cons_id2.m
	Replace the deprecated module qualifier `:'.

Julien.

Index: children.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/children.m,v
retrieving revision 1.1
diff -u -r1.1 children.m
--- children.m	25 Mar 2002 21:13:29 -0000	1.1
+++ children.m	9 Feb 2005 03:22:18 -0000
@@ -2,43 +2,43 @@
 :- module children.
 :- interface.

-:- module children:child.
+:- module children.child.
 :- interface.
 :- import_module io.

 :- type foo ---> bar ; baz(int).

-:- pred hello(io__state::di, io__state::uo) is det.
+:- pred hello(io::di, io::uo) is det.

-:- end_module children:child.
+:- end_module children.child.

-:- module children:child2.
+:- module children.child2.
 :- interface.
 :- import_module io.

 :- type foo ---> bar ; baz(int).

-:- pred hello(io__state::di, io__state::uo) is det.
+:- pred hello(io::di, io::uo) is det.

-:- end_module children:child2.
+:- end_module children.child2.

 %-----------------------------------------------------------------------------%

 :- implementation.

-:- module children:child.
+:- module children.child.
 :- implementation.

-hello --> io__write_string("children:child:hello\n").
+hello --> io.write_string("children.child.hello\n").

-:- end_module children:child.
+:- end_module children.child.

-:- module children:child2.
+:- module children.child2.
 :- implementation.

-hello --> io__write_string("children:child2:hello\n").
+hello --> io.write_string("children.child2.hello\n").

-:- end_module children:child2.
+:- end_module children.child2.

 :- end_module children.

Index: children2.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/children2.m,v
retrieving revision 1.1
diff -u -r1.1 children2.m
--- children2.m	25 Mar 2002 21:13:29 -0000	1.1
+++ children2.m	9 Feb 2005 03:23:32 -0000
@@ -4,43 +4,43 @@

 :- import_module children.

-:- module children2:sub1.
+:- module children2.sub1.
 :- interface.
 :- import_module io.

 :- type foo ---> bar ; baz(int).

-:- pred hello(io__state::di, io__state::uo) is det.
+:- pred hello(io::di, io::uo) is det.

-:- end_module children2:sub1.
+:- end_module children2.sub1.

-:- module children2:sub2.
+:- module children2.sub2.
 :- interface.
 :- import_module io.

 :- type foo ---> bar ; baz(int).

-:- pred hello(io__state::di, io__state::uo) is det.
+:- pred hello(io::di, io::uo) is det.

-:- end_module children2:sub2.
+:- end_module children2.sub2.

 %-----------------------------------------------------------------------------%

 :- implementation.

-:- module children2:sub1.
+:- module children2.sub1.
 :- implementation.

-hello --> io__write_string("children2:sub1:hello\n").
+hello --> io.write_string("children2.sub1.hello\n").

-:- end_module children2:sub1.
+:- end_module children2.sub1.

-:- module children2:sub2.
+:- module children2.sub2.
 :- implementation.

-hello --> io__write_string("children2:sub2:hello\n").
+hello --> io.write_string("children2.sub2.hello\n").

-:- end_module children2:sub2.
+:- end_module children2.sub2.

 :- end_module children2.

Index: duplicate_module.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/duplicate_module.m,v
retrieving revision 1.1
diff -u -r1.1 duplicate_module.m
--- duplicate_module.m	15 Nov 2001 13:32:48 -0000	1.1
+++ duplicate_module.m	9 Feb 2005 03:18:42 -0000
@@ -67,14 +67,14 @@

 % now we're back in the parent module.

-:- use_module duplicate_module:child.
-:- use_module duplicate_module:child2.
-:- use_module duplicate_module:child3.
+:- use_module duplicate_module.child.
+:- use_module duplicate_module.child2.
+:- use_module duplicate_module.child3.
 :- import_module std_util, require.

 do_main -->
-	duplicate_module:child:hello,
-	duplicate_module:child2:hello,
-	duplicate_module:child3:hello.
+	duplicate_module.child.hello,
+	duplicate_module.child2.hello,
+	duplicate_module.child3.hello.

 :- end_module duplicate_module.
Index: missing_parent_import.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/missing_parent_import.m,v
retrieving revision 1.1
diff -u -r1.1 missing_parent_import.m
--- missing_parent_import.m	25 Mar 2002 21:13:30 -0000	1.1
+++ missing_parent_import.m	9 Feb 2005 03:23:54 -0000
@@ -10,7 +10,7 @@

 :- import_module io.

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

 :- implementation.

@@ -21,16 +21,16 @@
 % test case is testing.
 % :- import_module children.

-:- import_module children:child.
-:- use_module children:child2.
+:- import_module children.child.
+:- use_module children.child2.
 :- import_module std_util, require.

 main -->
-	children:child:hello,
-	child:hello,
+	children.child.hello,
+	child.hello,
 	hello,
-	children:child2:hello,
-	child2:hello,
+	children.child2.hello,
+	child2.hello,

 	{ true }.

Index: nested_impl_in_int.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/nested_impl_in_int.m,v
retrieving revision 1.1
diff -u -r1.1 nested_impl_in_int.m
--- nested_impl_in_int.m	26 Jul 1998 16:36:15 -0000	1.1
+++ nested_impl_in_int.m	9 Feb 2005 03:26:16 -0000
@@ -4,9 +4,9 @@
 :- interface.
 :- import_module io.

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

-    :- module nested_impl_in_int:child.
+    :- module nested_impl_in_int.child.
     :- interface.
 	:- import_module io.

@@ -14,31 +14,31 @@

 	:- pred hello(io__state::di, io__state::uo) is det.

-    :- end_module nested_impl_in_int:child.
+    :- end_module nested_impl_in_int.child.

-    :- module nested_impl_in_int:child.
+    :- module nested_impl_in_int.child.
     :- implementation.

-        hello --> io__write_string("nested_impl_in_int:child:hello\n").
+        hello --> io.write_string("nested_impl_in_int.child.hello\n").

     :- end_module nested_impl_in_int:child.


 %-----------------------------------------------------------------------------%

-    :- module nested_impl_in_int:child2.
+    :- module nested_impl_in_int.child2.
     :- interface.
         :- import_module io.

         :- type foo ---> bar ; baz(int).

-        :- pred hello(io__state::di, io__state::uo) is det.
+        :- pred hello(io::di, io::uo) is det.

     :- implementation.

-        hello --> io__write_string("nested_impl_in_int:child2:hello\n").
+        hello --> io.write_string("nested_impl_in_int.child2.hello\n").

-    :- end_module nested_impl_in_int:child2.
+    :- end_module nested_impl_in_int.child2.

 :- implementation.

@@ -46,24 +46,24 @@

 % now we're back in the parent module.

-:- import_module nested_impl_in_int:child.
-:- use_module nested_impl_in_int:child2.
+:- import_module nested_impl_in_int.child.
+:- use_module nested_impl_in_int.child2.
 :- import_module std_util, require.

-:- type t1 == nested_impl_in_int:child:foo.
-:- type t2 == child:foo.
+:- type t1 == nested_impl_in_int.child.foo.
+:- type t2 == child.foo.
 :- type t3 == foo.
-:- type t4 == nested_impl_in_int:child2:foo.
-% :- type t5 == child2:foo.	% XXX mixing of use_module and import_module
+:- type t4 == nested_impl_in_int.child2.foo.
+% :- type t5 == child2.foo.	% XXX mixing of use_module and import_module
 				% is not yet supported.
-:- type t5 == nested_impl_in_int:child2:foo.
+:- type t5 == nested_impl_in_int.child2.foo.

 main -->
-	nested_impl_in_int:child:hello,
-	child:hello,
+	nested_impl_in_int.child.hello,
+	child.hello,
 	hello,
-	nested_impl_in_int:child2:hello,
-	% child2:hello,		% XXX mixing of use_module and import_module
+	nested_impl_in_int.child2.hello,
+	% child2.hello,		% XXX mixing of use_module and import_module
 				% is not yet supported.

 	print("t1 = "), print(type_of(has_type_t1)), nl,
@@ -86,12 +86,12 @@
 :- func has_type_t4 = t4.
 :- func has_type_t5 = t5.

-has_type_t1 = nested_impl_in_int:child:bar.
-has_type_t2 = child:bar.
+has_type_t1 = nested_impl_in_int.child.bar.
+has_type_t2 = child.bar.
 has_type_t3 = bar.
-has_type_t4 = nested_impl_in_int:child2:bar.
+has_type_t4 = nested_impl_in_int.child2.bar.
 % has_type_t5 = child2:bar.  % XXX mixing of use_module and import_module
 			     % is not yet supported.
-has_type_t5 = nested_impl_in_int:child2:bar.
+has_type_t5 = nested_impl_in_int.child2.bar.

 :- end_module nested_impl_in_int.
Index: qual_basic_test2.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/qual_basic_test2.m,v
retrieving revision 1.1
diff -u -r1.1 qual_basic_test2.m
--- qual_basic_test2.m	27 Apr 1997 05:28:56 -0000	1.1
+++ qual_basic_test2.m	9 Feb 2005 03:26:38 -0000
@@ -6,10 +6,10 @@

 :- import_module io.

-:- pred qual_basic_test2:main(io__state, io__state).
-:- mode qual_basic_test2:main(di, uo) is det.
+:- pred qual_basic_test2.main(io, io).
+:- mode qual_basic_test2.main(di, uo) is det.

 :- implementation.

-qual_basic_test2:main --> io:io__write_string("Gotcha!\n").
+qual_basic_test2.main --> io.io__write_string("Gotcha!\n").

Index: qualified_cons_id2.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/qualified_cons_id2.m,v
retrieving revision 1.2
diff -u -r1.2 qualified_cons_id2.m
--- qualified_cons_id2.m	17 Feb 1997 01:40:28 -0000	1.2
+++ qualified_cons_id2.m	9 Feb 2005 03:19:09 -0000
@@ -9,12 +9,12 @@
 	;    no.

 :- inst yes
-	--->	qualified_cons_id2:yes(ground).
+	--->	qualified_cons_id2.yes(ground).

 :- pred test(maybe(T), T).
-:- mode test(in(bound(qualified_cons_id2:yes(ground))), out) is det.
+:- mode test(in(bound(qualified_cons_id2.yes(ground))), out) is det.
 :- mode test(in(yes), out) is det.

 :- implementation.

-test(std_util:yes(T), T).
+test(std_util.yes(T), T).

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