diff --git a/tests/debugger/existential_type_classes.exp b/tests/debugger/existential_type_classes.exp index 0b69bccdd..e59d13725 100644 --- a/tests/debugger/existential_type_classes.exp +++ b/tests/debugger/existential_type_classes.exp @@ -14,12 +14,12 @@ mdb> continue -a mdb> P X (arg 1) 42 mdb> - E3: C3 CALL (from existential_type_classes.m:NNNN) + E3: C3 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 42 mdb> - E4: C4 CALL existential_type_classes.m:NNNN + E4: C4 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 42 @@ -28,9 +28,9 @@ mdb> continue -a pred existential_type_classes.int_foo/2-0 (det) E6: C5 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E7: C4 EXIT existential_type_classes.m:NNNN + E7: C4 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E8: C3 EXIT (from existential_type_classes.m:NNNN) + E8: C3 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E9: C2 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -43,12 +43,12 @@ mdb> continue -a mdb> P X (arg 1) "blah" mdb> - E11: C7 CALL (from existential_type_classes.m:NNNN) + E11: C7 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 "blah" mdb> - E12: C8 CALL existential_type_classes.m:NNNN + E12: C8 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 "blah" @@ -57,9 +57,9 @@ mdb> continue -a pred existential_type_classes.string_foo/2-0 (det) E14: C9 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.string_foo/2-0 (det) - E15: C8 EXIT existential_type_classes.m:NNNN + E15: C8 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det) - E16: C7 EXIT (from existential_type_classes.m:NNNN) + E16: C7 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E17: C6 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -76,12 +76,12 @@ mdb> continue -a mdb> P X (arg 1) 43 mdb> - E21: C12 CALL (from existential_type_classes.m:NNNN) + E21: C12 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 43 mdb> - E22: C13 CALL existential_type_classes.m:NNNN + E22: C13 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 43 @@ -90,9 +90,9 @@ mdb> continue -a pred existential_type_classes.int_foo/2-0 (det) E24: C14 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E25: C13 EXIT existential_type_classes.m:NNNN + E25: C13 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E26: C12 EXIT (from existential_type_classes.m:NNNN) + E26: C12 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E27: C11 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -113,12 +113,12 @@ mdb> continue -a mdb> P X (arg 1) 43 mdb> - E33: C18 CALL (from existential_type_classes.m:NNNN) + E33: C18 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 43 mdb> - E34: C19 CALL existential_type_classes.m:NNNN + E34: C19 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 43 @@ -127,9 +127,9 @@ mdb> continue -a pred existential_type_classes.int_foo/2-0 (det) E36: C20 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E37: C19 EXIT existential_type_classes.m:NNNN + E37: C19 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E38: C18 EXIT (from existential_type_classes.m:NNNN) + E38: C18 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E39: C17 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -150,12 +150,12 @@ mdb> continue -a mdb> P X (arg 1) 45 mdb> - E45: C24 CALL (from existential_type_classes.m:NNNN) + E45: C24 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 45 mdb> - E46: C25 CALL existential_type_classes.m:NNNN + E46: C25 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 45 @@ -164,9 +164,9 @@ mdb> continue -a pred existential_type_classes.int_foo/2-0 (det) E48: C26 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E49: C25 EXIT existential_type_classes.m:NNNN + E49: C25 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E50: C24 EXIT (from existential_type_classes.m:NNNN) + E50: C24 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E51: C23 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) diff --git a/tests/debugger/existential_type_classes.exp2 b/tests/debugger/existential_type_classes.exp2 index b10f9918b..401eae723 100644 --- a/tests/debugger/existential_type_classes.exp2 +++ b/tests/debugger/existential_type_classes.exp2 @@ -14,12 +14,12 @@ mdb> continue -a mdb> P X (arg 1) 42 mdb> - E3: C3 CALL (from existential_type_classes.m:NNNN) + E3: C3 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 42 mdb> - E4: C4 CALL existential_type_classes.m:NNNN + E4: C4 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 42 @@ -32,9 +32,9 @@ mdb> continue -a func int.*/2-0 (det) E8: C5 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E9: C4 EXIT existential_type_classes.m:NNNN + E9: C4 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E10: C3 EXIT (from existential_type_classes.m:NNNN) + E10: C3 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E11: C2 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -47,12 +47,12 @@ mdb> continue -a mdb> P X (arg 1) "blah" mdb> - E13: C8 CALL (from existential_type_classes.m:NNNN) + E13: C8 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 "blah" mdb> - E14: C9 CALL existential_type_classes.m:NNNN + E14: C9 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 "blah" @@ -65,9 +65,9 @@ mdb> continue -a pred string.length/2-0 (det) E18: C10 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.string_foo/2-0 (det) - E19: C9 EXIT existential_type_classes.m:NNNN + E19: C9 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det) - E20: C8 EXIT (from existential_type_classes.m:NNNN) + E20: C8 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E21: C7 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -84,12 +84,12 @@ mdb> continue -a mdb> P X (arg 1) 43 mdb> - E25: C14 CALL (from existential_type_classes.m:NNNN) + E25: C14 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 43 mdb> - E26: C15 CALL existential_type_classes.m:NNNN + E26: C15 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 43 @@ -102,9 +102,9 @@ mdb> continue -a func int.*/2-0 (det) E30: C16 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E31: C15 EXIT existential_type_classes.m:NNNN + E31: C15 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E32: C14 EXIT (from existential_type_classes.m:NNNN) + E32: C14 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E33: C13 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -125,12 +125,12 @@ mdb> continue -a mdb> P X (arg 1) 43 mdb> - E39: C21 CALL (from existential_type_classes.m:NNNN) + E39: C21 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 43 mdb> - E40: C22 CALL existential_type_classes.m:NNNN + E40: C22 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 43 @@ -143,9 +143,9 @@ mdb> continue -a func int.*/2-0 (det) E44: C23 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E45: C22 EXIT existential_type_classes.m:NNNN + E45: C22 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E46: C21 EXIT (from existential_type_classes.m:NNNN) + E46: C21 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E47: C20 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) @@ -166,12 +166,12 @@ mdb> continue -a mdb> P X (arg 1) 45 mdb> - E53: C28 CALL (from existential_type_classes.m:NNNN) + E53: C28 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) mdb> P HeadVar__1 45 mdb> - E54: C29 CALL existential_type_classes.m:NNNN + E54: C29 CALL existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) mdb> P HeadVar__1 45 @@ -184,9 +184,9 @@ mdb> continue -a func int.*/2-0 (det) E58: C30 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.int_foo/2-0 (det) - E59: C29 EXIT existential_type_classes.m:NNNN + E59: C29 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det) - E60: C28 EXIT (from existential_type_classes.m:NNNN) + E60: C28 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.foo/2-0 (det) E61: C27 EXIT existential_type_classes.m:NNNN (from existential_type_classes.m:NNNN) pred existential_type_classes.do_foo/2-0 (det) diff --git a/tests/debugger/multi_parameter.exp b/tests/debugger/multi_parameter.exp index 2561a8944..9cdbe5ceb 100644 --- a/tests/debugger/multi_parameter.exp +++ b/tests/debugger/multi_parameter.exp @@ -10,23 +10,23 @@ mdb> print * X (arg 1) 'z' mdb> 3: 3 3 CALL pred multi_parameter.a/2-0 (det) - (from multi_parameter.m:35) + multi_parameter.m:18 (from multi_parameter.m:35) mdb> print * HeadVar__1 'z' mdb> 4: 4 4 CALL pred multi_parameter.ClassMethod_for_multi_parameter__m____character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) - multi_parameter.m:23 + multi_parameter.m:23 (from multi_parameter.m:18) mdb> print * HeadVar__1 'z' mdb> 5: 4 4 EXIT pred multi_parameter.ClassMethod_for_multi_parameter__m____character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) - multi_parameter.m:23 + multi_parameter.m:23 (from multi_parameter.m:18) mdb> print * HeadVar__1 'z' HeadVar__2 122 mdb> 6: 3 3 EXIT pred multi_parameter.a/2-0 (det) - (from multi_parameter.m:35) + multi_parameter.m:18 (from multi_parameter.m:35) mdb> print * HeadVar__1 'z' HeadVar__2 122 diff --git a/tests/debugger/multi_parameter.exp2 b/tests/debugger/multi_parameter.exp2 index 6798302df..a87d41e6a 100644 --- a/tests/debugger/multi_parameter.exp2 +++ b/tests/debugger/multi_parameter.exp2 @@ -10,12 +10,12 @@ mdb> print * X (arg 1) 'z' mdb> 3: 3 3 CALL pred multi_parameter.a/2-0 (det) - (from multi_parameter.m:35) + multi_parameter.m:18 (from multi_parameter.m:35) mdb> print * HeadVar__1 'z' mdb> 4: 4 4 CALL pred multi_parameter.ClassMethod_for_multi_parameter__m____character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) - multi_parameter.m:23 + multi_parameter.m:23 (from multi_parameter.m:18) mdb> print * HeadVar__1 'z' mdb> @@ -31,13 +31,13 @@ mdb> print * Int (arg 2) 122 mdb> 7: 4 4 EXIT pred multi_parameter.ClassMethod_for_multi_parameter__m____character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) - multi_parameter.m:23 + multi_parameter.m:23 (from multi_parameter.m:18) mdb> print * HeadVar__1 'z' HeadVar__2 122 mdb> 8: 3 3 EXIT pred multi_parameter.a/2-0 (det) - (from multi_parameter.m:35) + multi_parameter.m:18 (from multi_parameter.m:35) mdb> print * HeadVar__1 'z' HeadVar__2 122