doc: liby's main arms the internationalization

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index ae9fc7f14cef2bc947ddf80564ad0597ac3e724f..3c913b6bfc6ff298c216fe7804b9a3f4fa62d71f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,6 +1,6 @@
 /* Open and close files for Bison.
 
 /* Open and close files for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software

    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -34,7 +34,7 @@
 #include "getargs.h"
 #include "gram.h"
 
 #include "getargs.h"
 #include "gram.h"
 

-/* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
+/* Initializing some values below (such SPEC_NAME_PREFIX to 'yy') is

    tempting, but don't do that: for the time being our handling of the
    %directive vs --option leaves precedence to the options by deciding
    that if a %directive sets a variable which is really set (i.e., not
    tempting, but don't do that: for the time being our handling of the
    %directive vs --option leaves precedence to the options by deciding
    that if a %directive sets a variable which is really set (i.e., not


@@ -51,27 +51,36 @@ char *spec_defines_file = NULL;  /* for --defines. */
 char *parser_file_name;
 
 /* All computed output file names.  */
 char *parser_file_name;
 
 /* All computed output file names.  */

-static char **file_names = NULL;
-static int file_names_count = 0;
+typedef struct generated_file
+{
+  /** File name.  */
+  char *name;
+  /** Whether is a generated source file (e.g., *.c, *.java...), as
+      opposed to the report file (e.g., *.output).  When late errors
+      are detected, generated source files are removed.  */
+  bool is_source;
+} generated_file;
+static generated_file *generated_files = NULL;
+static int generated_files_size = 0;

 
 uniqstr grammar_file = NULL;
 uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,
 
 uniqstr grammar_file = NULL;
 uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,

-   DIR_PREFIX is `dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are `dir/foo'.
+   DIR_PREFIX is 'dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'dir/foo'.

 
 

-   If --output=dir/foo.tab.c was specified, DIR_PREFIX is `dir/',
-   ALL_BUT_EXT is `dir/foo.tab', and ALL_BUT_TAB_EXT is `dir/foo'.
+   If --output=dir/foo.tab.c was specified, DIR_PREFIX is 'dir/',
+   ALL_BUT_EXT is 'dir/foo.tab', and ALL_BUT_TAB_EXT is 'dir/foo'.

 
    If --output was not specified but --file-prefix=dir/foo was specified,
 
    If --output was not specified but --file-prefix=dir/foo was specified,

-   ALL_BUT_EXT = `foo.tab' and ALL_BUT_TAB_EXT = `foo'.
+   ALL_BUT_EXT = 'foo.tab' and ALL_BUT_TAB_EXT = 'foo'.

 
    If neither --output nor --file was specified but the input grammar
 
    If neither --output nor --file was specified but the input grammar

-   is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are `foo'.
+   is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'foo'.

 
    If neither --output nor --file was specified, DIR_PREFIX is the
    empty string (meaning the current directory); otherwise it is
 
    If neither --output nor --file was specified, DIR_PREFIX is the
    empty string (meaning the current directory); otherwise it is

-   `dir/'.  */
+   'dir/'.  */

 
 char *all_but_ext;
 static char *all_but_tab_ext;
 
 char *all_but_ext;
 static char *all_but_tab_ext;


@@ -79,7 +88,7 @@ char *dir_prefix;
 
 /* C source file extension (the parser source).  */
 static char *src_extension = NULL;
 
 /* C source file extension (the parser source).  */
 static char *src_extension = NULL;

-/* Header file extension (if option ``-d'' is specified).  */
+/* Header file extension (if option '`-d'' is specified).  */

 static char *header_extension = NULL;
 \f
 /*-----------------------------------------------------------------.
 static char *header_extension = NULL;
 \f
 /*-----------------------------------------------------------------.


@@ -140,8 +149,8 @@ xfdopen (int fd, char const *mode)
   FILE *res = fdopen (fd, mode);
   if (! res)
     error (EXIT_FAILURE, get_errno (),
   FILE *res = fdopen (fd, mode);
   if (! res)
     error (EXIT_FAILURE, get_errno (),

-           // On a separate line to please the "unmarked_diagnostics"
-           // syntax-check.
+           /* On a separate line to please the "unmarked_diagnostics"
+              syntax-check. */

            "fdopen");
   return res;
 }
            "fdopen");
   return res;
 }


@@ -191,7 +200,7 @@ compute_exts_from_src (const char *ext)
    *EXT points to the last period in the basename, or NULL if none.
 
    If there is no *EXT, *TAB is NULL.  Otherwise, *TAB points to
    *EXT points to the last period in the basename, or NULL if none.
 
    If there is no *EXT, *TAB is NULL.  Otherwise, *TAB points to

-   `.tab' or `_tab' if present right before *EXT, or is NULL. *TAB
+   '.tab' or '_tab' if present right before *EXT, or is NULL. *TAB

    cannot be equal to *BASE.
 
    None are allocated, they are simply pointers to parts of FILE_NAME.
    cannot be equal to *BASE.
 
    None are allocated, they are simply pointers to parts of FILE_NAME.


@@ -222,7 +231,7 @@ file_name_split (const char *file_name,
   *ext = strrchr (*base, '.');
   *tab = NULL;
 
   *ext = strrchr (*base, '.');
   *tab = NULL;
 

-  /* If there is an extension, check if there is a `.tab' part right
+  /* If there is an extension, check if there is a '.tab' part right

      before.  */
   if (*ext)
     {
      before.  */
   if (*ext)
     {


@@ -270,7 +279,7 @@ compute_file_name_parts (void)
 
       if (spec_file_prefix)
         {
 
       if (spec_file_prefix)
         {

-          /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'.  */
+          /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = 'foo'.  */

           dir_prefix =
             xstrndup (spec_file_prefix,
                       last_component (spec_file_prefix) - spec_file_prefix);
           dir_prefix =
             xstrndup (spec_file_prefix,
                       last_component (spec_file_prefix) - spec_file_prefix);


@@ -278,14 +287,14 @@ compute_file_name_parts (void)
         }
       else if (yacc_flag)
         {
         }
       else if (yacc_flag)
         {

-          /* If --yacc, then the output is `y.tab.c'.  */
+          /* If --yacc, then the output is 'y.tab.c'.  */

           dir_prefix = xstrdup ("");
           all_but_tab_ext = xstrdup ("y");
         }
       else
         {
           /* Otherwise, ALL_BUT_TAB_EXT is computed from the input
           dir_prefix = xstrdup ("");
           all_but_tab_ext = xstrdup ("y");
         }
       else
         {
           /* Otherwise, ALL_BUT_TAB_EXT is computed from the input

-             grammar: `foo/bar.yy' => `bar'.  */
+             grammar: 'foo/bar.yy' => 'bar'.  */

           dir_prefix = xstrdup ("");
           all_but_tab_ext =
             xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));
           dir_prefix = xstrdup ("");
           all_but_tab_ext =
             xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));


@@ -332,21 +341,21 @@ compute_output_file_names (void)
     {
       if (! spec_graph_file)
         spec_graph_file = concat2 (all_but_tab_ext, ".dot");
     {
       if (! spec_graph_file)
         spec_graph_file = concat2 (all_but_tab_ext, ".dot");

-      output_file_name_check (&spec_graph_file);
+      output_file_name_check (&spec_graph_file, false);

     }
 
   if (xml_flag)
     {
       if (! spec_xml_file)
         spec_xml_file = concat2 (all_but_tab_ext, ".xml");
     }
 
   if (xml_flag)
     {
       if (! spec_xml_file)
         spec_xml_file = concat2 (all_but_tab_ext, ".xml");

-      output_file_name_check (&spec_xml_file);
+      output_file_name_check (&spec_xml_file, false);

     }
 
   if (report_flag)
     {
       if (!spec_verbose_file)
         spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
     }
 
   if (report_flag)
     {
       if (!spec_verbose_file)
         spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);

-      output_file_name_check (&spec_verbose_file);
+      output_file_name_check (&spec_verbose_file, false);

     }
 
   free (all_but_tab_ext);
     }
 
   free (all_but_tab_ext);


@@ -355,23 +364,23 @@ compute_output_file_names (void)
 }
 
 void
 }
 
 void

-output_file_name_check (char **file_name)
+output_file_name_check (char **file_name, bool source)

 {
   bool conflict = false;
   if (STREQ (*file_name, grammar_file))
     {
 {
   bool conflict = false;
   if (STREQ (*file_name, grammar_file))
     {

-      complain (complaint, _("refusing to overwrite the input file %s"),
+      complain (NULL, complaint, _("refusing to overwrite the input file %s"),

                 quote (*file_name));
       conflict = true;
     }
   else
     {
       int i;
                 quote (*file_name));
       conflict = true;
     }
   else
     {
       int i;

-      for (i = 0; i < file_names_count; i++)
-        if (STREQ (file_names[i], *file_name))
+      for (i = 0; i < generated_files_size; i++)
+        if (STREQ (generated_files[i].name, *file_name))

           {
           {

-            complain (Wother, _("conflicting outputs to file %s"),
-                      quote (*file_name));
+            complain (NULL, Wother, _("conflicting outputs to file %s"),
+                      quote (generated_files[i].name));

             conflict = true;
           }
     }
             conflict = true;
           }
     }


@@ -382,12 +391,23 @@ output_file_name_check (char **file_name)
     }
   else
     {
     }
   else
     {

-      file_names = xnrealloc (file_names, ++file_names_count,
-                              sizeof *file_names);
-      file_names[file_names_count-1] = xstrdup (*file_name);
+      generated_files = xnrealloc (generated_files, ++generated_files_size,
+                                   sizeof *generated_files);
+      generated_files[generated_files_size-1].name = xstrdup (*file_name);
+      generated_files[generated_files_size-1].is_source = source;

     }
 }
 
     }
 }
 

+void
+unlink_generated_sources (void)
+{
+  int i;
+  for (i = 0; i < generated_files_size; i++)
+    if (generated_files[i].is_source)
+      /* Ignore errors.  The file might not even exist.  */
+      unlink (generated_files[i].name);
+}
+

 void
 output_file_names_free (void)
 {
 void
 output_file_names_free (void)
 {


@@ -400,8 +420,8 @@ output_file_names_free (void)
   free (dir_prefix);
   {
     int i;
   free (dir_prefix);
   {
     int i;

-    for (i = 0; i < file_names_count; i++)
-      free (file_names[i]);
+    for (i = 0; i < generated_files_size; i++)
+      free (generated_files[i].name);

   }
   }

-  free (file_names);
+  free (generated_files);

 }
 }