* src/files.c (output_files): Free the output_obstack.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index b919c6a3263fee34725e95b77a3d4a028804dbb7..841ebe4f3780ec728f52920f437e27ad88a93f45 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -91,7 +91,6 @@
 */
 
 #include "system.h"
-#include "obstack.h"
 #include "quotearg.h"
 #include "getargs.h"
 #include "files.h"
@@ -126,6 +125,23 @@ struct obstack output_obstack;
 
 int error_verbose = 0;
 
+/* Returns the number of lines of S.  */
+static size_t
+get_lines_number (const char *s)
+{
+  size_t lines = 0;
+  
+  size_t i;
+  for (i = 0; s[i]; ++i)
+    {
+      if (s[i] == '\n')
+       ++lines;
+    }   
+  
+  return lines;
+}
+
+
 /* FIXME. */
 
 static inline void
@@ -198,6 +214,11 @@ output_gram (void)
 
     XFREE (yyrhs);
   }
+  
+#if 0
+  if (!semantic_parser)
+    obstack_sgrow (&table_obstack, "\n#endif\n");
+#endif
 }
 
 
@@ -515,7 +536,7 @@ token_actions (void)
 `-----------------------------*/
 
 static void
-actions_output (FILE *out)
+actions_output (FILE *out, size_t *line)
 {
   int rule;
   for (rule = 1; rule < nrules + 1; ++rule)
@@ -534,6 +555,14 @@ actions_output (FILE *out)
        fprintf (out, "{ %s%s }\n    break;\n\n",
                 rule_table[rule].action,
                 yacc_flag ? ";" : "");
+
+       /* We always output 4 '\n' per action.  */
+       *line += 4;
+       /* Plus one if !no_lines_flag.  */
+       if (!no_lines_flag)
+         ++*line;
+       /* Get the number of lines written by the user.  */
+       *line += get_lines_number (rule_table[rule].action);
       }
 }
 
@@ -958,11 +987,14 @@ output_parser (const char *skel_filename, FILE *out)
          muscle_key = obstack_finish (&muscle_obstack);
          muscle_value = muscle_find (muscle_key);
          if (!strcmp (muscle_key, "actions"))
-           actions_output (out);
+           actions_output (out, &line);
          else if (!strcmp (muscle_key, "line"))
-           fprintf (out, "%d", line + 1);
+           fprintf (out, "%d", line);
          else if (muscle_value)
-           fputs (muscle_value, out);
+           {
+             fputs (muscle_value, out);
+             line += get_lines_number (muscle_value);
+           }     
          else
            {
              fputs ("%%", out);
@@ -993,6 +1025,7 @@ output_master_parser (void)
        skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
     }
   muscle_insert ("skeleton", skeleton);
+  muscle_insert ("parser-file-name", parser_file_name);
 
   output_parser (skeleton, parser);
   xfclose (parser);
@@ -1044,6 +1077,48 @@ prepare (void)
   MUSCLE_INSERT_INT ("locations-flag", locations_flag);
 }
 
+
+/*-------------------------.
+| Output the header file.  |
+`-------------------------*/
+
+static void
+header_output (void)
+{
+  FILE *out = xfopen (spec_defines_file, "w");
+  char *macro_name = compute_header_macro ();
+
+  fprintf (out, "#ifndef %s\n", macro_name);
+  fprintf (out, "# define %s\n\n", macro_name);
+
+  fputs (muscle_find ("tokendef"), out);
+  fprintf (out, "\
+#ifndef YYSTYPE\n\
+typedef %s
+yystype;\n\
+# define YYSTYPE yystype\n\
+#endif\n",
+                   muscle_find ("stype"));
+
+  if (!pure_parser)
+    fprintf (out, "\nextern YYSTYPE %slval;\n",
+            spec_name_prefix);
+  if (semantic_parser)
+    {
+      int i;
+
+      for (i = ntokens; i < nsyms; i++)
+       /* don't make these for dummy nonterminals made by gensym.  */
+       if (*tags[i] != '@')
+         fprintf (out, "# define\tNT%s\t%d\n", tags[i], i);
+    }
+
+  fprintf (out, "\n#endif /* not %s */\n", macro_name);
+  free (macro_name);
+  xfclose (out);
+}
+
+
 /*----------------------------------------------------------.
 | Output the parsing tables and the parser code to ftable.  |
 `----------------------------------------------------------*/
@@ -1068,7 +1143,11 @@ output (void)
   obstack_1grow (&attrs_obstack, 0);
   muscle_insert ("prologue", obstack_finish (&attrs_obstack));
 
+  /* Output the parser. */
   output_master_parser ();
+  /* Output the header if needed. */
+  if (defines_flag)
+    header_output ();
 
   free (rule_table + 1);
   obstack_free (&muscle_obstack, 0);