[m-dev.] trivial diff: fix tests/debugger/*.exp2

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Nov 1 09:36:02 AEDT 1999


Estimated hours taken: 0.5

tests/debugger/*.exp2:
        Adjust the whitespace in the *.exp2 files to match
        what the debugger actually outputs.
	(My previous attempt at that did not do the job.)

Workspace: /home/mercury0/fjh/mercury
Index: tests/debugger/existential_type_classes.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/existential_type_classes.exp2,v
retrieving revision 1.5
diff -u -d -r1.5 existential_type_classes.exp2
--- existential_type_classes.exp2	1999/10/26 07:52:33	1.5
+++ existential_type_classes.exp2	1999/10/31 22:29:32
@@ -9,15 +9,15 @@
 mdb> continue -a
        2:      2  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	42
+       HeadVar__1             	42
 mdb> 
        3:      3  3 CALL pred existential_type_classes:foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	42
+       HeadVar__1             	42
 mdb> 
        4:      4  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
 mdb> P
-       HeadVar__1           	42
+       HeadVar__1             	42
 mdb> continue -a
        5:      5  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
        6:      5  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
@@ -25,20 +25,20 @@
        8:      3  3 EXIT pred existential_type_classes:foo/2-0 (det) 
        9:      2  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	42
-       HeadVar__2           	84
+       HeadVar__1             	42
+       HeadVar__2             	84
 mdb> continue -a
       10:      6  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	"blah"
+       HeadVar__1             	"blah"
 mdb> 
       11:      7  3 CALL pred existential_type_classes:foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	"blah"
+       HeadVar__1             	"blah"
 mdb> 
       12:      8  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__string__arity0______existential_type_classes__foo_2/2-0 (det) 
 mdb> P
-       HeadVar__1           	"blah"
+       HeadVar__1             	"blah"
 mdb> continue -a
       13:      9  5 CALL pred existential_type_classes:string_foo/2-0 (det) 
       14:     10  6 CALL pred string:length/2-0 (det) 
@@ -48,22 +48,22 @@
       18:      7  3 EXIT pred existential_type_classes:foo/2-0 (det) 
       19:      6  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	"blah"
-       HeadVar__2           	4
+       HeadVar__1             	"blah"
+       HeadVar__2             	4
 mdb> continue -a
       20:     11  2 CALL func existential_type_classes:my_exist_t/1-0 (det) 
       21:     11  2 EXIT func existential_type_classes:my_exist_t/1-0 (det) 
       22:     12  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> 
       23:     13  3 CALL pred existential_type_classes:foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> 
       24:     14  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> continue -a
       25:     15  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
       26:     15  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
@@ -71,8 +71,8 @@
       28:     13  3 EXIT pred existential_type_classes:foo/2-0 (det) 
       29:     12  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
-       HeadVar__2           	86
+       HeadVar__1             	43
+       HeadVar__2             	86
 mdb> continue -a
       30:     16  2 CALL func existential_type_classes:call_my_exist_t/1-0 (det) 
       31:     17  3 CALL func existential_type_classes:my_exist_t/1-0 (det) 
@@ -80,15 +80,15 @@
       33:     16  2 EXIT func existential_type_classes:call_my_exist_t/1-0 (det) 
       34:     18  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> 
       35:     19  3 CALL pred existential_type_classes:foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> 
       36:     20  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
+       HeadVar__1             	43
 mdb> continue -a
       37:     21  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
       38:     21  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
@@ -96,8 +96,8 @@
       40:     19  3 EXIT pred existential_type_classes:foo/2-0 (det) 
       41:     18  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	43
-       HeadVar__2           	86
+       HeadVar__1             	43
+       HeadVar__2             	86
 mdb> continue -a
       42:     22  2 CALL func existential_type_classes:my_univ/2-0 (det) 
       43:     22  2 EXIT func existential_type_classes:my_univ/2-0 (det) 
@@ -105,15 +105,15 @@
       45:     23  2 EXIT func existential_type_classes:my_univ_value/2-0 (det) 
       46:     24  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	45
+       HeadVar__1             	45
 mdb> 
       47:     25  3 CALL pred existential_type_classes:foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	45
+       HeadVar__1             	45
 mdb> 
       48:     26  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
 mdb> P
-       HeadVar__1           	45
+       HeadVar__1             	45
 mdb> continue -a
       49:     27  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
       50:     27  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
@@ -121,8 +121,8 @@
       52:     25  3 EXIT pred existential_type_classes:foo/2-0 (det) 
       53:     24  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	45
-       HeadVar__2           	90
+       HeadVar__1             	45
+       HeadVar__2             	90
 mdb> 
       54:     28  2 CALL func existential_type_classes:my_univ/2-0 (det) 
 mdb> 
@@ -130,17 +130,17 @@
 mdb> 
       56:     29  2 CALL func existential_type_classes:call_my_univ_value/2-0 (det) 
 mdb> P
-       HeadVar__1           	my_univ('<<c_pointer>>')
+       HeadVar__1             	my_univ('<<c_pointer>>')
 mdb> 
       57:     30  3 CALL func existential_type_classes:my_univ_value/2-0 (det) 
 mdb> P
-       Univ                 	my_univ('<<c_pointer>>')
+       Univ                   	my_univ('<<c_pointer>>')
 mdb> continue -a
       58:     30  3 EXIT func existential_type_classes:my_univ_value/2-0 (det) 
       59:     29  2 EXIT func existential_type_classes:call_my_univ_value/2-0 (det) 
       60:     31  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
 mdb> P
-       HeadVar__1           	"something"
+       HeadVar__1             	"something"
 mdb> continue -S
 84
 4
Index: tests/debugger/interpreter.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp2,v
retrieving revision 1.7
diff -u -d -r1.7 interpreter.exp2
--- interpreter.exp2	1999/10/26 07:52:33	1.7
+++ interpreter.exp2	1999/10/31 22:28:38
@@ -11,25 +11,25 @@
         2 HeadVar__2
         3 HeadVar__4
 mdb> print *
-       HeadVar__1           	"interpreter.m"
-       HeadVar__2           	[]
-       HeadVar__4           	state('<<c_pointer>>')
+       HeadVar__1             	"interpreter.m"
+       HeadVar__2             	[]
+       HeadVar__4             	state('<<c_pointer>>')
 mdb> goto 30
 Consulting file `interpreter.m'...
       30:     17  9 CALL pred tree234:set2/4-1 (det) 
 mdb> print *
-       HeadVar__1           	two('<<c_pointer>>', "<standard input>", empty, empty)
-       HeadVar__2           	'<<c_pointer>>'
-       HeadVar__3           	"interpreter.m"
+       HeadVar__1             	two('<<c_pointer>>', "<standard input>", empty, empty)
+       HeadVar__2             	'<<c_pointer>>'
+       HeadVar__3             	"interpreter.m"
 mdb> finish -a
       31:     17  9 THEN pred tree234:set2/4-1 (det) c2;t;
       32:     17  9 SWTC pred tree234:set2/4-1 (det) c2;t;c2;s1;
       33:     17  9 EXIT pred tree234:set2/4-1 (det) 
 mdb> print *
-       HeadVar__1           	two('<<c_pointer>>', "<standard input>", empty, empty)
-       HeadVar__2           	'<<c_pointer>>'
-       HeadVar__3           	"interpreter.m"
-       HeadVar__4           	three(<<c_pointer>>, "interpreter.m", <<c_pointer>>, "<standard input>", empty, empty, empty)
+       HeadVar__1             	two('<<c_pointer>>', "<standard input>", empty, empty)
+       HeadVar__2             	'<<c_pointer>>'
+       HeadVar__3             	"interpreter.m"
+       HeadVar__4             	three(<<c_pointer>>, "interpreter.m", <<c_pointer>>, "<standard input>", empty, empty, empty)
 mdb> 
       34:     16  8 EXIT pred tree234:set/4-1 (det) 
 mdb> finish -n
Index: tests/debugger/multi_parameter.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/multi_parameter.exp2,v
retrieving revision 1.5
diff -u -d -u -r1.5 multi_parameter.exp2
--- multi_parameter.exp2	1999/10/26 07:52:34	1.5
+++ multi_parameter.exp2	1999/10/31 22:33:04
@@ -4,33 +4,33 @@
 mdb> 
        2:      2  2 CALL pred multi_parameter:foo/2-0 (det) 
 mdb> print *
-       HeadVar__1           	'z'
+       HeadVar__1             	'z'
 mdb> 
        3:      3  3 CALL pred multi_parameter:a/2-0 (det) 
 mdb> print *
-       HeadVar__1           	'z'
+       HeadVar__1             	'z'
 mdb> 
        4:      4  4 CALL pred multi_parameter:Introduced_pred_for_multi_parameter__m__character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) 
 mdb> print *
-       HeadVar__1           	'z'
+       HeadVar__1             	'z'
 mdb> 
        5:      5  5 CALL pred char:to_int/2-0 (det) 
 mdb> print *
-       Character            	'z'
+       Character              	'z'
 mdb> 
        6:      5  5 EXIT pred char:to_int/2-0 (det) 
 mdb> print *
-       Character            	'z'
-       Int                  	122
+       Character              	'z'
+       Int                    	122
 mdb> 
        7:      4  4 EXIT pred multi_parameter:Introduced_pred_for_multi_parameter__m__character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) 
 mdb> print *
-       HeadVar__1           	'z'
-       HeadVar__2           	122
+       HeadVar__1             	'z'
+       HeadVar__2             	122
 mdb> 
        8:      3  3 EXIT pred multi_parameter:a/2-0 (det) 
 mdb> print *
-       HeadVar__1           	'z'
-       HeadVar__2           	122
+       HeadVar__1             	'z'
+       HeadVar__2             	122
 mdb> continue -S
 122


-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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