[m-rev.] trivial diff: s/:/./ in *.err_exp

Fergus Henderson fjh at cs.mu.OZ.AU
Sun Jan 19 04:01:39 AEDT 2003


More of the same...

Branches: main
Estimated hours taken: 0.5

tests/tabling/loopcheck.exp*:
tests/recompilation/*.err_exp.*:
	Update to reflect Ralph's recent change to use `.' rather than `:'
	as the module separator in compiler error messages.

Workspace: /home/ceres/fjh/mercury
Index: tests/recompilation/add_constructor_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/add_constructor_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 add_constructor_r.err_exp.2
--- tests/recompilation/add_constructor_r.err_exp.2	27 Jun 2001 05:04:44 -0000	1.1
+++ tests/recompilation/add_constructor_r.err_exp.2	18 Jan 2003 16:49:02 -0000
@@ -1,3 +1,3 @@
 Recompiling module `add_constructor_r':
-  addition of constructor `c/1' of type `add_constructor_r_2:bar/0' could cause
-  an ambiguity with constructor `c/1' of type `add_constructor_r:t/0'.
+  addition of constructor `c/1' of type `add_constructor_r_2.bar/0' could cause
+  an ambiguity with constructor `c/1' of type `add_constructor_r.t/0'.
Index: tests/recompilation/add_instance_2_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/add_instance_2_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 add_instance_2_r.err_exp.2
--- tests/recompilation/add_instance_2_r.err_exp.2	27 Jun 2001 05:04:44 -0000	1.1
+++ tests/recompilation/add_instance_2_r.err_exp.2	18 Jan 2003 16:49:09 -0000
@@ -1,3 +1,3 @@
 Recompiling module `add_instance_2_r':
-  an instance for class `add_instance_2_r:io/1' in module `add_instance_2_r_2'
+  an instance for class `add_instance_2_r.io/1' in module `add_instance_2_r_2'
   was added or modified.
Index: tests/recompilation/add_instance_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/add_instance_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 add_instance_r.err_exp.2
--- tests/recompilation/add_instance_r.err_exp.2	27 Jun 2001 05:04:46 -0000	1.1
+++ tests/recompilation/add_instance_r.err_exp.2	18 Jan 2003 16:49:18 -0000
@@ -1,3 +1,3 @@
 Recompiling module `add_instance_r':
-  an instance for class `add_instance_r_2:io/1' in module `add_instance_r_2'
+  an instance for class `add_instance_r_2.io/1' in module `add_instance_r_2'
   was added or modified.
Index: tests/recompilation/add_type_re.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/add_type_re.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 add_type_re.err_exp.2
--- tests/recompilation/add_type_re.err_exp.2	27 Jun 2001 05:04:52 -0000	1.1
+++ tests/recompilation/add_type_re.err_exp.2	18 Jan 2003 16:49:46 -0000
@@ -1,7 +1,7 @@
 Recompiling module `add_type_re':
-  addition of type `add_type_re_2:bar/0' could cause an ambiguity with type
-  `add_type_re:bar/0'.
-add_type_re.m:029: In definition of predicate `add_type_re:output_bar'/3
+  addition of type `add_type_re_2.bar/0' could cause an ambiguity with type
+  `add_type_re.bar/0'.
+add_type_re.m:029: In definition of predicate `add_type_re.output_bar'/3
 add_type_re.m:029:   ambiguity error: multiple possible matches for type `bar'/0.
 add_type_re.m:029:   The possible matches are in modules
 add_type_re.m:029:   `add_type_re' and `add_type_re_2'.
Index: tests/recompilation/change_class_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/change_class_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 change_class_r.err_exp.2
--- tests/recompilation/change_class_r.err_exp.2	27 Jun 2001 05:04:53 -0000	1.1
+++ tests/recompilation/change_class_r.err_exp.2	18 Jan 2003 16:49:53 -0000
@@ -1,2 +1,2 @@
 Recompiling module `change_class_r':
-  typeclass `change_class_r_2:io/1' was modified.
+  typeclass `change_class_r_2.io/1' was modified.
Index: tests/recompilation/change_func_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/change_func_r.err_exp.2,v
retrieving revision 1.2
diff -u -d -r1.2 change_func_r.err_exp.2
--- tests/recompilation/change_func_r.err_exp.2	10 Mar 2002 14:56:11 -0000	1.2
+++ tests/recompilation/change_func_r.err_exp.2	18 Jan 2003 16:50:01 -0000
@@ -1,4 +1,4 @@
 Recompiling module `change_func_r':
-  function `change_func_r_2:changed_func/1' was modified.
+  function `change_func_r_2.changed_func/1' was modified.
 Recompiling module `change_func_r':
-  function `change_func_r_2:changed_func_2/1' was modified.
+  function `change_func_r_2.changed_func_2/1' was modified.
Index: tests/recompilation/change_instance_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/change_instance_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 change_instance_r.err_exp.2
--- tests/recompilation/change_instance_r.err_exp.2	27 Jun 2001 05:04:53 -0000	1.1
+++ tests/recompilation/change_instance_r.err_exp.2	18 Jan 2003 16:50:08 -0000
@@ -1,2 +1,2 @@
 Recompiling module `change_instance_r':
-  type `change_instance_r_2:baz/0' was modified.
+  type `change_instance_r_2.baz/0' was modified.
Index: tests/recompilation/change_mode_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/change_mode_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 change_mode_r.err_exp.2
--- tests/recompilation/change_mode_r.err_exp.2	27 Jun 2001 05:04:55 -0000	1.1
+++ tests/recompilation/change_mode_r.err_exp.2	18 Jan 2003 16:50:18 -0000
@@ -1,2 +1,2 @@
 Recompiling module `change_mode_r':
-  inst `change_mode_r_2:foo/0' was modified.
+  inst `change_mode_r_2.foo/0' was modified.
Index: tests/recompilation/field_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/field_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 field_r.err_exp.2
--- tests/recompilation/field_r.err_exp.2	27 Jun 2001 05:04:57 -0000	1.1
+++ tests/recompilation/field_r.err_exp.2	18 Jan 2003 16:50:38 -0000
@@ -1,4 +1,4 @@
 Recompiling module `field_r':
-  addition of field access function `f/1' for constructor `field_r_2:t3/1' of
-  type `field_r_2:t3/0' could cause an ambiguity with constructor `f/1' of type
-  `field_r:t/0'.
+  addition of field access function `f/1' for constructor `field_r_2.t3/1' of
+  type `field_r_2.t3/0' could cause an ambiguity with constructor `f/1' of type
+  `field_r.t/0'.
Index: tests/recompilation/func_overloading_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/func_overloading_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 func_overloading_r.err_exp.2
--- tests/recompilation/func_overloading_r.err_exp.2	27 Jun 2001 05:05:03 -0000	1.1
+++ tests/recompilation/func_overloading_r.err_exp.2	18 Jan 2003 16:50:48 -0000
@@ -1,3 +1,3 @@
 Recompiling module `func_overloading_r':
-  addition of function `func_overloading_r_2:f/1' could cause an ambiguity with
-  constructor `f/1' of type `func_overloading_r:t/0'.
+  addition of function `func_overloading_r_2.f/1' could cause an ambiguity with
+  constructor `f/1' of type `func_overloading_r.t/0'.
Index: tests/recompilation/lambda_mode_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/lambda_mode_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 lambda_mode_r.err_exp.2
--- tests/recompilation/lambda_mode_r.err_exp.2	27 Jun 2001 05:05:03 -0000	1.1
+++ tests/recompilation/lambda_mode_r.err_exp.2	18 Jan 2003 16:50:55 -0000
@@ -1,2 +1,2 @@
 Recompiling module `lambda_mode_r':
-  mode `lambda_mode_r_2:foo_in/0' was modified.
+  mode `lambda_mode_r_2.foo_in/0' was modified.
Index: tests/recompilation/nested_module_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/nested_module_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 nested_module_r.err_exp.2
--- tests/recompilation/nested_module_r.err_exp.2	27 Jun 2001 05:05:05 -0000	1.1
+++ tests/recompilation/nested_module_r.err_exp.2	18 Jan 2003 16:51:19 -0000
@@ -1,4 +1,4 @@
 Not recompiling module nested_module_r.
-Recompiling module `nested_module_r:sub_nested_module':
-  addition of constructor `c/1' of type `nested_module_r_2:bar/0' could cause
-  an ambiguity with constructor `c/1' of type `nested_module_r:t/0'.
+Recompiling module `nested_module_r.sub_nested_module':
+  addition of constructor `c/1' of type `nested_module_r_2.bar/0' could cause
+  an ambiguity with constructor `c/1' of type `nested_module_r.t/0'.
Index: tests/recompilation/pragma_type_spec_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/pragma_type_spec_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 pragma_type_spec_r.err_exp.2
--- tests/recompilation/pragma_type_spec_r.err_exp.2	27 Jun 2001 05:05:09 -0000	1.1
+++ tests/recompilation/pragma_type_spec_r.err_exp.2	18 Jan 2003 16:51:34 -0000
@@ -1,2 +1,2 @@
 Recompiling module `pragma_type_spec_r':
-  type `pragma_type_spec_r_2:foo/0' was modified.
+  type `pragma_type_spec_r_2.foo/0' was modified.
Index: tests/recompilation/pred_ctor_ambiguity_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/pred_ctor_ambiguity_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 pred_ctor_ambiguity_r.err_exp.2
--- tests/recompilation/pred_ctor_ambiguity_r.err_exp.2	27 Jun 2001 05:05:11 -0000	1.1
+++ tests/recompilation/pred_ctor_ambiguity_r.err_exp.2	18 Jan 2003 16:51:42 -0000
@@ -1,3 +1,3 @@
 Recompiling module `pred_ctor_ambiguity_r':
-  addition of predicate `pred_ctor_ambiguity_r_2:c/2' could cause an ambiguity
-  with constructor `c/1' of type `pred_ctor_ambiguity_r:t/0'.
+  addition of predicate `pred_ctor_ambiguity_r_2.c/2' could cause an ambiguity
+  with constructor `c/1' of type `pred_ctor_ambiguity_r.t/0'.
Index: tests/recompilation/pred_overloading_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/pred_overloading_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 pred_overloading_r.err_exp.2
--- tests/recompilation/pred_overloading_r.err_exp.2	27 Jun 2001 05:05:13 -0000	1.1
+++ tests/recompilation/pred_overloading_r.err_exp.2	18 Jan 2003 16:51:54 -0000
@@ -1,3 +1,3 @@
 Recompiling module `pred_overloading_r':
-  addition of predicate `pred_overloading_r_2:p/3' could cause an ambiguity
-  with predicate `pred_overloading_r:p/3'.
+  addition of predicate `pred_overloading_r_2.p/3' could cause an ambiguity
+  with predicate `pred_overloading_r.p/3'.
Index: tests/recompilation/remove_type_re.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/remove_type_re.err_exp.2,v
retrieving revision 1.2
diff -u -d -r1.2 remove_type_re.err_exp.2
--- tests/recompilation/remove_type_re.err_exp.2	23 Feb 2002 07:30:59 -0000	1.2
+++ tests/recompilation/remove_type_re.err_exp.2	18 Jan 2003 16:52:06 -0000
@@ -1,7 +1,7 @@
 Recompiling module `remove_type_re':
-  type `remove_type_re_2:foo/0' was removed.
+  type `remove_type_re_2.foo/0' was removed.
 Recompiling module `remove_type_re':
-  body of type `remove_type_re_2:foo/0' was removed.
-remove_type_re.m:016: In definition of predicate `remove_type_re:output_foo'/3:
+  body of type `remove_type_re_2.foo/0' was removed.
+remove_type_re.m:016: In definition of predicate `remove_type_re.output_foo'/3:
 remove_type_re.m:016:   error: undefined type `foo'/0.
 For more information, try recompiling with `-E'.
Index: tests/recompilation/type_qual_re.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/type_qual_re.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 type_qual_re.err_exp.2
--- tests/recompilation/type_qual_re.err_exp.2	27 Jun 2001 05:05:17 -0000	1.1
+++ tests/recompilation/type_qual_re.err_exp.2	18 Jan 2003 16:52:13 -0000
@@ -1,5 +1,5 @@
 Recompiling module `type_qual_re':
-  type `type_qual_re_2:bar/0' was removed.
+  type `type_qual_re_2.bar/0' was removed.
 type_qual_re.m:016: In explicit type qualification:
 type_qual_re.m:016:   error: undefined type `bar'/0.
 For more information, try recompiling with `-E'.
Index: tests/recompilation/type_spec_rename_var_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/type_spec_rename_var_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 type_spec_rename_var_r.err_exp.2
--- tests/recompilation/type_spec_rename_var_r.err_exp.2	24 Jul 2001 17:16:47 -0000	1.1
+++ tests/recompilation/type_spec_rename_var_r.err_exp.2	18 Jan 2003 16:52:20 -0000
@@ -1,2 +1,2 @@
 Recompiling module `type_spec_rename_var_r':
-  predicate `type_spec_rename_var_r_2:p/3' was modified.
+  predicate `type_spec_rename_var_r_2.p/3' was modified.
Index: tests/recompilation/type_spec_unname_var_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/type_spec_unname_var_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 type_spec_unname_var_r.err_exp.2
--- tests/recompilation/type_spec_unname_var_r.err_exp.2	5 Jan 2002 12:00:00 -0000	1.1
+++ tests/recompilation/type_spec_unname_var_r.err_exp.2	18 Jan 2003 16:52:29 -0000
@@ -1,2 +1,2 @@
 Recompiling module `type_spec_unname_var_r':
-  predicate `type_spec_unname_var_r_2:p/4' was modified.
+  predicate `type_spec_unname_var_r_2.p/4' was modified.
Index: tests/recompilation/typeclass_method_pragma_r.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/typeclass_method_pragma_r.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 typeclass_method_pragma_r.err_exp.2
--- tests/recompilation/typeclass_method_pragma_r.err_exp.2	24 Jul 2001 10:47:25 -0000	1.1
+++ tests/recompilation/typeclass_method_pragma_r.err_exp.2	18 Jan 2003 16:52:37 -0000
@@ -1,3 +1,3 @@
 Recompiling module `typeclass_method_pragma_r':
-  typeclass `typeclass_method_pragma_r_2:io/1' was modified.
-typeclass_method_pragma_r.m:015: Warning: call to obsolete predicate `typeclass_method_pragma_r_2:output/3'.
+  typeclass `typeclass_method_pragma_r_2.io/1' was modified.
+typeclass_method_pragma_r.m:015: Warning: call to obsolete predicate `typeclass_method_pragma_r_2.output/3'.
Index: tests/recompilation/with_type_re.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/with_type_re.err_exp.2,v
retrieving revision 1.1
diff -u -d -r1.1 with_type_re.err_exp.2
--- tests/recompilation/with_type_re.err_exp.2	15 Mar 2002 07:32:26 -0000	1.1
+++ tests/recompilation/with_type_re.err_exp.2	18 Jan 2003 16:53:00 -0000
@@ -1,13 +1,13 @@
 Recompiling module `with_type_re':
-  type `with_type_re_2:map_pred/2' was modified.
+  type `with_type_re_2.map_pred/2' was modified.
 Recompiling module `with_type_re':
-  inst `with_type_re_2:map_pred/0' was modified.
+  inst `with_type_re_2.map_pred/0' was modified.
 Recompiling module `with_type_re':
-  function `with_type_re_2:with_type_2/2' was modified.
+  function `with_type_re_2.with_type_2/2' was modified.
 Recompiling module `with_type_re':
-  addition of predicate `with_type_re_2:with_type_3/4' could cause an ambiguity
-  with predicate `with_type_re:with_type_3/4'.
-with_type_re.m:015: In clause for predicate `with_type_re:main/2':
+  addition of predicate `with_type_re_2.with_type_3/4' could cause an ambiguity
+  with predicate `with_type_re.with_type_3/4'.
+with_type_re.m:015: In clause for predicate `with_type_re.main/2':
 with_type_re.m:015:   error: wrong number of arguments (4; should be 5)
 with_type_re.m:015:   in call to predicate `with_type_1'.
 For more information, try recompiling with `-E'.
Index: tests/tabling/loopcheck.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp3,v
retrieving revision 1.2
diff -u -d -r1.2 loopcheck.exp3
--- tests/tabling/loopcheck.exp3	25 Jul 2002 16:20:56 -0000	1.2
+++ tests/tabling/loopcheck.exp3	18 Jan 2003 16:45:43 -0000
@@ -1,2 +1,2 @@
 Uncaught Mercury exception:
-Software Error: detected infinite recursion in pred loopcheck:loop/1
+Software Error: detected infinite recursion in pred loopcheck.loop/1
Index: tests/tabling/loopcheck.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp4,v
retrieving revision 1.2
diff -u -d -r1.2 loopcheck.exp4
--- tests/tabling/loopcheck.exp4	25 Jul 2002 16:20:56 -0000	1.2
+++ tests/tabling/loopcheck.exp4	18 Jan 2003 16:46:10 -0000
@@ -1,7 +1,7 @@
 Uncaught Mercury exception:
-Software Error: detected infinite recursion in pred loopcheck:loop/1
+Software Error: detected infinite recursion in pred loopcheck.loop/1
 Stack dump follows:
-   0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)
-   1       pred require:error/1-0 (erroneous) (require.m:NNNN)
-   2    2* pred loopcheck:loop/1-0 (erroneous) (loopcheck.m:17)
-   4       pred loopcheck:main/2-0 (det) (loopcheck.m:13)
+   0       pred exception.throw/1-0 (erroneous) (exception.m:NNNN)
+   1       pred require.error/1-0 (erroneous) (require.m:NNNN)
+   2    2* pred loopcheck.loop/1-0 (erroneous) (loopcheck.m:17)
+   4       pred loopcheck.main/2-0 (det) (loopcheck.m:13)
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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