lalr1.cc: rename lex_symbol as api.token.constructor

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index d80b718d67db377971ee091a5f3a8cbe15719635..7fea30647535041f69cb24f682bc14f2d0fb6462 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -127,13 +127,25 @@ xfclose (FILE *ptr)
     return;
 
   if (ferror (ptr))
     return;
 
   if (ferror (ptr))

-    error (EXIT_FAILURE, 0, _("I/O error"));
+    error (EXIT_FAILURE, 0, _("input/output error"));

 
   if (fclose (ptr) != 0)
     error (EXIT_FAILURE, get_errno (), _("cannot close file"));
 }
 \f
 
 
   if (fclose (ptr) != 0)
     error (EXIT_FAILURE, get_errno (), _("cannot close file"));
 }
 \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. |
 `------------------------------------------------------------------*/


@@ -142,7 +154,7 @@ xfclose (FILE *ptr)
 static void
 compute_exts_from_gf (const char *ext)
 {
 static void
 compute_exts_from_gf (const char *ext)
 {

-  if (strcmp (ext, ".y") == 0)
+  if (STREQ (ext, ".y"))

     {
       src_extension = xstrdup (language->src_extension);
       header_extension = xstrdup (language->header_extension);
     {
       src_extension = xstrdup (language->src_extension);
       header_extension = xstrdup (language->header_extension);


@@ -207,7 +219,7 @@ 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;
 
   /* If there is an extension, check if there is a `.tab' part right
   *tab = NULL;
 
   /* If there is an extension, check if there is a `.tab' part right


@@ -215,10 +227,9 @@ file_name_split (const char *file_name,
   if (*ext)
     {
       size_t baselen = *ext - *base;
   if (*ext)
     {
       size_t baselen = *ext - *base;

-      size_t dottablen = 4;
+      size_t dottablen = sizeof (TAB_EXT) - 1;

       if (dottablen < baselen
       if (dottablen < baselen

-          && (strncmp (*ext - dottablen, ".tab", dottablen) == 0
-              || strncmp (*ext - dottablen, "_tab", dottablen) == 0))
+          && STRPREFIX_LIT (TAB_EXT, *ext - dottablen))

         *tab = *ext - dottablen;
     }
 }
         *tab = *ext - dottablen;
     }
 }


@@ -347,9 +358,9 @@ void
 output_file_name_check (char **file_name)
 {
   bool conflict = false;
 output_file_name_check (char **file_name)
 {
   bool conflict = false;

-  if (0 == strcmp (*file_name, grammar_file))
+  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;
     }


@@ -357,10 +368,10 @@ output_file_name_check (char **file_name)
     {
       int i;
       for (i = 0; i < file_names_count; i++)
     {
       int i;
       for (i = 0; i < file_names_count; i++)

-        if (0 == strcmp (file_names[i], *file_name))
+        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;
           }
     }