Test _MSDOS_, not MSDOS.

[bison.git] / src / bison.s1

diff --git a/src/bison.s1 b/src/bison.s1
index daedf0dcd9272450ccdc74f4c3a482a3a7d4e602..1c853745745b9a9dbbf3cbe5b4911c1d6ff1fe16 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -2,11 +2,11 @@
 #line 3 "bison.simple"
 
 /* Skeleton output parser for bison,
 #line 3 "bison.simple"
 
 /* Skeleton output parser for bison,

-   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,6 +18,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 

+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */

 
 #ifndef alloca
 #ifdef __GNUC__
 
 #ifndef alloca
 #ifdef __GNUC__


@@ -26,9 +30,11 @@
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
 #include <alloca.h>
 #else /* not sparc */
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
 #include <alloca.h>
 #else /* not sparc */

-#if defined (MSDOS) && !defined (__TURBOC__)
+/* This used to test MSDOS, but that is a bad idea
+   since that is in the user namespace.  */
+#if defined (_MSDOS_) && !defined (__TURBOC__)

 #include <malloc.h>
 #include <malloc.h>

-#else /* not MSDOS, or __TURBOC__ */
+#else /* not _MSDOS_, or __TURBOC__ */

 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca
 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca


@@ -43,7 +49,7 @@ void *alloca ();
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */

-#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not _MSDOS_, or __TURBOC__ */

 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */
 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */


@@ -150,16 +156,16 @@ int yyparse (void);
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */

-#define __yy_bcopy(FROM,TO,COUNT)      __builtin_memcpy(TO,FROM,COUNT)
+#define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)

 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_bcopy (from, to, count)
-     char *from;
+__yy_memcpy (to, from, count)

      char *to;
      char *to;

+     char *from;

      int count;
 {
   register char *f = from;
      int count;
 {
   register char *f = from;


@@ -175,10 +181,10 @@ __yy_bcopy (from, to, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_bcopy (char *from, char *to, int count)
+__yy_memcpy (char *to, char *from, int count)

 {
 {

-  register char *f = from;

   register char *t = to;
   register char *t = to;

+  register char *f = from;

   register int i = count;
 
   while (i-- > 0)
   register int i = count;
 
   while (i-- > 0)


@@ -188,7 +194,7 @@ __yy_bcopy (char *from, char *to, int count)
 #endif
 #endif
 \f
 #endif
 #endif
 \f

-#line 184 "bison.simple"
+#line 196 "bison.simple"

 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.


@@ -197,14 +203,20 @@ __yy_bcopy (char *from, char *to, int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM

+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM

 #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
 #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;

-#else
-#define YYPARSE_PARAM
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG

 #define YYPARSE_PARAM_DECL
 #define YYPARSE_PARAM_DECL

-#endif
+#endif /* not YYPARSE_PARAM */

 
 int
 
 int

-yyparse(YYPARSE_PARAM)
+yyparse(YYPARSE_PARAM_ARG)

      YYPARSE_PARAM_DECL
 {
   register int yystate;
      YYPARSE_PARAM_DECL
 {
   register int yystate;


@@ -321,12 +333,12 @@ yynewstate:
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));

-      __yy_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));

       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));

-      __yy_bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));

 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));

-      __yy_bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));

 #endif
 #endif /* no yyoverflow */
 
 #endif
 #endif /* no yyoverflow */
 


@@ -484,7 +496,7 @@ yyreduce:
 #endif
 
 $   /* the action file gets copied in in place of this dollarsign */
 #endif
 
 $   /* the action file gets copied in in place of this dollarsign */

-#line 480 "bison.simple"
+#line 498 "bison.simple"

 \f
   yyvsp -= yylen;
   yyssp -= yylen;
 \f
   yyvsp -= yylen;
   yyssp -= yylen;