* 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 428dc1f6862b517762e3582964b77e2f341e1efd..2daac6c31244a762bb83820003b908a37ef8b61c 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -131,7 +131,7 @@ output_short_or_char_table (struct obstack *oout,
                            const char *table_name,
                            short *short_table,
                            short first_value,
                            const char *table_name,
                            short *short_table,
                            short first_value,

-                           short begin, short end)
+                           int begin, int end)

 {
   int i, j;
 
 {
   int i, j;
 


@@ -169,7 +169,7 @@ output_short_table (struct obstack *oout,
                    const char *table_name,
                    short *short_table,
                    short first_value,
                    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);
 {
   output_short_or_char_table (oout, comment, "short", table_name, short_table,
                              first_value, begin, end);


@@ -316,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)
      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;
 
   {
     int i;


@@ -372,7 +372,7 @@ output_rule_data (void)
   short *short_tab = NULL;
 
   obstack_sgrow (&table_obstack, "\n\
   short *short_tab = NULL;
 
   obstack_sgrow (&table_obstack, "\n\

-#if YYDEBUG != 0\n");
+#if YYDEBUG\n");

 
   {
     short *values = XCALLOC (short, nrules + 1);
 
   {
     short *values = XCALLOC (short, nrules + 1);


@@ -400,7 +400,7 @@ output_rule_data (void)
   /* Output the table of symbol names.  */
   if (!token_table_flag && !no_parser_flag)
     obstack_sgrow (&table_obstack,
   /* 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,
   obstack_sgrow (&table_obstack, "\
 /* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
   obstack_sgrow (&table_obstack,


@@ -978,8 +978,8 @@ pack_vector (int vector)
          return j;
        }
     }
          return j;
        }
     }

-
-  assert (!"pack_vector");
+#define pack_vector_succeeded 0
+  assert (pack_vector_succeeded);

   return 0;
 }
 
   return 0;
 }
 


@@ -1268,12 +1268,11 @@ output (void)
       obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
     }
   reader_output_yylsp (&table_obstack);
       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\
 #ifndef YYDEBUG\n\

-# define YYDEBUG 1\n\
+# define YYDEBUG %d\n\

 #endif\n\
 #endif\n\

-\n");
+\n", debug_flag);

 
   if (semantic_parser)
     obstack_fgrow1 (&table_obstack, "#include %s\n",
 
   if (semantic_parser)
     obstack_fgrow1 (&table_obstack, "#include %s\n",