-AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
-[[thing: 'x' (0)
-thing: 'x' (1)
-thing: 'x' (2)
-parse error, unexpected 'x', expecting ';'
-Freeing thing 2
-Freeing thing 1
-Freeing thing 0
-Freeing 'x' 3
-Freeing 'x' 4
-Freeing 'x' 5
-input: error ';'
-thing: 'x' (7)
-thing: 'x' (8)
-input: thing(7) thing(8) ';'
-thing: 'x' (10)
-input: thing(10) ';'
-thing: 'x' (12)
-parse error, unexpected $undefined., expecting 'x' or ';'
-Freeing thing 12
-input: error ';'
-Successful parse.
+AT_CHECK([bison input.y --location -d -v -o input.c])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 1,
+[[sending: 'x' (value = 0, line 0)
+thing(0): 'x'(0)
+sending: 'x' (value = 1, line 10)
+thing(1): 'x'(1)
+sending: 'x' (value = 2, line 20)
+thing(2): 'x'(2)
+sending: 'x' (value = 3, line 30)
+30: parse error, unexpected 'x', expecting ';'
+Freeing nterm thing (2 from 20)
+Freeing nterm thing (1 from 10)
+Freeing nterm thing (0 from 0)
+Freeing token 'x' (3 from 30)
+sending: 'x' (value = 4, line 40)
+Freeing token 'x' (4 from 40)
+sending: 'x' (value = 5, line 50)
+Freeing token 'x' (5 from 50)
+sending: ';' (value = 6, line 60)
+line(-1): error ';'
+sending: 'x' (value = 7, line 70)
+thing(7): 'x'(7)
+sending: 'x' (value = 8, line 80)
+thing(8): 'x'(8)
+sending: ';' (value = 9, line 90)
+line(7): thing(7) thing(8) ';'
+sending: 'x' (value = 10, line 100)
+thing(10): 'x'(10)
+sending: ';' (value = 11, line 110)
+line(10): thing(10) ';'
+sending: 'y' (value = 12, line 120)
+120: parse error, unexpected $undefined, expecting $end or 'x'
+sending: EOF
+Freeing nterm line (10 from 100)
+Freeing nterm line (7 from 70)
+Freeing nterm line (-1 from 50)
+Parsing FAILED.