Merge remote-tracking branch 'origin/maint'

[bison.git] / src / scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 8b3c59332cad96ab06d76012e17f13b1dc6c1390..284a12074c7a1b84909cf722c9418a90ed2ddd26 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* Scan Bison Skeletons.                                       -*- C -*-
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.

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


@@ -28,16 +27,16 @@
 #define skel_wrap() 1
 
 #define FLEX_PREFIX(Id) skel_ ## Id
 #define skel_wrap() 1
 
 #define FLEX_PREFIX(Id) skel_ ## Id

-#include "flex-scanner.h"
+#include <src/flex-scanner.h>

 
 #include <dirname.h>
 #include <error.h>
 #include <quotearg.h>
 
 
 #include <dirname.h>
 #include <error.h>
 #include <quotearg.h>
 

-#include "complain.h"
-#include "getargs.h"
-#include "files.h"
-#include "scan-skel.h"
+#include <src/complain.h>
+#include <src/getargs.h>
+#include <src/files.h>
+#include <src/scan-skel.h>

 
 #define YY_DECL static int skel_lex (void)
 YY_DECL;
 
 #define YY_DECL static int skel_lex (void)
 YY_DECL;


@@ -59,7 +58,7 @@ static void fail_for_invalid_at (char const *at);
 %%
 
 %{
 %%
 
 %{

-  int out_lineno IF_LINT (= 0);
+  int out_lineno PACIFY_CC (= 0);

   char *outname = NULL;
 
   /* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and
   char *outname = NULL;
 
   /* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and


@@ -73,12 +72,11 @@ static void fail_for_invalid_at (char const *at);
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);

-"@`" /* Emtpy.  Used by b4_cat in ../data/bison.m4.  */
+"@`" /* Empty.  Used by b4_cat in ../data/bison.m4.  */

 @\n  /* Likewise.  */
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 "@ofile@"  QPUTS (outname);
 @\n  /* Likewise.  */
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 "@ofile@"  QPUTS (outname);

-"@dir_prefix@" QPUTS (dir_prefix);

 
 @[a-z_]+"(" {
   yytext[yyleng-1] = '\0';
 
 @[a-z_]+"(" {
   yytext[yyleng-1] = '\0';


@@ -90,8 +88,8 @@ static void fail_for_invalid_at (char const *at);
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^@{}`(\n]* fail_for_invalid_at (yytext);
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^@{}`(\n]* fail_for_invalid_at (yytext);

-\n        out_lineno++; ECHO;
-[^@\n]+           ECHO;
+\n         out_lineno++; ECHO;
+[^@\n]+    ECHO;

 
 <INITIAL><<EOF>> {
   if (outname)
 
 <INITIAL><<EOF>> {
   if (outname)


@@ -108,7 +106,7 @@ static void fail_for_invalid_at (char const *at);
   "@@" { obstack_1grow (&obstack_for_string, '@'); }
   "@{" { obstack_1grow (&obstack_for_string, '['); }
   "@}" { obstack_1grow (&obstack_for_string, ']'); }
   "@@" { obstack_1grow (&obstack_for_string, '@'); }
   "@{" { obstack_1grow (&obstack_for_string, '['); }
   "@}" { obstack_1grow (&obstack_for_string, ']'); }

-  "@`" /* Emtpy.  Useful for starting an argument
+  "@`" /* Empty.  Useful for starting an argument

           that begins with whitespace. */
   @\n  /* Empty.  */
 
           that begins with whitespace. */
   @\n  /* Empty.  */
 


@@ -175,20 +173,20 @@ skel_scanner_free (void)
   yylex_destroy ();
 }
 
   yylex_destroy ();
 }
 

-static
-void at_directive_perform (int at_directive_argc,
-                           char *at_directive_argv[],
-                           char **outnamep, int *out_linenop)
+static void
+at_directive_perform (int at_directive_argc,
+                      char *at_directive_argv[],
+                      char **outnamep, int *out_linenop)

 {
 {

-  if (0 == strcmp (at_directive_argv[0], "@basename"))
+  if (STREQ (at_directive_argv[0], "@basename"))

     {
       if (at_directive_argc > 2)
         fail_for_at_directive_too_many_args (at_directive_argv[0]);
       fputs (last_component (at_directive_argv[1]), yyout);
     }
     {
       if (at_directive_argc > 2)
         fail_for_at_directive_too_many_args (at_directive_argv[0]);
       fputs (last_component (at_directive_argv[1]), yyout);
     }

-  else if (0 == strcmp (at_directive_argv[0], "@warn")
-           || 0 == strcmp (at_directive_argv[0], "@complain")
-           || 0 == strcmp (at_directive_argv[0], "@fatal"))
+  else if (STREQ (at_directive_argv[0], "@warn")
+           || STREQ (at_directive_argv[0], "@complain")
+           || STREQ (at_directive_argv[0], "@fatal"))

     {
       void (*func)(char const *, ...);
       switch (at_directive_argv[0][1])
     {
       void (*func)(char const *, ...);
       switch (at_directive_argv[0][1])


@@ -224,9 +222,9 @@ void at_directive_perform (int at_directive_argc,
             break;
         }
     }
             break;
         }
     }

-  else if (0 == strcmp (at_directive_argv[0], "@warn_at")
-           || 0 == strcmp (at_directive_argv[0], "@complain_at")
-           || 0 == strcmp (at_directive_argv[0], "@fatal_at"))
+  else if (STREQ (at_directive_argv[0], "@warn_at")
+           || STREQ (at_directive_argv[0], "@complain_at")
+           || STREQ (at_directive_argv[0], "@fatal_at"))

     {
       void (*func)(location, char const *, ...);
       location loc;
     {
       void (*func)(location, char const *, ...);
       location loc;


@@ -267,7 +265,7 @@ void at_directive_perform (int at_directive_argc,
             break;
         }
     }
             break;
         }
     }

-  else if (0 == strcmp (at_directive_argv[0], "@output"))
+  else if (STREQ (at_directive_argv[0], "@output"))

     {
       if (at_directive_argc > 2)
         fail_for_at_directive_too_many_args (at_directive_argv[0]);
     {
       if (at_directive_argc > 2)
         fail_for_at_directive_too_many_args (at_directive_argv[0]);


@@ -277,7 +275,7 @@ void at_directive_perform (int at_directive_argc,
           xfclose (yyout);
         }
       *outnamep = xstrdup (at_directive_argv[1]);
           xfclose (yyout);
         }
       *outnamep = xstrdup (at_directive_argv[1]);

-      output_file_name_check (*outnamep);
+      output_file_name_check (outnamep);

       yyout = xfopen (*outnamep, "w");
       *out_linenop = 1;
     }
       yyout = xfopen (*outnamep, "w");
       *out_linenop = 1;
     }