* tests/regression.at, tests/torture.at, tests/calc.at: Adjust to

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 053cab5b44ced8a75ae5c7d6b8f3bcbcb37347d3..2daac6c31244a762bb83820003b908a37ef8b61c 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,7 @@
 /* Output the generated parsing program for bison,
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -103,9 +105,6 @@
 #include "reader.h"
 #include "conflicts.h"
 
-extern void berror PARAMS((const char *));
-
-
 
 static int nvectors;
 static int nentries;
@@ -132,7 +131,7 @@ output_short_or_char_table (struct obstack *oout,
                            const char *table_name,
                            short *short_table,
                            short first_value,
-                           short begin, short end)
+                           int begin, int end)
 {
   int i, j;
 
@@ -170,7 +169,7 @@ output_short_table (struct obstack *oout,
                    const char *table_name,
                    short *short_table,
                    short first_value,
-                   short begin, short end)
+                   int begin, int end)
 {
   output_short_or_char_table (oout, comment, "short", table_name, short_table,
                              first_value, begin, end);
@@ -317,7 +316,7 @@ output_gram (void)
      yyprhs and yyrhs are needed only for yydebug. */
   /* With the no_parser option, all tables are generated */
   if (!semantic_parser && !no_parser_flag)
-    obstack_sgrow (&table_obstack, "\n#if YYDEBUG != 0\n");
+    obstack_sgrow (&table_obstack, "\n#if YYDEBUG\n");
 
   {
     int i;
@@ -373,7 +372,7 @@ output_rule_data (void)
   short *short_tab = NULL;
 
   obstack_sgrow (&table_obstack, "\n\
-#if YYDEBUG != 0\n");
+#if YYDEBUG\n");
 
   {
     short *values = XCALLOC (short, nrules + 1);
@@ -401,7 +400,7 @@ output_rule_data (void)
   /* Output the table of symbol names.  */
   if (!token_table_flag && !no_parser_flag)
     obstack_sgrow (&table_obstack,
-                        "\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
+                        "\n#if (YYDEBUG) || defined YYERROR_VERBOSE\n\n");
   obstack_sgrow (&table_obstack, "\
 /* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
   obstack_sgrow (&table_obstack,
@@ -544,7 +543,7 @@ action_row (int state)
 
   default_rule = 0;
   nreds = 0;
-  redp = state_table[state].reduction_table;
+  redp = state_table[state].reductions;
 
   if (redp)
     {
@@ -571,7 +570,7 @@ action_row (int state)
   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
      to reduce.  */
-  shiftp = state_table[state].shift_table;
+  shiftp = state_table[state].shifts;
   for (i = 0; i < shiftp->nshifts; i++)
     {
       shift_state = shiftp->shifts[i];
@@ -593,7 +592,7 @@ action_row (int state)
 
   /* See which tokens are an explicit error in this state (due to
      %nonassoc).  For them, record MINSHORT as the action.  */
-  errp = err_table[state];
+  errp = state_table[state].errs;
 
   if (errp)
     {
@@ -979,9 +978,9 @@ pack_vector (int vector)
          return j;
        }
     }
-
-  berror ("pack_vector");
-  return 0;                    /* JF keep lint happy */
+#define pack_vector_succeeded 0
+  assert (pack_vector_succeeded);
+  return 0;
 }
 
 
@@ -1269,20 +1268,16 @@ output (void)
       obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
     }
   reader_output_yylsp (&table_obstack);
-  if (debug_flag)
-    obstack_sgrow (&table_obstack, "\
+  obstack_fgrow1 (&table_obstack, "\
 #ifndef YYDEBUG\n\
-# define YYDEBUG 1\n\
+# define YYDEBUG %d\n\
 #endif\n\
-\n");
+\n", debug_flag);
 
   if (semantic_parser)
     obstack_fgrow1 (&table_obstack, "#include %s\n",
                    quotearg_style (c_quoting_style, attrsfile));
 
-  if (!no_parser_flag)
-    obstack_sgrow (&table_obstack, "#include <stdio.h>\n\n");
-
   LIST_FREE (core, first_state);
   output_defines ();
   output_token_translations ();