* src/bison.s1 (YYLEX): Use #if instead of #ifdef.

Merge in a single CPP if/else.
This commit is contained in:
Akim Demaille
2000-11-07 15:51:45 +00:00
parent 8a4f41d6ed
commit 553e2b222f
3 changed files with 27 additions and 16 deletions

View File

@@ -1,3 +1,8 @@
2000-11-07 Akim Demaille <akim@epita.fr>
* src/bison.s1 (YYLEX): Use #if instead of #ifdef.
Merge in a single CPP if/else.
2000-11-07 Akim Demaille <akim@epita.fr> 2000-11-07 Akim Demaille <akim@epita.fr>
* src/output.c (output): Remove useless variables. * src/output.c (output): Remove useless variables.

View File

@@ -116,11 +116,10 @@ while (0)
#define YYTERROR 1 #define YYTERROR 1
#define YYERRCODE 256 #define YYERRCODE 256
#ifndef YYPURE
# define YYLEX yylex ()
#endif
#ifdef YYPURE /* YYLEX -- calling `yylex' with the right arguments. */
#if YYPURE
# ifdef YYLSP_NEEDED # ifdef YYLSP_NEEDED
# ifdef YYLEX_PARAM # ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
@@ -134,11 +133,14 @@ while (0)
# define YYLEX yylex (&yylval) # define YYLEX yylex (&yylval)
# endif # endif
# endif /* !YYLSP_NEEDED */ # endif /* !YYLSP_NEEDED */
#endif #else /* !YYPURE */
# define YYLEX yylex ()
#endif /* !YYPURE */
/* If nonreentrant, generate the variables here. */ /* If nonreentrant, generate the variables here. */
#ifndef YYPURE #if !YYPURE
/* The lookahead symbol. */ /* The lookahead symbol. */
int yychar; int yychar;
@@ -154,6 +156,7 @@ YYLTYPE yylloc;
int yynerrs; int yynerrs;
#endif /* !YYPURE */ #endif /* !YYPURE */
/* Enable debugging if requested. */ /* Enable debugging if requested. */
#if YYDEBUG #if YYDEBUG
# define YYDPRINTF(Args) \ # define YYDPRINTF(Args) \
@@ -304,14 +307,14 @@ yyparse (YYPARSE_PARAM_ARG)
int yystacksize = YYINITDEPTH; int yystacksize = YYINITDEPTH;
int yyfree_stacks = 0; int yyfree_stacks = 0;
#ifdef YYPURE #if YYPURE
int yychar; int yychar;
YYSTYPE yylval; YYSTYPE yylval;
int yynerrs; int yynerrs;
# ifdef YYLSP_NEEDED # ifdef YYLSP_NEEDED
YYLTYPE yylloc; YYLTYPE yylloc;
# endif # endif
#endif #endif /* !YYPURE */
/* The variables used to return semantic value and location from the /* The variables used to return semantic value and location from the

View File

@@ -116,11 +116,10 @@ while (0)
#define YYTERROR 1 #define YYTERROR 1
#define YYERRCODE 256 #define YYERRCODE 256
#ifndef YYPURE
# define YYLEX yylex ()
#endif
#ifdef YYPURE /* YYLEX -- calling `yylex' with the right arguments. */
#if YYPURE
# ifdef YYLSP_NEEDED # ifdef YYLSP_NEEDED
# ifdef YYLEX_PARAM # ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
@@ -134,11 +133,14 @@ while (0)
# define YYLEX yylex (&yylval) # define YYLEX yylex (&yylval)
# endif # endif
# endif /* !YYLSP_NEEDED */ # endif /* !YYLSP_NEEDED */
#endif #else /* !YYPURE */
# define YYLEX yylex ()
#endif /* !YYPURE */
/* If nonreentrant, generate the variables here. */ /* If nonreentrant, generate the variables here. */
#ifndef YYPURE #if !YYPURE
/* The lookahead symbol. */ /* The lookahead symbol. */
int yychar; int yychar;
@@ -154,6 +156,7 @@ YYLTYPE yylloc;
int yynerrs; int yynerrs;
#endif /* !YYPURE */ #endif /* !YYPURE */
/* Enable debugging if requested. */ /* Enable debugging if requested. */
#if YYDEBUG #if YYDEBUG
# define YYDPRINTF(Args) \ # define YYDPRINTF(Args) \
@@ -304,14 +307,14 @@ yyparse (YYPARSE_PARAM_ARG)
int yystacksize = YYINITDEPTH; int yystacksize = YYINITDEPTH;
int yyfree_stacks = 0; int yyfree_stacks = 0;
#ifdef YYPURE #if YYPURE
int yychar; int yychar;
YYSTYPE yylval; YYSTYPE yylval;
int yynerrs; int yynerrs;
# ifdef YYLSP_NEEDED # ifdef YYLSP_NEEDED
YYLTYPE yylloc; YYLTYPE yylloc;
# endif # endif
#endif #endif /* !YYPURE */
/* The variables used to return semantic value and location from the /* The variables used to return semantic value and location from the