[m-rev.] diff: back out "uncaught Mercury exception" change

Peter Ross pro at missioncriticalit.com
Fri Jul 26 17:55:22 AEST 2002


On Fri, Jul 26, 2002 at 04:23:23PM +1000, Fergus Henderson wrote:
> Hmm, I see from the CVS logs that Pete has committed a change to update
> the test cases.  So I guess I won't commit this after all.
> 
> Pete, don't forget to post diffs for all your changes to mercury-reviews!
> 
Sorry about that but we changed domains last night and lots of things
stopped working on my computer, mail being one of them but I least
wanted to commit the change before I went home.

Anyway here is the diff.

Hi,


===================================================================


Estimated hours taken: 3
Branches: main


debugger/exception_cmd.exp:
debugger/exception_cmd.exp2:
debugger/exception_vars.exp:
debugger/exception_vars.exp2:
debugger/loopcheck.exp:
debugger/loopcheck.exp2:
debugger/polymorphic_output.exp:
debugger/polymorphic_output.exp2:
debugger/polymorphic_output.exp3:
general/string_format_test_2.exp:
general/string_format_test_2.exp2:
general/string_format_test_2.exp3:
general/string_format_test_2.exp4:
general/string_format_test_3.exp:
general/string_format_test_3.exp2:
general/string_format_test_3.exp3:
general/string_format_test_3.exp4:
hard_coded/foreign_type.m:
hard_coded/no_fully_strict.exp:
hard_coded/no_fully_strict.exp2:
hard_coded/no_fully_strict.exp3:
hard_coded/no_fully_strict.exp4:
hard_coded/exceptions/test_uncaught_exception.exp:
hard_coded/exceptions/test_uncaught_exception.exp2:
hard_coded/exceptions/test_uncaught_exception.exp3:
hard_coded/exceptions/test_uncaught_exception.exp4:
tabling/loopcheck.exp:
tabling/loopcheck.exp2:
tabling/loopcheck.exp3:
tabling/loopcheck.exp4:
	Changes now that we report that an Uncaught exception comes
	from Mercury.

Index: debugger/exception_cmd.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp,v
retrieving revision 1.4
diff -u -r1.4 exception_cmd.exp
--- debugger/exception_cmd.exp	5 Jun 2002 16:41:21 -0000	1.4
+++ debugger/exception_cmd.exp	25 Jul 2002 16:18:00 -0000
@@ -6,7 +6,7 @@
 mdb> print *
        X (arg 1)              	42
 mdb> continue
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Last trace event was event #5.
 Last trace event before the unhandled exception was event #3.
Index: debugger/exception_cmd.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp2,v
retrieving revision 1.4
diff -u -r1.4 exception_cmd.exp2
--- debugger/exception_cmd.exp2	26 Jun 2002 06:14:04 -0000	1.4
+++ debugger/exception_cmd.exp2	25 Jul 2002 16:18:00 -0000
@@ -6,7 +6,7 @@
 mdb> print *
        Message (arg 1)        	"oops"
 mdb> continue
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Last trace event was event #9.
 Last trace event before the unhandled exception was event #4.
Index: debugger/exception_vars.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_vars.exp,v
retrieving revision 1.7
diff -u -r1.7 exception_vars.exp
--- debugger/exception_vars.exp	5 Jun 2002 16:41:21 -0000	1.7
+++ debugger/exception_vars.exp	25 Jul 2002 16:18:00 -0000
@@ -8,7 +8,7 @@
 mdb> print *
        X (arg 1)              	42
 mdb> continue
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Last trace event was event #5.
 Last trace event before the unhandled exception was event #3.
Index: debugger/exception_vars.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_vars.exp2,v
retrieving revision 1.8
diff -u -r1.8 exception_vars.exp2
--- debugger/exception_vars.exp2	5 Jun 2002 16:41:21 -0000	1.8
+++ debugger/exception_vars.exp2	25 Jul 2002 16:18:00 -0000
@@ -8,7 +8,7 @@
 mdb> print *
        X (arg 1)              	42
 mdb> continue
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Last trace event was event #9.
 Last trace event before the unhandled exception was event #4.
Index: debugger/loopcheck.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp,v
retrieving revision 1.5
diff -u -r1.5 loopcheck.exp
--- debugger/loopcheck.exp	27 Mar 2001 05:23:23 -0000	1.5
+++ debugger/loopcheck.exp	25 Jul 2002 16:18:00 -0000
@@ -22,7 +22,7 @@
                          loopcheck.m:21 (from loopcheck.m:14)
       10:      1  1 EXCP pred loopcheck:main/2-0 (det)
                          loopcheck.m:14
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
 Last trace event was event #10.
 Last trace event before the unhandled exception was event #7.
Index: debugger/loopcheck.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp2,v
retrieving revision 1.7
diff -u -r1.7 loopcheck.exp2
--- debugger/loopcheck.exp2	16 Dec 2001 04:46:04 -0000	1.7
+++ debugger/loopcheck.exp2	25 Jul 2002 16:18:00 -0000
@@ -26,7 +26,7 @@
                          loopcheck.m:21 (from loopcheck.m:14)
       12:      1  1 EXCP pred loopcheck:main/2-0 (det)
                          loopcheck.m:14
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
 Last trace event was event #12.
 Last trace event before the unhandled exception was event #8.
Index: debugger/polymorphic_output.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp,v
retrieving revision 1.7
diff -u -r1.7 polymorphic_output.exp
--- debugger/polymorphic_output.exp	17 Feb 2002 10:54:45 -0000	1.7
+++ debugger/polymorphic_output.exp	25 Jul 2002 16:18:11 -0000
@@ -54,7 +54,7 @@
 mdb> b std_util__det_arg
 mdb: there is no such procedure.
 mdb> c
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: det_arg: argument has wrong type
 Last trace event was event #7.
 Last trace event before the unhandled exception was event #4.
Index: debugger/polymorphic_output.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp2,v
retrieving revision 1.11
diff -u -r1.11 polymorphic_output.exp2
--- debugger/polymorphic_output.exp2	5 Jun 2002 16:41:22 -0000	1.11
+++ debugger/polymorphic_output.exp2	25 Jul 2002 16:18:11 -0000
@@ -64,7 +64,7 @@
        Type (arg 1)           	two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
        Index (arg 2)          	3
 mdb> c
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: det_arg: argument has wrong type
 Last trace event was event #15.
 Last trace event before the unhandled exception was event #9.
Index: debugger/polymorphic_output.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp3,v
retrieving revision 1.6
diff -u -r1.6 polymorphic_output.exp3
--- debugger/polymorphic_output.exp3	11 Feb 2002 12:52:55 -0000	1.6
+++ debugger/polymorphic_output.exp3	25 Jul 2002 16:18:11 -0000
@@ -54,7 +54,7 @@
 mdb> b std_util__det_arg
 mdb: there is no such procedure.
 mdb> c
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: det_arg: argument has wrong type
 Last trace event was event #7.
 Last trace event before the unhandled exception was event #4.
Index: general/string_format_test_2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_2.exp,v
retrieving revision 1.3
diff -u -r1.3 string_format_test_2.exp
--- general/string_format_test_2.exp	11 Aug 2000 08:24:02 -0000	1.3
+++ general/string_format_test_2.exp	25 Jul 2002 16:18:11 -0000
@@ -1,3 +1,3 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: format string invalid.
 Stack dump not available in this grade.
Index: general/string_format_test_2.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_2.exp2,v
retrieving revision 1.9
diff -u -r1.9 string_format_test_2.exp2
--- general/string_format_test_2.exp2	30 Aug 2001 12:53:54 -0000	1.9
+++ general/string_format_test_2.exp2	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: format string invalid.
 Stack dump follows:
    0       pred exception:throw_impl/1-0 (erroneous) (exception.m:NNNN)
Index: general/string_format_test_2.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_2.exp3,v
retrieving revision 1.2
diff -u -r1.2 string_format_test_2.exp3
--- general/string_format_test_2.exp3	11 Aug 2000 08:24:02 -0000	1.2
+++ general/string_format_test_2.exp3	25 Jul 2002 16:18:11 -0000
@@ -1,2 +1,2 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: format string invalid.
Index: general/string_format_test_2.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_2.exp4,v
retrieving revision 1.1
diff -u -r1.1 string_format_test_2.exp4
--- general/string_format_test_2.exp4	18 Mar 2002 05:22:06 -0000	1.1
+++ general/string_format_test_2.exp4	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: format string invalid.
 Stack dump follows:
    0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)
Index: general/string_format_test_3.exp
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_3.exp,v
retrieving revision 1.3
diff -u -r1.3 string_format_test_3.exp
--- general/string_format_test_3.exp	11 Aug 2000 08:24:02 -0000	1.3
+++ general/string_format_test_3.exp	25 Jul 2002 16:18:11 -0000
@@ -1,3 +1,3 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: invalid conversion specifier.
 Stack dump not available in this grade.
Index: general/string_format_test_3.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_3.exp2,v
retrieving revision 1.9
diff -u -r1.9 string_format_test_3.exp2
--- general/string_format_test_3.exp2	30 Aug 2001 12:53:54 -0000	1.9
+++ general/string_format_test_3.exp2	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: invalid conversion specifier.
 Stack dump follows:
    0       pred exception:throw_impl/1-0 (erroneous) (exception.m:NNNN)
Index: general/string_format_test_3.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_3.exp3,v
retrieving revision 1.2
diff -u -r1.2 string_format_test_3.exp3
--- general/string_format_test_3.exp3	11 Aug 2000 08:24:03 -0000	1.2
+++ general/string_format_test_3.exp3	25 Jul 2002 16:18:11 -0000
@@ -1,2 +1,2 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: invalid conversion specifier.
Index: general/string_format_test_3.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format_test_3.exp4,v
retrieving revision 1.1
diff -u -r1.1 string_format_test_3.exp4
--- general/string_format_test_3.exp4	18 Mar 2002 05:22:06 -0000	1.1
+++ general/string_format_test_3.exp4	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: string__format: invalid conversion specifier.
 Stack dump follows:
    0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)
Index: hard_coded/foreign_type.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/foreign_type.m,v
retrieving revision 1.2
diff -u -r1.2 foreign_type.m
--- hard_coded/foreign_type.m	30 Jun 2002 17:07:16 -0000	1.2
+++ hard_coded/foreign_type.m	25 Jul 2002 16:18:11 -0000
@@ -11,6 +11,7 @@
 :- type coord.
 
 :- func new(int, int) = coord.
+% :- pragma export(new(in, in) = out, "exported_new").
 
 :- func x(coord) = int.
 :- func y(coord) = int.
@@ -24,6 +25,7 @@
 	io__write_int(y(C)),
 	io__nl.
 
+%----------------------------------------------------------------------------%
 %----------------------------------------------------------------------------%
 %----------------------------------------------------------------------------%
 
Index: hard_coded/no_fully_strict.exp
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/no_fully_strict.exp,v
retrieving revision 1.3
diff -u -r1.3 no_fully_strict.exp
--- hard_coded/no_fully_strict.exp	2 Sep 1999 05:51:35 -0000	1.3
+++ hard_coded/no_fully_strict.exp	25 Jul 2002 16:18:11 -0000
@@ -1,3 +1,3 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Stack dump not available in this grade.
Index: hard_coded/no_fully_strict.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/no_fully_strict.exp2,v
retrieving revision 1.8
diff -u -r1.8 no_fully_strict.exp2
--- hard_coded/no_fully_strict.exp2	30 Aug 2001 12:53:57 -0000	1.8
+++ hard_coded/no_fully_strict.exp2	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Stack dump follows:
    0       pred exception:throw_impl/1-0 (erroneous) (exception.m:NNNN)
Index: hard_coded/no_fully_strict.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/no_fully_strict.exp3,v
retrieving revision 1.1
diff -u -r1.1 no_fully_strict.exp3
--- hard_coded/no_fully_strict.exp3	15 May 2000 19:42:59 -0000	1.1
+++ hard_coded/no_fully_strict.exp3	25 Jul 2002 16:18:11 -0000
@@ -1,2 +1,2 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
Index: hard_coded/no_fully_strict.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/no_fully_strict.exp4,v
retrieving revision 1.1
diff -u -r1.1 no_fully_strict.exp4
--- hard_coded/no_fully_strict.exp4	18 Mar 2002 05:22:09 -0000	1.1
+++ hard_coded/no_fully_strict.exp4	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: oops
 Stack dump follows:
    0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)
Index: hard_coded/exceptions/test_uncaught_exception.exp
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/test_uncaught_exception.exp,v
retrieving revision 1.1
diff -u -r1.1 test_uncaught_exception.exp
--- hard_coded/exceptions/test_uncaught_exception.exp	31 Aug 1999 12:57:20 -0000	1.1
+++ hard_coded/exceptions/test_uncaught_exception.exp	25 Jul 2002 16:18:11 -0000
@@ -1,3 +1,3 @@
-Uncaught exception:
+Uncaught Mercury exception:
 "<exception thrown from main>"
 Stack dump not available in this grade.
Index: hard_coded/exceptions/test_uncaught_exception.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/test_uncaught_exception.exp2,v
retrieving revision 1.5
diff -u -r1.5 test_uncaught_exception.exp2
--- hard_coded/exceptions/test_uncaught_exception.exp2	30 Aug 2001 12:53:59 -0000	1.5
+++ hard_coded/exceptions/test_uncaught_exception.exp2	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 "<exception thrown from main>"
 Stack dump follows:
    0       pred exception:throw_impl/1-0 (erroneous) (exception.m:NNNN)
Index: hard_coded/exceptions/test_uncaught_exception.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/test_uncaught_exception.exp3,v
retrieving revision 1.1
diff -u -r1.1 test_uncaught_exception.exp3
--- hard_coded/exceptions/test_uncaught_exception.exp3	15 May 2000 18:31:42 -0000	1.1
+++ hard_coded/exceptions/test_uncaught_exception.exp3	25 Jul 2002 16:18:11 -0000
@@ -1,2 +1,2 @@
-Uncaught exception:
+Uncaught Mercury exception:
 "<exception thrown from main>"
Index: hard_coded/exceptions/test_uncaught_exception.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/test_uncaught_exception.exp4,v
retrieving revision 1.1
diff -u -r1.1 test_uncaught_exception.exp4
--- hard_coded/exceptions/test_uncaught_exception.exp4	18 Mar 2002 05:22:10 -0000	1.1
+++ hard_coded/exceptions/test_uncaught_exception.exp4	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 "<exception thrown from main>"
 Stack dump follows:
    0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)
Index: tabling/loopcheck.exp
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp,v
retrieving revision 1.1
diff -u -r1.1 loopcheck.exp
--- tabling/loopcheck.exp	29 Oct 1999 06:53:49 -0000	1.1
+++ tabling/loopcheck.exp	25 Jul 2002 16:18:11 -0000
@@ -1,3 +1,3 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
 Stack dump not available in this grade.
Index: tabling/loopcheck.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp2,v
retrieving revision 1.6
diff -u -r1.6 loopcheck.exp2
--- tabling/loopcheck.exp2	30 Aug 2001 12:54:01 -0000	1.6
+++ tabling/loopcheck.exp2	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
 Stack dump follows:
    0       pred exception:throw_impl/1-0 (erroneous) (exception.m:NNNN)
Index: tabling/loopcheck.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp3,v
retrieving revision 1.1
diff -u -r1.1 loopcheck.exp3
--- tabling/loopcheck.exp3	15 May 2000 19:43:02 -0000	1.1
+++ tabling/loopcheck.exp3	25 Jul 2002 16:18:11 -0000
@@ -1,2 +1,2 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
Index: tabling/loopcheck.exp4
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/loopcheck.exp4,v
retrieving revision 1.1
diff -u -r1.1 loopcheck.exp4
--- tabling/loopcheck.exp4	18 Mar 2002 05:22:10 -0000	1.1
+++ tabling/loopcheck.exp4	25 Jul 2002 16:18:11 -0000
@@ -1,4 +1,4 @@
-Uncaught exception:
+Uncaught Mercury exception:
 Software Error: detected infinite recursion in pred loopcheck:loop/1
 Stack dump follows:
    0       pred exception:throw/1-0 (erroneous) (exception.m:NNNN)

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