Merge branch 'origin/maint'

* origin/maint:
  maint: credit Wojciech Polak
  maint: post-release administrivia
  version 2.7
  yacc.c: scope reduction
  tests: C90 compliance
  fix C90 compliance
  glr.c: scope reduction
  gnulib: update

Conflicts:
	NEWS
	gnulib
	src/scan-gram.l
	src/system.h
This commit is contained in:
Akim Demaille
2012-12-14 13:56:11 +01:00
13 changed files with 80 additions and 58 deletions

View File

@@ -90,7 +90,7 @@ AT_DATA_GRAMMAR([[input.y]],
%code
{
# include <stdio.h>
# include <stdlib.h> // getenv
# include <stdlib.h> /* getenv */
]AT_YYERROR_DECLARE[
]AT_YYLEX_DECLARE[
}
@@ -195,7 +195,7 @@ AT_DATA_GRAMMAR([[input.y]],
%code
{
# include <stdio.h>
# include <stdlib.h> // getenv
# include <stdlib.h> /* getenv */
]AT_YYERROR_DECLARE[
]AT_YYLEX_DECLARE[
}
@@ -223,6 +223,7 @@ main (void)
TEST(7, 2, 0, 2);
TEST(8, 0, 8, 0);
return 0;
}
]])

View File

@@ -195,10 +195,11 @@ yylex (void)
int
main (int argc, char **argv)
{
int res;
input = stdin;
if (argc == 2 && !(input = fopen (argv[1], "r")))
return 3;
int res = yyparse ();
res = yyparse ();
if (argc == 2 && fclose (input))
return 4;
return res;
@@ -327,10 +328,11 @@ int yylex (void)
int
main(int argc, char* argv[])
{
int res;
input = stdin;
if (argc == 2 && !(input = fopen (argv[1], "r")))
return 3;
int res = yyparse ();
res = yyparse ();
if (argc == 2 && fclose (input))
return 4;
return res;

View File

@@ -127,7 +127,7 @@ AT_BISON_OPTION_PUSHDEFS
AT_DATA([syncline.c],
[[#error "1"
int i; // avoids -pedantic warning about an empty translation unit
int i; /* avoids -pedantic warning about an empty translation unit. */
]])
AT_SYNCLINES_COMPILE([syncline.c])