* src/conflicts.c: Move global variables rrc_total and src_total ...

(print_conflicts): here.
* src/output.c (output): Free global variable user_toknums.
* src/lex.c (token_obstack): Become static.

src/conflicts.c

@@ -35,8 +35,6 @@ static char *conflicts = NULL;
 
 static unsigned *shiftset = NULL;
 static unsigned *lookaheadset = NULL;
-static int src_total;
-static int rrc_total;
 static int src_count;
 static int rrc_count;
 
@@ -460,6 +458,8 @@ void
 print_conflicts (FILE *out)
 {
   int i;
+  int src_total;
+  int rrc_total;
 
   src_total = 0;
   rrc_total = 0;

src/lex.c

@@ -30,7 +30,7 @@
 #include "quote.h"
 
 /* Buffer for storing the current token.  */
-struct obstack token_obstack;
+static struct obstack token_obstack;
 const char *token_buffer = NULL;
 
 bucket *symval;

src/output.c

@@ -1108,6 +1108,7 @@ output (void)
   if (semantic_parser)
     output_stos ();
   output_rule_data ();
+  XFREE (user_toknums);
   output_actions ();
 
 #if 0