[m-rev.] diff: uci.exp

[Zoltan Somogyi]

tests/debugger/uci.exp:
	Update the expected output of this test case to account for the recent
	change to make avoid pointer equality tests in builtin.{unify,compare}:
	we now get calls to and thus call and exit events from the
	type-construct-specific unify and compare predicates for du types
	(other than enums) even when the two input arguments are pointer-equal.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/stream/tests
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/uci.exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/uci.exp,v
retrieving revision 1.3
diff -u -b -r1.3 uci.exp
--- tests/debugger/uci.exp	7 Dec 2005 16:07:13 -0000	1.3
+++ tests/debugger/uci.exp	23 Apr 2007 15:57:38 -0000
@@ -27,43 +27,67 @@
 mdb> print goal
 __Compare__('>', b1(11), a1(1))
 mdb> c
-      34:     15  3 CALL __Compare__ for uci.t3/3-0 (det)
+      26:     12  3 CALL __Compare__ for uci.t2/2-0 (det)
+mdb> print goal
+__Compare__(_, a2(1, 2), a2(1, 2))
+mdb> c
+      27:     12  3 EXIT __Compare__ for uci.t2/2-0 (det)
+mdb> print goal
+__Compare__('=', a2(1, 2), a2(1, 2))
+mdb> c
+      36:     16  3 CALL __Compare__ for uci.t3/3-0 (det)
 mdb> print goal
 __Compare__(_, b3(11, 12, 13), a3(1, 2, 3))
 mdb> c
-      35:     15  3 EXIT __Compare__ for uci.t3/3-0 (det)
+      37:     16  3 EXIT __Compare__ for uci.t3/3-0 (det)
 mdb> print goal
 __Compare__('>', b3(11, 12, 13), a3(1, 2, 3))
 mdb> c
-      44:     19  3 CALL __Compare__ for uci.t4/4-0 (det)
+      46:     20  3 CALL __Compare__ for uci.t4/4-0 (det)
 mdb> print goal
 __Compare__(_, a4(1, 2, 3, 4), b4(11, 12, 13, 14))
 mdb> c
-      45:     19  3 EXIT __Compare__ for uci.t4/4-0 (det)
+      47:     20  3 EXIT __Compare__ for uci.t4/4-0 (det)
 mdb> print goal
 __Compare__('<', a4(1, 2, 3, 4), b4(11, 12, 13, 14))
 mdb> c
-      70:     29  3 CALL __Unify__ for uci.t2/2-0 (semidet)
+      64:     27  3 CALL __Unify__ for uci.t1/1-0 (semidet)
+mdb> print goal
+__Unify__(a1(1), a1(1))
+mdb> c
+      65:     27  3 EXIT __Unify__ for uci.t1/1-0 (semidet)
+mdb> print goal
+__Unify__(a1(1), a1(1))
+mdb> c
+      74:     31  3 CALL __Unify__ for uci.t2/2-0 (semidet)
 mdb> print goal
 __Unify__(a2(1, 2), b2(11, 12))
 mdb> c
-      71:     29  3 FAIL __Unify__ for uci.t2/2-0 (semidet)
+      75:     31  3 FAIL __Unify__ for uci.t2/2-0 (semidet)
 mdb> print goal
 __Unify__(a2(1, 2), b2(11, 12))
 mdb> c
-      88:     36  3 CALL __Unify__ for uci.t4/4-0 (semidet)
+      84:     35  3 CALL __Unify__ for uci.t3/3-0 (semidet)
+mdb> print goal
+__Unify__(b3(11, 12, 13), b3(11, 12, 13))
+mdb> c
+      85:     35  3 EXIT __Unify__ for uci.t3/3-0 (semidet)
+mdb> print goal
+__Unify__(b3(11, 12, 13), b3(11, 12, 13))
+mdb> c
+      94:     39  3 CALL __Unify__ for uci.t4/4-0 (semidet)
 mdb> print goal
 __Unify__(a4(1, 2, 3, 4), b4(11, 12, 13, 14))
 mdb> c
-      89:     36  3 FAIL __Unify__ for uci.t4/4-0 (semidet)
+      95:     39  3 FAIL __Unify__ for uci.t4/4-0 (semidet)
 mdb> print goal
 __Unify__(a4(1, 2, 3, 4), b4(11, 12, 13, 14))
 mdb> c
-      98:     40  3 CALL __Compare__ for uci.i/3-0 (det)
+     104:     43  3 CALL __Compare__ for uci.i/3-0 (det)
 mdb> print goal
 __Compare__(_, ai(1), bi(11))
 mdb> c
-      99:     40  3 EXIT __Compare__ for uci.i/3-0 (det)
+     105:     43  3 EXIT __Compare__ for uci.i/3-0 (det)
 mdb> print goal
 __Compare__('<', ai(1), bi(11))
 mdb> c
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------