X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5719c1092fec376fe02ecbd7f82bf2263e513959..78bcec17c82fe777c90f86717773de35bb5018e7:/tests/actions.at?ds=sidebyside

diff --git a/tests/actions.at b/tests/actions.at
index 8da9d3ea..e6e23866 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -72,9 +72,9 @@ main (void)
 }
 ]])
 
-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,
+AT_CHECK([bison -d -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,
 [[0123456789
 ]])
 
@@ -103,18 +103,18 @@ AT_DATA([[input.y]],
   int val;
 };
 
-%type <val> a_1 a_2 a_4 a_5
+%type <val> a_1 a_2 a_5
             sum_of_the_five_previous_values
 
 %%
-exp: a_1 a_2 { $<val>$ = 3; } a_4 a_5 sum_of_the_five_previous_values
+exp: a_1 a_2 { $<val>$ = 3; } { $<val>$ = $<val>3 + 1; } a_5
+     sum_of_the_five_previous_values
     {
        printf ("%d\n", $6);
     }
 ;
 a_1: { $$ = 1; };
 a_2: { $$ = 2; };
-a_4: { $$ = 4; };
 a_5: { $$ = 5; };
 
 sum_of_the_five_previous_values:
@@ -143,9 +143,9 @@ main (void)
 }
 ]])
 
-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,
+AT_CHECK([bison -d -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,
 [[15
 ]])
 
@@ -153,11 +153,11 @@ AT_CLEANUP
 
 
 
-## ------------- ##
-## Destructors.  ##
-## ------------- ##
+## -------------------------- ##
+## Printers and Destructors.  ##
+## -------------------------- ##
 
-AT_SETUP([Destructors])
+AT_SETUP([Printers and Destructors])
 
 # Make sure complex $n work.
 
@@ -169,7 +169,6 @@ AT_DATA([[input.y]],
 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1
-#define YYPRINT yyprint
 %}
 %verbose
 %union
@@ -177,15 +176,23 @@ AT_DATA([[input.y]],
   int ival;
 }
 %type <ival> 'x' thing line input
-%destructor { printf ("Freeing input %d\n", $$); } input
-%destructor { printf ("Freeing line %d\n", $$); } line
-%destructor { printf ("Freeing thing %d\n", $$); } thing
-%destructor { printf ("Freeing 'x' %d\n", $$); } 'x'
+
+%printer { fprintf (yyout, "%d from %d", $$, @$.first_line); }
+   input line thing 'x'
+
+%destructor
+  {
+    fprintf (stdout, "Freeing ");
+    /* FIXME: Ouch: INTERNAL DETAILS EXPOSED HERE. */
+    /* Cannot use $$ which is the union member, not the union itself. */
+    yysymprint (stdout, yytype, yyvalue, @$);
+    fprintf (stdout, "\n");
+  }
+  input line thing 'x'
 
 %{
 static int yylex (void);
 static void yyerror (const char *msg);
-static void yyprint (FILE *out, int num, YYSTYPE val);
 %}
 
 
@@ -244,19 +251,22 @@ yylex (void)
          can be reduced.  */
       'x', 'x', 'x', 'x', 'x', 'x', ';',
 
-      /* Load the stack and provoke an error that cannot be caught be
-         the grammar, and check that the stack is cleared. */
+      /* Load the stack and provoke an error that cannot be caught by
+         the grammar, to check that the stack is cleared. */
       'x', 'x', ';',
       'x', ';',
       'y'
     };
-  static int counter = 0;
+  static unsigned int counter = 0;
 
   if (counter < (sizeof(input) / sizeof (input[0])))
     {
        yylval.ival = counter;
-       printf ("sending: '%c'(%d)\n", input[counter], counter);
-       return input[counter++];
+       /* As in BASIC, line numbers go from 10 to 10.  */
+       yylloc.first_line = 10 * counter;
+       printf ("sending: '%c' (value = %d, line %d)\n",
+               input[counter], yylval.ival, yylloc.first_line);
+       return (int) input[counter++];
     }
   else
     {
@@ -268,13 +278,7 @@ yylex (void)
 static void
 yyerror (const char *msg)
 {
-  fprintf (stdout, "%s\n", msg);
-}
-
-static void
-yyprint (FILE *out, int num, YYSTYPE val)
-{
-  fprintf (out, " = %d", val.ival);
+  fprintf (stdout, "%d: %s\n", yylloc.first_line, msg);
 }
 
 int
@@ -291,43 +295,43 @@ main (void)
 }
 ]])
 
-AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 1,
-[[sending: 'x'(0)
+AT_CHECK([bison --location -d -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 1,
+[[sending: 'x' (value = 0, line 0)
 thing(0): 'x'(0)
-sending: 'x'(1)
+sending: 'x' (value = 1, line 10)
 thing(1): 'x'(1)
-sending: 'x'(2)
+sending: 'x' (value = 2, line 20)
 thing(2): 'x'(2)
-sending: 'x'(3)
-parse error, unexpected 'x', expecting ';'
-Freeing thing 2
-Freeing thing 1
-Freeing thing 0
-Freeing 'x' 3
-sending: 'x'(4)
-Freeing 'x' 4
-sending: 'x'(5)
-Freeing 'x' 5
-sending: ';'(6)
+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'(7)
+sending: 'x' (value = 7, line 70)
 thing(7): 'x'(7)
-sending: 'x'(8)
+sending: 'x' (value = 8, line 80)
 thing(8): 'x'(8)
-sending: ';'(9)
+sending: ';' (value = 9, line 90)
 line(7): thing(7) thing(8) ';'
-sending: 'x'(10)
+sending: 'x' (value = 10, line 100)
 thing(10): 'x'(10)
-sending: ';'(11)
+sending: ';' (value = 11, line 110)
 line(10): thing(10) ';'
-sending: 'y'(12)
-parse error, unexpected $undefined., expecting $ or error or 'x'
+sending: 'y' (value = 12, line 120)
+120: parse error, unexpected $undefined, expecting $end or 'x'
 sending: EOF
-Freeing line 10
-Freeing line 7
-Freeing line -1
+Freeing nterm line (10 from 100)
+Freeing nterm line (7 from 70)
+Freeing nterm line (-1 from 50)
 Parsing FAILED.
 ]])