* tests/calc.m4 (calc.y): Do not assign to stdin, as it's not

portable.

diff --git a/ChangeLog b/ChangeLog
index cd4a780493997daa7ee24e47ae1b808ddccb2f45..064924dabd0fd860fcd47501f84ed6605fe8f7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-19  Akim Demaille  <akim@epita.fr>
+
+       * tests/calc.m4 (calc.y): Do not assign to stdin, as it's not
+       portable.
+

 2000-09-18  Akim Demaille  <akim@epita.fr>
 
        * configure.in: Append WARNING_CFLAGS to CFLAGS.
 2000-09-18  Akim Demaille  <akim@epita.fr>
 
        * configure.in: Append WARNING_CFLAGS to CFLAGS.

diff --git a/tests/calc.m4 b/tests/calc.m4
index 9b57a85d994d4285e78ad8972dd14973f38d32fd..9f0942d72c5bfa3bbc3b75f40fd1fca70b98b1b7 100644 (file)
--- a/tests/calc.m4
+++ b/tests/calc.m4
@@ -54,11 +54,13 @@ exp:      NUM                { $$ = $1;             }
         | '(' exp ')'        { $$ = $2;             }
 ;
 %%
         | '(' exp ')'        { $$ = $2;             }
 ;
 %%

+FILE *yyin = stdin;
+

 int
 main (int argn, const char **argv)
 {
   if (argn == 2)
 int
 main (int argn, const char **argv)
 {
   if (argn == 2)

-    stdin = fopen (argv[1], "r");
+    yyin = fopen (argv[1], "r");

   if (!stdin)
     {
       perror (argv[1]);
   if (!stdin)
     {
       perror (argv[1]);


@@ -110,13 +112,13 @@ yylex ()
   int c;
 
   /* Skip white space.  */
   int c;
 
   /* Skip white space.  */

-  while ((c = getchar ()) == ' ' || c == '\t')
+  while ((c = getc (yyin)) == ' ' || c == '\t')

     ;
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {
     ;
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {

-      ungetc (c, stdin);
-      yylval = read_signed_integer (stdin);
+      ungetc (c, yyin);
+      yylval = read_signed_integer (yyin);

       return NUM;
     }
   /* Return end-of-file.  */
       return NUM;
     }
   /* Return end-of-file.  */