* src/files.h, src/files.c (open_files, close_files): Remove.

* src/main.c (main): Don't open/close files, nor invoke lex_free,
let...
* src/reader.c (reader): Do it.

diff --git a/ChangeLog b/ChangeLog
index 47dc83f35085c5ac75f2e8b45813d2bda6b65d93..98b415f7d649fb005889e811a35b5b3cf1742ffd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-17  Akim Demaille  <akim@epita.fr>
+
+       * src/files.h, src/files.c (open_files, close_files): Remove.
+       * src/main.c (main): Don't open/close files, nor invoke lex_free,
+       let...
+       * src/reader.c (reader): Do it.
+
+       

 2001-12-17  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (print_reductions): Formatting changes.
 2001-12-17  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (print_reductions): Formatting changes.

diff --git a/src/files.c b/src/files.c
index b6fed391a0fbad072087b0f3186a5f02b6eeab48..b3064b5a473d172cbafb872cdbf2e34f73be7fa2 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -437,34 +437,6 @@ compute_output_file_names (void)
 #endif /* MSDOS */
 }
 
 #endif /* MSDOS */
 }
 

-/*-----------------------------------------------------------------.
-| Open the input file.  Look for the skeletons.  Find the names of |
-| the output files.  Prepare the obstacks.                         |
-`-----------------------------------------------------------------*/
-
-void
-open_files (void)
-{
-  finput = xfopen (infile, "r");
-
-  /* Initialize the obstacks. */
-  obstack_init (&action_obstack);
-  obstack_init (&attrs_obstack);
-  obstack_init (&guard_obstack);
-  obstack_init (&output_obstack);
-}
-
-
-
-/*-----------------------.
-| Close the open file..  |
-`-----------------------*/
-
-void
-close_files (void)
-{
-  xfclose (finput);
-}

 
 /*---------------------------.
 | Produce the output files.  |
 
 /*---------------------------.
 | Produce the output files.  |

diff --git a/src/files.h b/src/files.h
index c027088748d868fa5ee623ec77a9719efe7c869a..573ea3ce54cc812dafcf2b36c776b59b56144f3e 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -61,9 +61,6 @@ extern struct obstack output_obstack;
 extern char *infile;
 extern char *attrsfile;
 
 extern char *infile;
 extern char *attrsfile;
 

-void open_files PARAMS((void));
-void close_files PARAMS((void));
-

 void compute_output_file_names PARAMS((void));
 void output_files PARAMS((void));
 
 void compute_output_file_names PARAMS((void));
 void output_files PARAMS((void));
 

diff --git a/src/main.c b/src/main.c
index f53228e65148f08752e476a8dfd4004134bb66a0..6deec48a1f2d4d1d62c570e4bce37b5d7a6cd6ef 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -53,7 +53,6 @@ main (int argc, char *argv[])
   getargs (argc, argv);
 
   muscle_init ();
   getargs (argc, argv);
 
   muscle_init ();

-  open_files ();

 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in


@@ -103,14 +102,9 @@ main (int argc, char *argv[])
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

-  /* Close the input files. */
-  close_files ();
-

   /* Free the symbol table data structure.  */
   free_symtab ();
 
   /* Free the symbol table data structure.  */
   free_symtab ();
 

-  lex_free ();
-

   reduce_free ();
   free_conflicts ();
   free_nullable ();
   reduce_free ();
   free_conflicts ();
   free_nullable ();

diff --git a/src/reader.c b/src/reader.c
index f1577b486b25d0c712dbbf838883c8829b351dfe..4fa1aaea9cd3063cc942fcfaa8022247927904da 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1865,6 +1865,14 @@ reader (void)
   undeftoken->class = token_sym;
   undeftoken->user_token_number = 2;
 
   undeftoken->class = token_sym;
   undeftoken->user_token_number = 2;
 

+  /* Initialize the obstacks. */
+  obstack_init (&action_obstack);
+  obstack_init (&attrs_obstack);
+  obstack_init (&guard_obstack);
+  obstack_init (&output_obstack);
+
+  finput = xfopen (infile, "r");
+

   /* Read the declaration section.  Copy %{ ... %} groups to
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */
   /* Read the declaration section.  Copy %{ ... %} groups to
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */


@@ -1875,6 +1883,9 @@ reader (void)
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();
 
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();
 

+  lex_free ();
+  xfclose (finput);
+

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