[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Both: s/std::stderr/stderr/
From: |
Akim Demaille |
Subject: |
FYI: Both: s/std::stderr/stderr/ |
Date: |
03 Jan 2002 10:49:09 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/bison.simple (YYSTDERR): Remove, replace `stderr'.
The ISO C++ standard is extremely clear about it: stderr is
considered a macro, not a regular symbol (see table 94 `Header
<cstdio> synopsis', [lib.c.files] 27.8.2 C Library files).
Therefore std:: does not apply to it. It still does with fprintf.
Also, s/cstdio.h/cstdio/.
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.53.2.15
diff -u -u -r1.53.2.15 bison.simple
--- src/bison.simple 27 Dec 2001 18:30:40 -0000 1.53.2.15
+++ src/bison.simple 3 Jan 2002 09:47:33 -0000
@@ -217,12 +217,11 @@
# ifndef YYFPRINTF
# ifdef __cplusplus
-# include <cstdio.h> /* INFRINGES ON USER NAME SPACE */
+# include <cstdio> /* INFRINGES ON USER NAME SPACE */
# else
# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
# endif
# define YYFPRINTF YYSTD (fprintf)
-# define YYSTDERR YYSTD (stderr)
# endif
# define YYDPRINTF(Args) \
@@ -461,7 +460,7 @@
rule. */
int yylen;
- YYDPRINTF ((YYSTDERR, "Starting parse\n"));
+ YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
@@ -557,14 +556,14 @@
yylsp = yyls + yysize - 1;
#endif
- YYDPRINTF ((YYSTDERR, "Stack size increased to %lu\n",
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
if (yyssp >= yyss + yystacksize - 1)
YYABORT;
}
- YYDPRINTF ((YYSTDERR, "Entering state %d\n", yystate));
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
goto yybackup;
@@ -591,7 +590,7 @@
if (yychar == YYEMPTY)
{
- YYDPRINTF ((YYSTDERR, "Reading a token: "));
+ YYDPRINTF ((stderr, "Reading a token: "));
yychar = YYLEX;
}
@@ -602,7 +601,7 @@
yychar1 = 0;
yychar = YYEOF; /* Don't call YYLEX any more */
- YYDPRINTF ((YYSTDERR, "Now at end of input.\n"));
+ YYDPRINTF ((stderr, "Now at end of input.\n"));
}
else
{
@@ -613,14 +612,14 @@
which are defined only if `YYDEBUG' is set. */
if (yydebug)
{
- YYFPRINTF (YYSTDERR, "Next token is %d (%s",
+ YYFPRINTF (stderr, "Next token is %d (%s",
yychar, yytname[yychar1]);
/* Give the individual parser a way to print the precise
meaning of a token, for further debugging info. */
# ifdef YYPRINT
- YYPRINT (YYSTDERR, yychar, yylval);
+ YYPRINT (stderr, yychar, yylval);
# endif
- YYFPRINTF (YYSTDERR, ")\n");
+ YYFPRINTF (stderr, ")\n");
}
#endif
}
@@ -652,7 +651,7 @@
YYACCEPT;
/* Shift the lookahead token. */
- YYDPRINTF ((YYSTDERR, "Shifting token %d (%s), ",
+ YYDPRINTF ((stderr, "Shifting token %d (%s), ",
yychar, yytname[yychar1]));
/* Discard the token being shifted unless it is eof. */
@@ -714,13 +713,13 @@
{
int yyi;
- YYFPRINTF (YYSTDERR, "Reducing via rule %d (line %d), ",
+ YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
yyn, yyrline[yyn]);
/* Print the symbols being reduced, and their result. */
for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
- YYFPRINTF (YYSTDERR, "%s ", yytname[yyrhs[yyi]]);
- YYFPRINTF (YYSTDERR, " -> %s\n", yytname[yyr1[yyn]]);
+ YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+ YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
}
#endif
%% actions /* The action file replaces this line. */
@@ -736,10 +735,10 @@
if (yydebug)
{
short *yyssp1 = yyss - 1;
- YYFPRINTF (YYSTDERR, "state stack now");
+ YYFPRINTF (stderr, "state stack now");
while (yyssp1 != yyssp)
- YYFPRINTF (YYSTDERR, " %d", *++yyssp1);
- YYFPRINTF (YYSTDERR, "\n");
+ YYFPRINTF (stderr, " %d", *++yyssp1);
+ YYFPRINTF (stderr, "\n");
}
#endif
@@ -835,7 +834,7 @@
/* return failure if at end of input */
if (yychar == YYEOF)
YYABORT;
- YYDPRINTF ((YYSTDERR, "Discarding token %d (%s).\n",
+ YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
yychar, yytname[yychar1]));
yychar = YYEMPTY;
}
@@ -881,10 +880,10 @@
if (yydebug)
{
short *yyssp1 = yyss - 1;
- YYFPRINTF (YYSTDERR, "Error: state stack now");
+ YYFPRINTF (stderr, "Error: state stack now");
while (yyssp1 != yyssp)
- YYFPRINTF (YYSTDERR, " %d", *++yyssp1);
- YYFPRINTF (YYSTDERR, "\n");
+ YYFPRINTF (stderr, " %d", *++yyssp1);
+ YYFPRINTF (stderr, "\n");
}
#endif
@@ -914,7 +913,7 @@
if (yyn == YYFINAL)
YYACCEPT;
- YYDPRINTF ((YYSTDERR, "Shifting error token, "));
+ YYDPRINTF ((stderr, "Shifting error token, "));
*++yyvsp = yylval;
#if YYLSP_NEEDED
- FYI: Both: s/std::stderr/stderr/,
Akim Demaille <=