style: use %code for local function declarations in our parser

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 550e42ed49411c89250a4a766340c54afa643a05..76aa7fe3dfbe0a42de961cc179d2115f5a1e7177 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-2013 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


@@ -58,20 +58,20 @@ uniqstr grammar_file = NULL;
 uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,
 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 +79,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
 /*-----------------------------------------------------------------.


@@ -134,6 +134,18 @@ xfclose (FILE *ptr)
 }
 \f
 
 }
 \f
 

+FILE *
+xfdopen (int fd, char const *mode)
+{
+  FILE *res = fdopen (fd, mode);
+  if (! res)
+    error (EXIT_FAILURE, get_errno (),
+           /* On a separate line to please the "unmarked_diagnostics"
+              syntax-check. */
+           "fdopen");
+  return res;
+}
+

 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/
 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/


@@ -179,7 +191,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.


@@ -207,10 +219,10 @@ file_name_split (const char *file_name,
   *base = last_component (file_name);
 
   /* Look for the extension, i.e., look for the last dot. */
   *base = last_component (file_name);
 
   /* Look for the extension, i.e., look for the last dot. */

-  *ext = mbsrchr (*base, '.');
+  *ext = strrchr (*base, '.');

   *tab = NULL;
 
   *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)
     {


@@ -258,7 +270,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);


@@ -266,14 +278,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)));


@@ -348,7 +360,7 @@ output_file_name_check (char **file_name)
   bool conflict = false;
   if (STREQ (*file_name, grammar_file))
     {
   bool conflict = false;
   if (STREQ (*file_name, grammar_file))
     {

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

                 quote (*file_name));
       conflict = true;
     }
                 quote (*file_name));
       conflict = true;
     }


@@ -358,8 +370,8 @@ output_file_name_check (char **file_name)
       for (i = 0; i < file_names_count; i++)
         if (STREQ (file_names[i], *file_name))
           {
       for (i = 0; i < file_names_count; i++)
         if (STREQ (file_names[i], *file_name))
           {

-            warn (_("conflicting outputs to file %s"),
-                  quote (*file_name));
+            complain (NULL, Wother, _("conflicting outputs to file %s"),
+                      quote (*file_name));

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