X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/87b0a3759788d4f7e439e1aeb02661d1f7df6d01..e3fd1dcb8b0b55525876440410f71791d8b4c2f3:/src/scan-skel.l
diff --git a/src/scan-skel.l b/src/scan-skel.l
index f3fa1a61..e15294a1 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,26 +1,23 @@
/* Scan Bison Skeletons. -*- C -*-
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
- Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
-%option nodefault noyywrap nounput never-interactive debug
+%option nodefault noyywrap noinput nounput never-interactive debug
%option prefix="skel_" outfile="lex.yy.c"
%{
@@ -30,16 +27,16 @@
#define skel_wrap() 1
#define FLEX_PREFIX(Id) skel_ ## Id
-#include "flex-scanner.h"
+#include
#include
#include
#include
-#include "complain.h"
-#include "getargs.h"
-#include "files.h"
-#include "scan-skel.h"
+#include
+#include
+#include
+#include
#define YY_DECL static int skel_lex (void)
YY_DECL;
@@ -61,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
@@ -72,9 +69,11 @@ static void fail_for_invalid_at (char const *at);
char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%}
-"@@" fputc ('@', yyout);
-"@{" fputc ('[', yyout);
-"@}" fputc (']', yyout);
+"@@" fputc ('@', yyout);
+"@{" fputc ('[', yyout);
+"@}" fputc (']', yyout);
+"@`" /* Empty. Used by b4_cat in ../data/bison.m4. */
+@\n /* Likewise. */
"@oline@" fprintf (yyout, "%d", out_lineno + 1);
"@ofile@" QPUTS (outname);
@@ -89,9 +88,9 @@ 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);
-\n out_lineno++; ECHO;
-[^@\n]+ ECHO;
+@[^@{}`(\n]* fail_for_invalid_at (yytext);
+\n out_lineno++; ECHO;
+[^@\n]+ ECHO;
<> {
if (outname)
@@ -108,8 +107,9 @@ static void fail_for_invalid_at (char const *at);
"@@" { 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. */
@[,)] {
if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
@@ -174,20 +174,20 @@ skel_scanner_free (void)
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);
}
- 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 +223,9 @@ void 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 +266,7 @@ void 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]);
@@ -276,7 +276,7 @@ void at_directive_perform (int at_directive_argc,
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;
}