[m-rev.] for review: prompt with "Found unhandled or incorrect exception" in DD

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.5

Print "Found unhandled or incorrect exception" instead of just "Found unhandled
exception" when a bug node that throws an exception is found by the declarative
debugger.  This is because the user may intend that an exception is throw, but
the bug is that the wrong one is being throw.

browser/declarative_user.m
	Print the new message.

tests/debugger/declarative/catch.exp
tests/debugger/declarative/exceptions.exp
tests/debugger/declarative/ho5.exp
tests/debugger/declarative/ho5.exp2
tests/debugger/declarative/ho5.exp3
tests/debugger/declarative/throw.exp
tests/debugger/declarative/throw.exp2
tests/debugger/declarative/throw.exp3
	Update the expected output.

Index: browser/declarative_user.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_user.m,v
retrieving revision 1.42
diff -u -r1.42 declarative_user.m
--- browser/declarative_user.m	1 Feb 2005 07:11:27 -0000	1.42
+++ browser/declarative_user.m	10 Feb 2005 03:37:45 -0000
@@ -809,8 +809,8 @@
 		write_decl_init_atom(User, "", decl_caller_type, Atom, !IO)
 	;
 		EBug = unhandled_exception(Atom, ExceptionRep, _),
-		io.write_string(User ^ outstr, "Found unhandled exception:\n",
-			!IO),
+		io.write_string(User ^ outstr, 
+			"Found unhandled or incorrect exception:\n", !IO),
 		write_decl_init_atom(User, "", decl_caller_type, Atom, !IO),
 		term_rep.rep_to_univ(ExceptionRep, Exception),
 		io.write(User ^ outstr, include_details_cc,
Index: tests/debugger/declarative/catch.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/catch.exp,v
retrieving revision 1.6
diff -u -r1.6 catch.exp
--- tests/debugger/declarative/catch.exp	19 Jan 2005 09:55:21 -0000	1.6
+++ tests/debugger/declarative/catch.exp	10 Feb 2005 03:16:10 -0000
@@ -20,7 +20,7 @@
 Call q(1, _)
 Throws "q: bad input"
 Expected? no
-Found unhandled exception:
+Found unhandled or incorrect exception:
 q(1, _)
 "q: bad input"
 Is this a bug? yes
Index: tests/debugger/declarative/exceptions.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/exceptions.exp,v
retrieving revision 1.2
diff -u -r1.2 exceptions.exp
--- tests/debugger/declarative/exceptions.exp	27 Jan 2005 02:38:58 -0000	1.2
+++ tests/debugger/declarative/exceptions.exp	10 Feb 2005 03:16:22 -0000
@@ -86,7 +86,7 @@
 Call u(_)
 Throws "Error"
 Expected? y
-Found unhandled exception:
+Found unhandled or incorrect exception:
 v(_)
 "Error"
 Is this a bug? y
Index: tests/debugger/declarative/ho5.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp,v
retrieving revision 1.3
diff -u -r1.3 ho5.exp
--- tests/debugger/declarative/ho5.exp	17 Jan 2003 05:57:01 -0000	1.3
+++ tests/debugger/declarative/ho5.exp	10 Feb 2005 03:16:46 -0000
@@ -17,7 +17,7 @@
 Call r(0, _)
 Throws zero
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(1, _)
 zero
 Is this a bug? yes
@@ -36,7 +36,7 @@
 Expected? no
 q(2, 0)
 Valid? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(2, _)
 zero
 Is this a bug? yes
Index: tests/debugger/declarative/ho5.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp2,v
retrieving revision 1.4
diff -u -r1.4 ho5.exp2
--- tests/debugger/declarative/ho5.exp2	10 Feb 2003 11:59:23 -0000	1.4
+++ tests/debugger/declarative/ho5.exp2	10 Feb 2005 03:18:47 -0000
@@ -17,7 +17,7 @@
 Call r(0, _)
 Throws zero
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(1, _)
 zero
 Is this a bug? yes
@@ -33,7 +33,7 @@
 Expected? no
 q(2, 0)
 Valid? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(2, _)
 zero
 Is this a bug? yes
Index: tests/debugger/declarative/ho5.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp3,v
retrieving revision 1.2
diff -u -r1.2 ho5.exp3
--- tests/debugger/declarative/ho5.exp3	19 Nov 2004 11:54:34 -0000	1.2
+++ tests/debugger/declarative/ho5.exp3	10 Feb 2005 03:20:05 -0000
@@ -17,7 +17,7 @@
 Call r(0, _)
 Throws zero
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(1, _)
 zero
 Is this a bug? yes
@@ -33,7 +33,7 @@
 Expected? no
 q(2, 0)
 Valid? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(2, _)
 zero
 Is this a bug? yes
Index: tests/debugger/declarative/throw.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp,v
retrieving revision 1.6
diff -u -r1.6 throw.exp
--- tests/debugger/declarative/throw.exp	17 Jan 2003 05:57:02 -0000	1.6
+++ tests/debugger/declarative/throw.exp	10 Feb 2005 03:17:14 -0000
@@ -19,7 +19,7 @@
 Call b(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(_)
 "Too big"
 Is this a bug? yes
@@ -41,7 +41,7 @@
 Call b2(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 q(_)
 "Too big"
 Is this a bug? yes
Index: tests/debugger/declarative/throw.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp2,v
retrieving revision 1.9
diff -u -r1.9 throw.exp2
--- tests/debugger/declarative/throw.exp2	10 Feb 2003 11:59:23 -0000	1.9
+++ tests/debugger/declarative/throw.exp2	10 Feb 2005 03:19:08 -0000
@@ -19,7 +19,7 @@
 Call b(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(_)
 "Too big"
 Is this a bug? yes
@@ -38,7 +38,7 @@
 Call b2(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 q(_)
 "Too big"
 Is this a bug? yes
Index: tests/debugger/declarative/throw.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp3,v
retrieving revision 1.2
diff -u -r1.2 throw.exp3
--- tests/debugger/declarative/throw.exp3	19 Nov 2004 11:54:43 -0000	1.2
+++ tests/debugger/declarative/throw.exp3	10 Feb 2005 03:19:31 -0000
@@ -19,7 +19,7 @@
 Call b(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 p(_)
 "Too big"
 Is this a bug? yes
@@ -38,7 +38,7 @@
 Call b2(3, _)
 Throws "Too big"
 Expected? yes
-Found unhandled exception:
+Found unhandled or incorrect exception:
 q(_)
 "Too big"
 Is this a bug? yes
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------