Minor fixups to get 'make maintainer-check' to work.

* configure.ac: Don't use -Wnested-externs, as it's incompatible
with the new verify.h implementation.
* data/c.m4 (b4_yy_symbol_print_generate): YYUSE (yyoutput).
* data/glr.c (YYUSE): Depend on __GNUC__ as well.
* data/yacc.c (YYUSE): Likewise.
* data/lalr1.cc (yysyntax_error_): YYUSE (yystate).
* lib/subpipe.c (end_of_output_subpipe): The args are unused.
* src/parse-gram.y (declaration): Don't pass a string constant
to a function that expects char *, since GCC might complain
about the constant value.
* src/reader.c (symbol_typed_p): Add parens to pacify GCC.
* tests/cxx-type.at (_AT_TEST_GLR_CXXTYPES): #undef yylloc and yylval
before #defining them.
* tests/glr-regression.at
(Incorrectly initialized location for empty right-hand side in GLR):
In yyerror, use the msg arg.
(Corrupted semantic options if user action cuts parse):
(Incorrect lookahead during deterministic GLR):
(Incorrect lookahead during nondeterministic GLR):
Don't name a local var 'index'; it shadows string.h's 'index'.
This commit is contained in:
Paul Eggert
2006-01-20 00:08:30 +00:00
parent ed94ef2ae4
commit c66dfaddf4
11 changed files with 79 additions and 32 deletions

View File

@@ -155,7 +155,9 @@ yylex (LEX_PARAMETERS)
static int colNum = 0;
#if YYPURE
# undef yylloc
# define yylloc (*llocp)
# undef yylval
# define yylval (*lvalp)
#endif

View File

@@ -240,7 +240,7 @@ AT_DATA_GRAMMAR([glr-regr3.y],
#include <stdarg.h>
static int MergeRule (int x0, int x1);
static void yyerror(char const * s);
static void yyerror (char const * s);
int yylex (void);
#define RULE(x) (1 << (x))
@@ -650,7 +650,7 @@ AT_DATA_GRAMMAR([glr-regr8.y],
#include <stdlib.h>
static void yyerror (char const *);
static int yylex (void);
static void yyerror(const char *msg);
static void yyerror (char const *msg);
%}
%token T_CONSTANT
@@ -684,9 +684,10 @@ OptSignalWord : /* empty */
%%
void yyerror(const char *msg)
void
yyerror (char const *msg)
{
fprintf (stderr, "error\n");
fprintf (stderr, "%s\n", msg);
}
static int lexIndex;
@@ -856,9 +857,9 @@ yylex (void)
int
main (void)
{
int index;
for (index = 0; index < GARBAGE_SIZE; index+=1)
garbage[index] = 108;
int i;
for (i = 0; i < GARBAGE_SIZE; i+=1)
garbage[i] = 108;
return yyparse ();
}
]])
@@ -1087,11 +1088,11 @@ static int
yylex (void)
{
static char const *input = "ab";
static int index = 0;
static int i = 0;
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = index+1;
yylval.value = input[index] + 'A' - 'a';
return input[index++];
yylloc.first_column = yylloc.last_column = i + 1;
yylval.value = input[i] + 'A' - 'a';
return input[i++];
}
static void
@@ -1293,11 +1294,11 @@ static int
yylex (void)
{
static char const *input = "abcdddd";
static int index = 0;
static int i = 0;
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = index+1;
yylval.value = input[index] + 'A' - 'a';
return input[index++];
yylloc.first_column = yylloc.last_column = i + 1;
yylval.value = input[i] + 'A' - 'a';
return input[i++];
}
static void