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 a89e13cc1f4d39a9050ca67b1c09e895d111c1d2..284a12074c7a1b84909cf722c9418a90ed2ddd26 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -72,12 +72,11 @@ static void fail_for_invalid_at (char const *at);
 "@@" 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);
-"@dir_prefix@" QPUTS (dir_prefix);
 
 @[a-z_]+"(" {
   yytext[yyleng-1] = '\0';
@@ -179,15 +178,15 @@ 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);
     }
-  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])
@@ -223,9 +222,9 @@ at_directive_perform (int at_directive_argc,
             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;
@@ -266,7 +265,7 @@ at_directive_perform (int at_directive_argc,
             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]);