(check_and_convert_grammar): New function.

(reader): Close the input file even if something went wrong during
parsing.  Minor file descriptor leak reported by twlevo.

diff --git a/src/reader.c b/src/reader.c
index 56f11fd0eeda3cb8d2c467a5c2eda7e6d7b8fd93..0fa162d9ce786c650fad8db949ea0bba2ea3298c 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -36,6 +36,8 @@
 #include "symlist.h"
 #include "symtab.h"
 
 #include "symlist.h"
 #include "symtab.h"
 

+static void check_and_convert_grammar (void);
+

 static symbol_list *grammar = NULL;
 static bool start_flag = false;
 merger_list *merge_functions;
 static symbol_list *grammar = NULL;
 static bool start_flag = false;
 merger_list *merge_functions;


@@ -515,12 +517,22 @@ reader (void)
   scanner_initialize ();
   gram_parse ();
 
   scanner_initialize ();
   gram_parse ();
 

-  /* If something went wrong during the parsing, don't try to
-     continue.  */
-  if (complaint_issued)
-    return;
+  if (! complaint_issued)
+    check_and_convert_grammar ();
+
+  xfclose (gram_in);
+}
+

 
 

-  /* Grammar has been read.  Do some checking */
+/*-------------------------------------------------------------.
+| Check the grammar that has just been read, and convert it to |
+| internal form.                                              |
+`-------------------------------------------------------------*/
+
+static void
+check_and_convert_grammar (void)
+{
+  /* Grammar has been read.  Do some checking.  */

   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 


@@ -537,7 +549,7 @@ reader (void)
       endtoken->user_token_number = 0;
     }
 
       endtoken->user_token_number = 0;
     }
 

-  /* Insert the initial rule, which line is that of the first rule
+  /* Insert the initial rule, whose line is that of the first rule

      (not that of the start symbol):
 
      accept: %start EOF.  */
      (not that of the start symbol):
 
      accept: %start EOF.  */


@@ -555,8 +567,6 @@ reader (void)
 
   assert (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars);
 
 
   assert (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars);
 

-  xfclose (gram_in);
-

   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
   symbols_pack ();
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
   symbols_pack ();