[m-rev.] for review: prompt with "Unsatisfiable?" instead of "Complete?" in dd (fwd)

Julien Fischer juliensf at cs.mu.OZ.AU
Tue Jan 25 13:48:13 AEDT 2005


This is from Ian.



---------- Forwarded message ----------
Date: Tue, 25 Jan 2005 13:35:13 +1100
From: Ian MacLarty <maclarty at cs.mu.OZ.AU>
To: juliensf at cs.mu.OZ.AU
Subject: for review: prompt with "Unsatisfiable?" instead of "Complete?" in
    dd

This email just won't go though.

For review by anyone.

Estimated hours taken: 0.5
Branches: main

In the declarative debugger print "Unsatisfiable?" instead of
"No Solutions. Complete?" when asking questions about goals that failed with no
solutions.

browser/declarative_user.m
	Print "Unsatisfiable?" when there are no solutions to a goal.

tests/debugger/declarative/aadebug.exp
tests/debugger/declarative/backtrack.exp
tests/debugger/declarative/backtrack.exp2
tests/debugger/declarative/big.exp
tests/debugger/declarative/comp_gen.exp
tests/debugger/declarative/divide_and_query1.exp
tests/debugger/declarative/explicit_subtree.exp2
tests/debugger/declarative/failed_cond.exp
tests/debugger/declarative/family.exp
tests/debugger/declarative/find_origin.exp
tests/debugger/declarative/find_origin.exp2
tests/debugger/declarative/func_call.exp
tests/debugger/declarative/func_call.exp2
tests/debugger/declarative/ho3.exp
tests/debugger/declarative/ho4.exp
tests/debugger/declarative/if_then_else.exp
tests/debugger/declarative/ite_2.exp
tests/debugger/declarative/ite_2.exp2
tests/debugger/declarative/neg_conj.exp
tests/debugger/declarative/neg_conj.exp2
tests/debugger/declarative/output_term_dep.exp
tests/debugger/declarative/queens.exp
	Expect "Unsatisfiable?" when the question is about a goal with no
	solutions.

Index: browser/declarative_user.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_user.m,v
retrieving revision 1.34
diff -u -r1.34 declarative_user.m
--- browser/declarative_user.m	6 Jan 2005 03:20:09 -0000	1.34
+++ browser/declarative_user.m	6 Jan 2005 12:59:11 -0000
@@ -274,7 +274,8 @@
 :- mode decl_question_prompt(in, out) is det.

 decl_question_prompt(wrong_answer(_, _), "Valid? ").
-decl_question_prompt(missing_answer(_, _, _), "Complete? ").
+decl_question_prompt(missing_answer(_, _, [_ | _]), "Complete? ").
+decl_question_prompt(missing_answer(_, _, []), "Unsatisfiable? ").
 decl_question_prompt(unexpected_exception(_, _, _), "Expected? ").

 :- pred default_prompt(decl_truth, string).
@@ -732,11 +733,11 @@
 	write_decl_init_atom(User, "Call ", decl_caller_type, Call),
 	(
 		{ Solns = [] }
-	->
-		io__write_string(User ^ outstr, "No solutions.\n")
 	;
+		{ Solns = [_ | _] },
 		io__write_string(User ^ outstr, "Solutions:\n"),
-		list__foldl(write_decl_final_atom(User, "\t", print_all), Solns)
+		list__foldl(write_decl_final_atom(User, "\t", print_all),
+			Solns)
 	).

 write_decl_question(unexpected_exception(_, Call, Exception), User) -->
Index: tests/debugger/declarative/aadebug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/aadebug.exp,v
retrieving revision 1.10
diff -u -r1.10 aadebug.exp
--- tests/debugger/declarative/aadebug.exp	6 Jan 2005 03:20:11 -0000	1.10
+++ tests/debugger/declarative/aadebug.exp	7 Jan 2005 04:51:55 -0000
@@ -47,11 +47,9 @@
 q('a', 'b')
 Valid? yes
 Call r('b', _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q('b', _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found incorrect contour:
 q('a', 'b')
 p('a', 32)
Index: tests/debugger/declarative/backtrack.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/backtrack.exp,v
retrieving revision 1.7
diff -u -r1.7 backtrack.exp
--- tests/debugger/declarative/backtrack.exp	30 Jan 2003 05:59:27 -0000	1.7
+++ tests/debugger/declarative/backtrack.exp	7 Jan 2005 04:51:55 -0000
@@ -14,18 +14,15 @@
 q(1, 1)
 Valid? yes
 Call >(1, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(1, 2)
 Valid? yes
 Call >(2, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(1, 3)
 Valid? yes
 Call >(3, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q(1, _)
 Solutions:
 	q(1, 1)
Index: tests/debugger/declarative/backtrack.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/backtrack.exp2,v
retrieving revision 1.1
diff -u -r1.1 backtrack.exp2
--- tests/debugger/declarative/backtrack.exp2	13 Feb 2003 00:33:39 -0000	1.1
+++ tests/debugger/declarative/backtrack.exp2	9 Jan 2005 05:11:24 -0000
@@ -14,18 +14,15 @@
 q(1, 1)
 Valid? yes
 Call >(1, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(1, 2)
 Valid? yes
 Call >(2, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(1, 3)
 Valid? yes
 Call >(3, 5)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q(1, _)
 Solutions:
 	q(1, 1)
Index: tests/debugger/declarative/big.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/big.exp,v
retrieving revision 1.11
diff -u -r1.11 big.exp
--- tests/debugger/declarative/big.exp	6 Jan 2005 03:20:11 -0000	1.11
+++ tests/debugger/declarative/big.exp	7 Jan 2005 04:51:55 -0000
@@ -18,8 +18,7 @@
 c(0, 2)
 Valid? yes
 Call d(2, _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 c(2, 6)
 Valid? yes
 f(6, -12)
@@ -119,13 +118,11 @@
 g(6, -10)
 Valid? yes
 Call >(-10, 0)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 g(7, -11)
 Valid? yes
 Call >(-11, 0)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call c(2, _)
 Solutions:
 	c(2, 6)
Index: tests/debugger/declarative/comp_gen.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/comp_gen.exp,v
retrieving revision 1.3
diff -u -r1.3 comp_gen.exp
--- tests/debugger/declarative/comp_gen.exp	17 Jan 2003 05:57:00 -0000	1.3
+++ tests/debugger/declarative/comp_gen.exp	7 Jan 2005 04:51:55 -0000
@@ -16,8 +16,7 @@
        8:      3  2 FAIL pred comp_gen.p/2-0 (semidet) comp_gen.m:27 (comp_gen.m:10)
 mdb> dd
 Call p(f(1), f(2))
-No solutions.
-Complete? no
+Unsatisfiable? no
 Found partially uncovered atom:
 p(f(1), f(2))
 Is this a bug? yes
Index: tests/debugger/declarative/divide_and_query1.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/divide_and_query1.exp,v
retrieving revision 1.1
diff -u -r1.1 divide_and_query1.exp
--- tests/debugger/declarative/divide_and_query1.exp	9 Jan 2005 01:14:06 -0000	1.1
+++ tests/debugger/declarative/divide_and_query1.exp	14 Jan 2005 05:46:50 -0000
@@ -58,8 +58,7 @@
       E9:     C6 FAIL pred divide_and_query1.abba/1-0 (semidet)
 mdb> dd -s divide_and_query
 Call abba([a, a, a, b])
-No solutions.
-Complete? n
+Unsatisfiable? n
 Call abba_perm([a, a, a, b], _)
 Solutions:
 	abba_perm([a, a, a, b], [a, a, a, b])
Index: tests/debugger/declarative/explicit_subtree.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/explicit_subtree.exp2,v
retrieving revision 1.4
diff -u -r1.4 explicit_subtree.exp2
--- tests/debugger/declarative/explicit_subtree.exp2	9 Jan 2005 01:14:07 -0000	1.4
+++ tests/debugger/declarative/explicit_subtree.exp2	11 Jan 2005 09:09:17 -0000
@@ -44,8 +44,7 @@
 +(50, 1) = 51
 Valid? [no] y
 Call =<(51, 0)
-No solutions.
-Complete? y
+Unsatisfiable? y
 -(51, 1) = 50
 Valid? y
 +(0, 1) = 1
@@ -82,8 +81,7 @@
 +(48, 1) = 49
 Valid? [no] y
 Call =<(49, 0)
-No solutions.
-Complete? y
+Unsatisfiable? y
 -(49, 1) = 48
 Valid? y
 +(0, 1) = 1
Index: tests/debugger/declarative/failed_cond.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/failed_cond.exp,v
retrieving revision 1.2
diff -u -r1.2 failed_cond.exp
--- tests/debugger/declarative/failed_cond.exp	29 Nov 2004 11:34:35 -0000	1.2
+++ tests/debugger/declarative/failed_cond.exp	7 Jan 2005 04:51:55 -0000
@@ -12,8 +12,7 @@
 q(c, b)
 Valid? no
 Call r(c)
-No solutions.
-Complete? browse 1
+Unsatisfiable? browse 1
 browser> mark
 Found inadmissible call:
 Parent q(c, _)
Index: tests/debugger/declarative/family.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/family.exp,v
retrieving revision 1.4
diff -u -r1.4 family.exp
--- tests/debugger/declarative/family.exp	19 Nov 2004 11:54:31 -0000	1.4
+++ tests/debugger/declarative/family.exp	7 Jan 2005 04:51:55 -0000
@@ -14,23 +14,19 @@
 siblings(a, b)
 Valid? yes
 Call full_siblings(_, _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 common_mother(a, b)
 Valid? yes
 Call common_father(_, _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 parent(m, a)
 Valid? yes
 Call parent(a, _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 parent(m, b)
 Valid? yes
 Call parent(b, _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 parent(f, a)
 Valid? yes
 parent(f, b)
@@ -38,8 +34,7 @@
 parent(f, c)
 Valid? yes
 Call parent(c, _)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 parent(s, c)
 Valid? yes
 Call parent(_, _)
Index: tests/debugger/declarative/find_origin.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/find_origin.exp,v
retrieving revision 1.2
diff -u -r1.2 find_origin.exp
--- tests/debugger/declarative/find_origin.exp	6 Jan 2005 03:20:11 -0000	1.2
+++ tests/debugger/declarative/find_origin.exp	7 Jan 2005 04:51:55 -0000
@@ -13,16 +13,13 @@
 monotest4(t(101), t(101))
 Valid? n
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(3))
-No solutions.
-Complete? y
+Unsatisfiable? y
 IntroducedFrom__pred__monotest4__86__1(t(101), t(101))
 Valid? y
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(2))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(1))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Found incorrect contour:
 IntroducedFrom__pred__monotest4__86__1(t(101), t(101))
 monotest4(t(101), t(101))
@@ -49,8 +46,7 @@
 IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), u(u("hello")))
 Valid? y
 Call IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), v(u("hello")))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Found incorrect contour:
 IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), u(u("hello")))
 polytest4(u("hello"), u("hello"))
Index: tests/debugger/declarative/find_origin.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/find_origin.exp2,v
retrieving revision 1.2
diff -u -r1.2 find_origin.exp2
--- tests/debugger/declarative/find_origin.exp2	6 Jan 2005 03:20:12 -0000	1.2
+++ tests/debugger/declarative/find_origin.exp2	9 Jan 2005 05:11:24 -0000
@@ -13,16 +13,13 @@
 monotest4(t(101), t(101))
 Valid? n
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(3))
-No solutions.
-Complete? y
+Unsatisfiable? y
 IntroducedFrom__pred__monotest4__86__1(t(101), t(101))
 Valid? y
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(2))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Call IntroducedFrom__pred__monotest4__86__1(t(101), t(1))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Found incorrect contour:
 filter(IntroducedFrom__pred__monotest4__86__1(t(101)), [t(1), t(2), t(101), t(3)], [t(101)])
 monotest4(t(101), t(101))
@@ -49,8 +46,7 @@
 IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), u(u("hello")))
 Valid? y
 Call IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), v(u("hello")))
-No solutions.
-Complete? y
+Unsatisfiable? y
 Found incorrect contour:
 filter(IntroducedFrom__pred__polytest4__148__2(u(string), u(u/1)), [v(u/1), v(u/1), v(u/1), u(u/1)], [u/1])
 polytest4(u("hello"), u("hello"))
Index: tests/debugger/declarative/func_call.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/func_call.exp,v
retrieving revision 1.5
diff -u -r1.5 func_call.exp
--- tests/debugger/declarative/func_call.exp	6 Jan 2005 03:20:12 -0000	1.5
+++ tests/debugger/declarative/func_call.exp	7 Jan 2005 04:51:55 -0000
@@ -12,22 +12,19 @@
 fib(6) = 9
 Valid? no
 Call =<(6, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(6, 1) = 5
 Valid? yes
 fib(5) = 6
 Valid? no
 Call =<(5, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(5, 1) = 4
 Valid? yes
 fib(4) = 4
 Valid? no
 Call =<(4, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(4, 1) = 3
 Valid? yes
 fib(3) = 3
Index: tests/debugger/declarative/func_call.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/func_call.exp2,v
retrieving revision 1.2
diff -u -r1.2 func_call.exp2
--- tests/debugger/declarative/func_call.exp2	6 Jan 2005 03:20:12 -0000	1.2
+++ tests/debugger/declarative/func_call.exp2	9 Jan 2005 05:11:24 -0000
@@ -12,22 +12,19 @@
 fib(6) = 9
 Valid? no
 Call =<(6, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(6, 1) = 5
 Valid? yes
 fib(5) = 6
 Valid? no
 Call =<(5, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(5, 1) = 4
 Valid? yes
 fib(4) = 4
 Valid? no
 Call =<(4, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 -(4, 1) = 3
 Valid? yes
 fib(3) = 3
Index: tests/debugger/declarative/ho3.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho3.exp,v
retrieving revision 1.3
diff -u -r1.3 ho3.exp
--- tests/debugger/declarative/ho3.exp	17 Jan 2003 05:57:01 -0000	1.3
+++ tests/debugger/declarative/ho3.exp	7 Jan 2005 04:51:55 -0000
@@ -10,18 +10,15 @@
       16:      2  2 FAIL pred ho3.p/1-0 (semidet) ho3.m:28 (ho3.m:10)
 mdb> dd
 Call p(1)
-No solutions.
-Complete? no
+Unsatisfiable? no
 q(0, x(0))
 Valid? yes
 Call x(0, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(0, y(0))
 Valid? yes
 Call y(0, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q(0, _)
 Solutions:
 	q(0, x(0))
@@ -37,14 +34,11 @@
       32:      6  2 FAIL pred ho3.p/1-0 (semidet) ho3.m:28 (ho3.m:17)
 mdb> dd
 Call p(2)
-No solutions.
-Complete? no
+Unsatisfiable? no
 Call x(0, 2)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call y(0, 2)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found partially uncovered atom:
 p(2)
 Is this a bug? yes
Index: tests/debugger/declarative/ho4.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho4.exp,v
retrieving revision 1.3
diff -u -r1.3 ho4.exp
--- tests/debugger/declarative/ho4.exp	17 Jan 2003 05:57:01 -0000	1.3
+++ tests/debugger/declarative/ho4.exp	7 Jan 2005 04:51:55 -0000
@@ -10,8 +10,7 @@
       18:      2  2 FAIL pred ho4.p/1-0 (semidet) ho4.m:28 (ho4.m:10)
 mdb> dd
 Call p(1)
-No solutions.
-Complete? no
+Unsatisfiable? no
 q(r(5), 5)
 Valid? yes
 q(r(5), 0)
@@ -31,8 +30,7 @@
       36:      5  2 FAIL pred ho4.p/1-0 (semidet) ho4.m:28 (ho4.m:17)
 mdb> dd
 Call p(2)
-No solutions.
-Complete? no
+Unsatisfiable? no
 Found partially uncovered atom:
 p(2)
 Is this a bug? yes
Index: tests/debugger/declarative/if_then_else.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/if_then_else.exp,v
retrieving revision 1.13
diff -u -r1.13 if_then_else.exp
--- tests/debugger/declarative/if_then_else.exp	6 Jan 2005 03:20:12 -0000	1.13
+++ tests/debugger/declarative/if_then_else.exp	7 Jan 2005 04:51:55 -0000
@@ -30,8 +30,7 @@
 ite(1, 0)
 Valid? no
 Call a(1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found incorrect contour:
 a(0)
 ite(1, 0)
Index: tests/debugger/declarative/ite_2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp,v
retrieving revision 1.5
diff -u -r1.5 ite_2.exp
--- tests/debugger/declarative/ite_2.exp	6 Jan 2005 03:20:12 -0000	1.5
+++ tests/debugger/declarative/ite_2.exp	7 Jan 2005 04:51:55 -0000
@@ -20,8 +20,7 @@
 a(1, 1)
 Valid? yes
 Call >(1, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 c(1, 1)
 Valid? yes
 Found incorrect contour:
@@ -39,8 +38,7 @@
 b(1, 0)
 Valid? yes
 Call >(0, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 b(1, 1)
 Valid? yes
 Call b(1, _)
Index: tests/debugger/declarative/ite_2.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp2,v
retrieving revision 1.3
diff -u -r1.3 ite_2.exp2
--- tests/debugger/declarative/ite_2.exp2	6 Jan 2005 03:20:13 -0000	1.3
+++ tests/debugger/declarative/ite_2.exp2	9 Jan 2005 05:11:24 -0000
@@ -20,8 +20,7 @@
 a(1, 1)
 Valid? yes
 Call >(1, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 c(1, 1)
 Valid? yes
 Found incorrect contour:
@@ -39,8 +38,7 @@
 b(1, 0)
 Valid? yes
 Call >(0, 1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 b(1, 1)
 Valid? yes
 Call b(1, _)
Index: tests/debugger/declarative/neg_conj.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/neg_conj.exp,v
retrieving revision 1.7
diff -u -r1.7 neg_conj.exp
--- tests/debugger/declarative/neg_conj.exp	17 Jan 2003 05:57:01 -0000	1.7
+++ tests/debugger/declarative/neg_conj.exp	7 Jan 2005 04:51:55 -0000
@@ -14,13 +14,11 @@
 q(0, 0)
 Valid? yes
 Call r(0)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(0, 1)
 Valid? yes
 Call r(1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q(0, _)
 Solutions:
 	q(0, 0)
Index: tests/debugger/declarative/neg_conj.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/neg_conj.exp2,v
retrieving revision 1.3
diff -u -r1.3 neg_conj.exp2
--- tests/debugger/declarative/neg_conj.exp2	30 Jan 2003 05:59:28 -0000	1.3
+++ tests/debugger/declarative/neg_conj.exp2	9 Jan 2005 05:11:24 -0000
@@ -14,13 +14,11 @@
 q(0, 0)
 Valid? yes
 Call r(0)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 q(0, 1)
 Valid? yes
 Call r(1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call q(0, _)
 Solutions:
 	q(0, 0)
Index: tests/debugger/declarative/output_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.exp,v
retrieving revision 1.9
diff -u -r1.9 output_term_dep.exp
--- tests/debugger/declarative/output_term_dep.exp	6 Jan 2005 03:20:13 -0000	1.9
+++ tests/debugger/declarative/output_term_dep.exp	7 Jan 2005 04:51:55 -0000
@@ -84,8 +84,7 @@
 ra(2)
 Valid? yes
 Call rb(2)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found incorrect contour:
 ra(2)
 r(2, 43)
@@ -125,8 +124,7 @@
 rd(-1)
 Valid? yes
 Call ra(4)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found incorrect contour:
 rd(-1)
 r(4, -1)
@@ -232,11 +230,9 @@
 tb(77)
 Valid? yes
 Call ta(1)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Call tc(77)
-No solutions.
-Complete? yes
+Unsatisfiable? yes
 Found incorrect contour:
 tb(77)
 t(1, 77)
Index: tests/debugger/declarative/queens.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/queens.exp,v
retrieving revision 1.13
diff -u -r1.13 queens.exp
--- tests/debugger/declarative/queens.exp	17 Jan 2003 05:57:02 -0000	1.13
+++ tests/debugger/declarative/queens.exp	7 Jan 2005 04:51:55 -0000
@@ -12,39 +12,33 @@
      161:      3  2 FAIL pred queens.queen/2-0 (nondet) queens.m:41 (queens.m:15)
 mdb> dd
 Call queen([1, 2, 3, 4, 5], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 Call qperm([1, 2, 3, 4, 5], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 qdelete(1, [1, 2, 3, 4, 5], [2, ...])
 Valid? yes
 qdelete(2, [1, 2, 3, 4, 5], [1, ...])
 Valid? yes
 Call qperm([1, 3, 4, 5], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 qdelete(1, [1, 3, 4, 5], [3, 4, ...])
 Valid? yes
 qdelete(3, [1, 3, 4, 5], [1, 4, ...])
 Valid? yes
 Call qperm([1, 4, 5], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 qdelete(1, [1, 4, 5], [4, 5])
 Valid? yes
 qdelete(4, [1, 4, 5], [1, 5])
 Valid? yes
 Call qperm([1, 5], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 qdelete(1, [1, 5], [5])
 Valid? yes
 qdelete(5, [1, 5], [1])
 Valid? yes
 Call qperm([1], _)
-No solutions.
-Complete? no
+Unsatisfiable? no
 qdelete(1, [1], [])
 Valid? yes
 Call qdelete(_, [1], _)
--------------------------------------------------------------------------
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