[m-dev.] fix up the univ test cases

Thomas Conway conway at cs.mu.OZ.AU
Sat Jan 13 12:28:22 AEDT 2001


Hi

The following diff fixes up the univ test cases that I forgot
to fix earlier.
Is there a separate release branch for the tests? If not then
comitting all these on the main branch will break tests when
run on the release branch.

Thomas
-- 
 Thomas Conway              Mercurian )O+  
 <conway at cs.mu.oz.au>       Every sword has two edges.

Index: debugger/exception_value.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/exception_value.exp,v
retrieving revision 1.3
diff -u -r1.3 exception_value.exp
--- debugger/exception_value.exp	2000/11/01 04:23:03	1.3
+++ debugger/exception_value.exp	2001/01/11 22:29:10
@@ -16,7 +16,7 @@
 mdb: warning: reached unknown label
 This may result in some exception events
 being omitted from the trace.
-exception(univ("p exception" : string))
+exception(univ_cons("p exception"))
        7:      5  3 CALL pred exception_value:q/1-0 (det) exception_value.m:35
 mdb> finish
        8:      5  3 EXCP pred exception_value:q/1-0 (det)
@@ -39,4 +39,4 @@
 mdb: warning: reached unknown label
 This may result in some exception events
 being omitted from the trace.
-exception(univ("q oops" - [1, 2, 3] : std_util:pair(string, list:list(int))))
+exception(univ_cons("q oops" - [1, 2, 3]))
Index: debugger/mdb_command_test.inp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/mdb_command_test.inp,v
retrieving revision 1.12
diff -u -r1.12 mdb_command_test.inp
--- debugger/mdb_command_test.inp	2000/10/27 08:38:55	1.12
+++ debugger/mdb_command_test.inp	2001/01/12 06:57:03
@@ -40,6 +40,8 @@
 nondet_stack         xyzzy xyzzy xyzzy xyzzy xyzzy
 stack_regs           xyzzy xyzzy xyzzy xyzzy xyzzy
 all_regs             xyzzy xyzzy xyzzy xyzzy xyzzy
+table_io             xyzzy xyzzy xyzzy xyzzy xyzzy
+label_stats          xyzzy xyzzy xyzzy xyzzy xyzzy
 source               xyzzy xyzzy xyzzy xyzzy xyzzy
 save                 xyzzy xyzzy xyzzy xyzzy xyzzy
 quit                 xyzzy xyzzy xyzzy xyzzy xyzzy
Index: debugger/declarative/throw.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/declarative/throw.exp,v
retrieving revision 1.4
diff -u -r1.4 throw.exp
--- debugger/declarative/throw.exp	2000/11/01 04:26:31	1.4
+++ debugger/declarative/throw.exp	2001/01/11 22:29:44
@@ -28,7 +28,7 @@
 mdb: warning: reached unknown label
 This may result in some exception events
 being omitted from the trace.
-exception(univ("Too big" : string))
+exception(univ_cons("Too big"))
       32:      6  2 CALL pred throw:q/1-0 (semidet) throw.m:48
 mdb> finish
       65:      6  2 EXCP pred throw:q/1-0 (semidet)
@@ -50,4 +50,4 @@
 mdb: warning: reached unknown label
 This may result in some exception events
 being omitted from the trace.
-exception(univ("Too big" : string))
+exception(univ_cons("Too big"))
Index: hard_coded/construct.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/construct.exp,v
retrieving revision 1.6
diff -u -r1.6 construct.exp
--- hard_coded/construct.exp	2000/12/15 07:41:27	1.6
+++ hard_coded/construct.exp	2001/01/11 22:30:13
@@ -227,4 +227,4 @@
 About to construct {}/3
 Constructed: {4, "five", '6'}
 About to call construct_tuple
-Constructed tuple: univ({[1, 2, 3], [one, two, three], 1, 2.10000000000000} : {list:list(int), list:list(construct:enum), int, float})
+Constructed tuple: univ_cons({[1, 2, 3], [one, two, three], 1, 2.10000000000000})
Index: hard_coded/deep_copy.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/deep_copy.exp,v
retrieving revision 1.3
diff -u -r1.3 deep_copy.exp
--- hard_coded/deep_copy.exp	2000/09/18 11:52:42	1.3
+++ hard_coded/deep_copy.exp	2001/01/11 22:30:32
@@ -87,9 +87,9 @@
 4
 4
 4
-univ(["hi! I\'m a univ!"] : list:list(string))
-univ(["hi! I\'m a univ!"] : list:list(string))
-univ(["hi! I\'m a univ!"] : list:list(string))
+univ_cons(["hi! I\'m a univ!"])
+univ_cons(["hi! I\'m a univ!"])
+univ_cons(["hi! I\'m a univ!"])
 {1, "two", '3', {4, '5', "6"}}
 {1, "two", '3', {4, '5', "6"}}
 {1, "two", '3', {4, '5', "6"}}
Index: hard_coded/existential_float.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/existential_float.exp,v
retrieving revision 1.2
diff -u -r1.2 existential_float.exp
--- hard_coded/existential_float.exp	2000/05/17 22:05:01	1.2
+++ hard_coded/existential_float.exp	2001/01/11 22:30:52
@@ -20,4 +20,4 @@
 no.
 33.3000000000000
 no.
-[univ(2.00000000000000 : float), univ(1.00000000000000 : float)]
+[univ_cons(2.00000000000000), univ_cons(1.00000000000000)]
Index: hard_coded/existential_reordering.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/existential_reordering.exp,v
retrieving revision 1.2
diff -u -r1.2 existential_reordering.exp
--- hard_coded/existential_reordering.exp	1999/06/30 17:13:32	1.2
+++ hard_coded/existential_reordering.exp	2001/01/11 22:31:04
@@ -1 +1 @@
-univ([] : list:list(int))
+univ_cons([])
Index: hard_coded/expand.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/expand.exp,v
retrieving revision 1.4
diff -u -r1.4 expand.exp
--- hard_coded/expand.exp	2000/09/18 11:52:44	1.4
+++ hard_coded/expand.exp	2001/01/13 01:24:47
@@ -101,9 +101,9 @@
 no arguments
 expand: functor 4 arity 0 arguments []
 
-./2
-argument 2 of functor . was:[]
-expand: functor . arity 2 arguments ["hi! I\'m a univ!", []]
+univ_cons/1
+argument 1 of functor univ_cons was:["hi! I\'m a univ!"]
+expand: functor univ_cons arity 1 arguments [["hi! I\'m a univ!"]]
 
 <<predicate>>/0
 no arguments
Index: hard_coded/string_alignment_bug.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/string_alignment_bug.exp,v
retrieving revision 1.1
diff -u -r1.1 string_alignment_bug.exp
--- hard_coded/string_alignment_bug.exp	1999/03/24 04:22:17	1.1
+++ hard_coded/string_alignment_bug.exp	2001/01/11 22:40:16
@@ -2,14 +2,14 @@
 empty
 Adding `Tiles': three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), two(5 - 4, tile(plain, []), empty, em
plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))
 New global store:
-two("Tiles", univ(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), two(5 - 4, tile(plain, []), empty, 
e(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty)))))) : tree234:tree234(std_util:pair(int, int), string_alignment_bug:tile)), empty, empty)
+two("Tiles", univ_cons(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), two(5 - 4, tile(plain, []), em
, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))), empty, empty)
 Current global store:
-two("Tiles", univ(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), two(5 - 4, tile(plain, []), empty, 
e(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty)))))) : tree234:tree234(std_util:pair(int, int), string_alignment_bug:tile)), empty, empty)
+two("Tiles", univ_cons(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), two(5 - 4, tile(plain, []), em
, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))), empty, empty)
 Adding `Selection': []
 New global store:
-three("Selection", univ([] : list:list(std_util:pair(int, int))), "Tiles", univ(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(
), empty, empty))), two(5 - 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty)))))) : tree234:tree234(std_util:pair(int, int), string_alignment_bug:tile)), empty, empty, empty)
+three("Selection", univ_cons([]), "Tiles", univ_cons(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), 
 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))), empty, empty, empty)
 Current global store:
-three("Selection", univ([] : list:list(std_util:pair(int, int))), "Tiles", univ(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(
), empty, empty))), two(5 - 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty)))))) : tree234:tree234(std_util:pair(int, int), string_alignment_bug:tile)), empty, empty, empty)
+three("Selection", univ_cons([]), "Tiles", univ_cons(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, tile(plain, []), empty, empty), 
 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))), empty, empty, empty)
 Adding `CurrentFile': no
 New global store:
-four("CurrentFile", univ(no : std_util:maybe(string)), "Selection", univ([] : list:list(std_util:pair(int, int))), "Tiles", univ(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empt
in, []), empty, empty), two(5 - 4, tile(plain, []), empty, empty))), two(5 - 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty)))))) : tree234:tree234(std_util:pair(int, int), string_alignment_bug:tile)), empty, empty, empty, empty)
+four("CurrentFile", univ_cons(no), "Selection", univ_cons([]), "Tiles", univ_cons(three(3 - 1, tile(plain, []), 6 - 3, tile(plain, []), two(1 - 5, tile(plain, []), two(0 - 7, tile(plain, []), two(0 - 3, tile(plain, []), two(0 - 1, tile(plain, []), two(0 - 0, tile(plain, []), empty, empty), two(0 - 2, tile(plain, []), empty, empty)), two(0 - 5, tile(plain, []), two(0 - 4, tile(plain, []), empty, empty), two(0 - 6, tile(plain, []), empty, empty))), two(1 - 1, tile(plain, []), two(0 - 9, tile(plain, []), two(0 - 8, tile(plain, []), empty, empty), two(1 - 0, tile(plain, []), empty, empty)), two(1 - 3, tile(plain, []), two(1 - 2, tile(plain, []), empty, empty), two(1 - 4, tile(plain, []), empty, empty)))), two(2 - 3, tile(plain, []), two(1 - 9, tile(plain, []), two(1 - 7, tile(plain, []), two(1 - 6, tile(plain, []), empty, empty), two(1 - 8, tile(plain, []), empty, empty)), two(2 - 1, tile(plain, []), two(2 - 0, tile(plain, []), empty, empty), two(2 - 2, tile(plain, []), empty, empty))), two(2 - 7, tile(plain, []), two(2 - 5, tile(plain, []), two(2 - 4, tile(plain, []), empty, empty), two(2 - 6, tile(plain, []), empty, empty)), two(2 - 9, tile(plain, []), two(2 - 8, tile(plain, []), empty, empty), two(3 - 0, tile(plain, []), empty, empty))))), two(4 - 7, tile(plain, []), two(3 - 9, tile(plain, []), two(3 - 5, tile(plain, []), two(3 - 3, tile(plain, []), two(3 - 2, tile(plain, []), empty, empty), two(3 - 4, tile(plain, []), empty, empty)), two(3 - 7, tile(plain, []), two(3 - 6, tile(plain, []), empty, empty), two(3 - 8, tile(plain, []), empty, empty))), two(4 - 3, tile(plain, []), two(4 - 1, tile(plain, []), two(4 - 0, tile(plain, []), empty, empty), two(4 - 2, tile(plain, []), empty, empty)), two(4 - 5, tile(plain, []), two(4 - 4, tile(plain, []), empty, empty), two(4 - 6, tile(plain, []), empty, empty)))), two(5 - 5, tile(plain, []), two(5 - 1, tile(plain, []), two(4 - 9, tile(plain, []), two(4 - 8, tile(plain, []), empty, empty), two(5 - 0, tile(plain, []), empty, empty)), two(5 - 3, tile(plain, []), two(5 - 2, til
[]), empty, empty))), two(5 - 9, tile(plain, []), two(5 - 7, tile(plain, []), two(5 - 6, tile(plain, []), empty, empty), two(5 - 8, tile(plain, []), empty, empty)), two(6 - 1, tile(plain, []), two(6 - 0, tile(plain, []), empty, empty), two(6 - 2, tile(plain, []), empty, empty))))), two(7 - 9, tile(plain, []), two(7 - 1, tile(plain, []), two(6 - 7, tile(plain, []), two(6 - 5, tile(plain, []), two(6 - 4, tile(plain, []), empty, empty), two(6 - 6, tile(plain, []), empty, empty)), two(6 - 9, tile(plain, []), two(6 - 8, tile(plain, []), empty, empty), two(7 - 0, tile(plain, []), empty, empty))), two(7 - 5, tile(plain, []), two(7 - 3, tile(plain, []), two(7 - 2, tile(plain, []), empty, empty), two(7 - 4, tile(plain, []), empty, empty)), two(7 - 7, tile(plain, []), two(7 - 6, tile(plain, []), empty, empty), two(7 - 8, tile(plain, []), empty, empty)))), two(8 - 7, tile(plain, []), two(8 - 3, tile(plain, []), two(8 - 1, tile(plain, []), two(8 - 0, tile(plain, []), empty, empty), two(8 - 2, tile(plain, []), empty, empty)), two(8 - 5, tile(plain, []), two(8 - 4, tile(plain, []), empty, empty), two(8 - 6, tile(plain, []), empty, empty))), two(9 - 1, tile(plain, []), two(8 - 9, tile(plain, []), two(8 - 8, tile(plain, []), empty, empty), two(9 - 0, tile(plain, []), empty, empty)), four(9 - 3, tile(plain, []), 9 - 5, tile(plain, []), 9 - 7, tile(plain, []), two(9 - 2, tile(plain, []), empty, empty), two(9 - 4, tile(plain, []), empty, empty), two(9 - 6, tile(plain, []), empty, empty), three(9 - 8, tile(plain, []), 9 - 9, tile(plain, []), empty, empty, empty))))))), empty, empty, empty, empty)
Index: hard_coded/term_to_univ_test.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/term_to_univ_test.exp,v
retrieving revision 1.1
diff -u -r1.1 term_to_univ_test.exp
--- hard_coded/term_to_univ_test.exp	2000/11/10 11:00:35	1.1
+++ hard_coded/term_to_univ_test.exp	2001/01/12 03:11:54
@@ -1,2 +1,2 @@
-functor(atom("univ"), [functor(atom(":"), [functor(integer(4), [], context("", 0)), functor(atom(":"), [functor(atom("int"), [], context("", 0)), functor(atom("int"), [], context("", 0))], context("", 0))], context("", 0))], context("", 0))
-univ(4 : (int : int))
+functor(atom("univ_cons"), [functor(integer(4), [], context("", 0))], context("", 0))
+univ_cons(4)
Index: hard_coded/user_defined_equality.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/user_defined_equality.exp,v
retrieving revision 1.2
diff -u -r1.2 user_defined_equality.exp
--- hard_coded/user_defined_equality.exp	2000/04/05 06:29:10	1.2
+++ hard_coded/user_defined_equality.exp	2001/01/11 22:32:51
@@ -1,3 +1,3 @@
 yes
-threw exception: univ(software_error("call to compare/3 for non-canonical type `user_defined_equality:foo\'") : require:software_error)
-threw exception: univ(software_error("call to compare/3 for non-canonical type `user_defined_equality:foo\'") : require:software_error)
+threw exception: univ_cons(software_error("call to compare/3 for non-canonical type `user_defined_equality:foo\'"))
+threw exception: univ_cons(software_error("call to compare/3 for non-canonical type `user_defined_equality:foo\'"))
Index: hard_coded/write.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/write.exp,v
retrieving revision 1.9
diff -u -r1.9 write.exp
--- hard_coded/write.exp	1998/12/04 01:11:13	1.9
+++ hard_coded/write.exp	2001/01/11 22:33:08
@@ -35,7 +35,7 @@
 2.23954899000000e+23
 -65
 4
-univ(["hi! I\'m a univ!"] : list:list(string))
+univ_cons(["hi! I\'m a univ!"])
 '<<predicate>>'
 
 TESTING OTHER TYPES
Index: hard_coded/write_reg1.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/write_reg1.exp,v
retrieving revision 1.5
diff -u -r1.5 write_reg1.exp
--- hard_coded/write_reg1.exp	1998/12/04 01:11:14	1.5
+++ hard_coded/write_reg1.exp	2001/01/11 22:33:22
@@ -27,7 +27,7 @@
 2.23954899000000e+23
 -65
 4
-univ(["hi! I\'m a univ!"] : list:list(string))
+univ_cons(["hi! I\'m a univ!"])
 '<<predicate>>'
 
 TESTING OTHER TYPES
Index: hard_coded/write_reg2.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/write_reg2.exp,v
retrieving revision 1.1
diff -u -r1.1 write_reg2.exp
--- hard_coded/write_reg2.exp	2000/12/15 07:41:32	1.1
+++ hard_coded/write_reg2.exp	2001/01/11 22:33:40
@@ -1,2 +1,2 @@
-univ(1 - 2 : std_util:pair(int, int))
-univ({1, 2, 3} : {int, int, int})
+univ_cons(1 - 2)
+univ_cons({1, 2, 3})
Index: hard_coded/exceptions/test_exceptions.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/exceptions/test_exceptions.exp,v
retrieving revision 1.1
diff -u -r1.1 test_exceptions.exp
--- hard_coded/exceptions/test_exceptions.exp	1999/08/31 12:57:20	1.1
+++ hard_coded/exceptions/test_exceptions.exp	2001/01/11 22:34:20
@@ -1,17 +1,17 @@
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
Index: hard_coded/exceptions/test_exceptions_func.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/exceptions/test_exceptions_func.exp,v
retrieving revision 1.1
diff -u -r1.1 test_exceptions_func.exp
--- hard_coded/exceptions/test_exceptions_func.exp	1999/08/31 12:57:20	1.1
+++ hard_coded/exceptions/test_exceptions_func.exp	2001/01/11 22:34:36
@@ -1,5 +1,5 @@
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
Index: hard_coded/exceptions/test_loop_check.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/exceptions/test_loop_check.exp,v
retrieving revision 1.1
diff -u -r1.1 test_loop_check.exp
--- hard_coded/exceptions/test_loop_check.exp	2000/01/26 05:37:12	1.1
+++ hard_coded/exceptions/test_loop_check.exp	2001/01/11 22:35:27
@@ -1,54 +1,54 @@
 --- first time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
 --- second time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
 --- third time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
Index: hard_coded/exceptions/test_memo.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/exceptions/test_memo.exp,v
retrieving revision 1.1
diff -u -r1.1 test_memo.exp
--- hard_coded/exceptions/test_memo.exp	2000/01/26 05:37:13	1.1
+++ hard_coded/exceptions/test_memo.exp	2001/01/11 22:36:05
@@ -1,54 +1,54 @@
 --- first time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
 --- second time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
 --- third time ---
-det_throw: exception(univ("det_throw" : string))
+det_throw: exception(univ_cons("det_throw"))
 det_succeed: succeeded("det_succeed")
-semidet_throw: exception(univ("semidet_throw" : string))
+semidet_throw: exception(univ_cons("semidet_throw"))
 semidet_succeed: succeeded("semidet_succeed")
 semidet_fail: failed
-cc_multi_throw: exception(univ("cc_multi_throw" : string))
+cc_multi_throw: exception(univ_cons("cc_multi_throw"))
 cc_multi_succeed: succeeded("cc_multi_succeed")
-cc_nondet_throw: exception(univ("cc_nondet_throw" : string))
+cc_nondet_throw: exception(univ_cons("cc_nondet_throw"))
 cc_nondet_succeed: succeeded("cc_nondet_succeed")
 cc_nondet_fail: failed
-multi_throw: exception(univ("multi_throw" : string))
+multi_throw: exception(univ_cons("multi_throw"))
 multi_succeed: succeeded(["multi_succeed 1", "multi_succeed 2"])
-multi_succeed_then_throw: exception(univ("multi_succeed_then_throw 3" : string))
-nondet_throw: exception(univ("nondet_throw" : string))
+multi_succeed_then_throw: exception(univ_cons("multi_succeed_then_throw 3"))
+nondet_throw: exception(univ_cons("nondet_throw"))
 nondet_succeed: succeeded(["nondet_succeed 1", "nondet_succeed 2"])
 nondet_fail: succeeded([])
-nondet_succeed_then_throw: exception(univ("nondet_succeed_then_throw 3" : string))
+nondet_succeed_then_throw: exception(univ_cons("nondet_succeed_then_throw 3"))
Index: hard_coded/exceptions/test_try_all.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/exceptions/test_try_all.exp,v
retrieving revision 1.1
diff -u -r1.1 test_try_all.exp
--- hard_coded/exceptions/test_try_all.exp	2000/06/19 07:19:09	1.1
+++ hard_coded/exceptions/test_try_all.exp	2001/01/11 22:36:22
@@ -1,12 +1,12 @@
-det_throw: [exception(univ("det_throw" : string))]
+det_throw: [exception(univ_cons("det_throw"))]
 det_succeed: [succeeded("det_succeed")]
-semidet_throw: [exception(univ("semidet_throw" : string))]
+semidet_throw: [exception(univ_cons("semidet_throw"))]
 semidet_succeed: [succeeded("semidet_succeed")]
 semidet_fail: []
-multi_throw: [exception(univ("multi_throw" : string))]
+multi_throw: [exception(univ_cons("multi_throw"))]
 multi_succeed: [succeeded("multi_succeed 2"), succeeded("multi_succeed 1")]
-multi_succeed_then_throw: [exception(univ("multi_succeed_then_throw 3" : string)), succeeded("multi_succeed_then_throw 2"), succeeded("multi_succeed_then_throw 1")]
-nondet_throw: [exception(univ("nondet_throw" : string))]
+multi_succeed_then_throw: [exception(univ_cons("multi_succeed_then_throw 3")), succeeded("multi_succeed_then_throw 2"), succeeded("multi_succeed_then_throw 1")]
+nondet_throw: [exception(univ_cons("nondet_throw"))]
 nondet_succeed: [succeeded("nondet_succeed 2"), succeeded("nondet_succeed 1")]
 nondet_fail: []
-nondet_succeed_then_throw: [exception(univ("nondet_succeed_then_throw 3" : string)), succeeded("nondet_succeed_then_throw 2"), succeeded("nondet_succeed_then_throw 1")]
+nondet_succeed_then_throw: [exception(univ_cons("nondet_succeed_then_throw 3")), succeeded("nondet_succeed_then_throw 2"), succeeded("nondet_succeed_then_throw 1")]
Index: hard_coded/typeclasses/existential_rtti.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/typeclasses/existential_rtti.exp,v
retrieving revision 1.1
diff -u -r1.1 existential_rtti.exp
--- hard_coded/typeclasses/existential_rtti.exp	2000/05/09 10:48:54	1.1
+++ hard_coded/typeclasses/existential_rtti.exp	2001/01/12 06:56:28
@@ -41,26 +41,26 @@
 multi2(11, "multiparameter", 42.0000000000000)
 Writing deconstructed terms:
 myf/1
-univ(1 : int)
+univ_cons(1)
 f/3
-univ(1 : int), univ("hello" : string), univ(42 : int)
+univ_cons(1), univ_cons("hello"), univ_cons(42)
 f/3
-univ(2 : int), univ('w' : character), univ(42 : int)
+univ_cons(2), univ_cons('w'), univ_cons(42)
 f/3
-univ(3 : int), univ(goo : existential_rtti:goo), univ(42 : int)
+univ_cons(3), univ_cons(goo), univ_cons(42)
 f/3
-univ(4 : int), univ(g("hello") : existential_rtti:g), univ(42 : int)
+univ_cons(4), univ_cons(g("hello")), univ_cons(42)
 f/3
-univ(5 : int), univ(g2(12) : existential_rtti:g2), univ(42 : int)
+univ_cons(5), univ_cons(g2(12)), univ_cons(42)
 f/3
-univ(6 : int), univ(foo("hello", "world") : existential_rtti:foo), univ(42 : int)
+univ_cons(6), univ_cons(foo("hello", "world")), univ_cons(42)
 g/3
-univ(7.00000000000000 : float), univ(g("hello") : existential_rtti:g), univ(42.0000000000000 : float)
+univ_cons(7.00000000000000), univ_cons(g("hello")), univ_cons(42.0000000000000)
 f/3
-univ(8 : int), univ(u("hello") : existential_rtti:u(string)), univ(42 : int)
+univ_cons(8), univ_cons(u("hello")), univ_cons(42)
 f2/6
-univ(9 : int), univ("hello" : string), univ(u("hello") : existential_rtti:u(string)), univ(432.100000000000 : float), univ(u("world") : existential_rtti:u(string)), univ(42 : int)
+univ_cons(9), univ_cons("hello"), univ_cons(u("hello")), univ_cons(432.100000000000), univ_cons(u("world")), univ_cons(42)
 multi/2
-univ(10 : int), univ("multiparameter" : string)
+univ_cons(10), univ_cons("multiparameter")
 multi2/3
-univ(11 : int), univ("multiparameter" : string), univ(42.0000000000000 : float)
+univ_cons(11), univ_cons("multiparameter"), univ_cons(42.0000000000000)
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list