(literalchar): Fix the code for escaping \, " and '.

[bison.git] / src / bison.s1

diff --git a/src/bison.s1 b/src/bison.s1
index 88fad5895abd016f8be2432017ea834d3e8d33b1..a77da663c5e69af94691729ddc116682db9b5290 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -28,36 +28,53 @@
   It was written by Richard Stallman by simplifying the hairy parser
   used when %semantic_parser is specified.  */
 
   It was written by Richard Stallman by simplifying the hairy parser
   used when %semantic_parser is specified.  */
 

-#ifndef alloca
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */

 #ifdef __GNUC__
 #ifdef __GNUC__

+#define YYSTACK_USE_ALLOCA

 #define alloca __builtin_alloca
 #else /* not GNU C.  */
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))

+#define YYSTACK_USE_ALLOCA

 #include <alloca.h>
 #else /* not sparc */
 #include <alloca.h>
 #else /* not sparc */

+/* We think this test detects Watcom and Microsoft C.  */

 /* This used to test MSDOS, but that is a bad idea
 /* This used to test MSDOS, but that is a bad idea

-   since that is in the user namespace.  */
-#if defined (_MSDOS_) && !defined (__TURBOC__)
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+        instead, just don't use alloca.  */

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

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

 #if defined(_AIX)
 #if defined(_AIX)

-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */

  #pragma alloca
  #pragma alloca

-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+                and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca

 #endif /* __hpux */
 #endif /* __hpux */

+#endif

 #endif /* not _AIX */
 #endif /* not _AIX */

-#endif /* not _MSDOS_, or __TURBOC__ */
-#endif /* not sparc.  */
-#endif /* not GNU C.  */
-#endif /* alloca not defined.  */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif

 
 /* Note: there must be only one dollar sign in this file.
    It is replaced by the list of actions, each action
 
 /* Note: there must be only one dollar sign in this file.
    It is replaced by the list of actions, each action


@@ -67,8 +84,8 @@ void *alloca ();
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define YYEOF          0
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define YYEOF          0

-#define YYACCEPT       return(0)
-#define YYABORT        return(1)
+#define YYACCEPT       goto yyacceptlab
+#define YYABORT        goto yyabortlab

 #define YYERROR                goto yyerrlab1
 /* Like YYERROR except do call yyerror.
    This remains here temporarily to ease the
 #define YYERROR                goto yyerrlab1
 /* Like YYERROR except do call yyerror.
    This remains here temporarily to ease the


@@ -149,12 +166,12 @@ int yydebug;                      /*  nonzero means print parse trace     */
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif

-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse (void);
-#endif

 \f
 \f

+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+

 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
 #else                          /* not GNU C or C++ */
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
 #else                          /* not GNU C or C++ */


@@ -166,7 +183,7 @@ static void
 __yy_memcpy (to, from, count)
      char *to;
      char *from;
 __yy_memcpy (to, from, count)
      char *to;
      char *from;

-     int count;
+     unsigned int count;

 {
   register char *f = from;
   register char *t = to;
 {
   register char *f = from;
   register char *t = to;


@@ -181,7 +198,7 @@ __yy_memcpy (to, from, 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_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)

 {
   register char *t = to;
   register char *f = from;
 {
   register char *t = to;
   register char *f = from;


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

-#line 196 "bison.simple"
+#line 215 "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 *.


@@ -215,6 +232,15 @@ __yy_memcpy (char *to, char *from, int count)
 #define YYPARSE_PARAM_DECL
 #endif /* not YYPARSE_PARAM */
 
 #define YYPARSE_PARAM_DECL
 #endif /* not YYPARSE_PARAM */
 

+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+

 int
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 int
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL


@@ -243,6 +269,7 @@ yyparse(YYPARSE_PARAM_ARG)
 #endif
 
   int yystacksize = YYINITDEPTH;
 #endif
 
   int yystacksize = YYINITDEPTH;

+  int yyfree_stacks = 0;

 
 #ifdef YYPURE
   int yychar;
 
 #ifdef YYPURE
   int yychar;


@@ -327,18 +354,32 @@ yynewstate:
       if (yystacksize >= YYMAXDEPTH)
        {
          yyerror("parser stack overflow");
       if (yystacksize >= YYMAXDEPTH)
        {
          yyerror("parser stack overflow");

+         if (yyfree_stacks)
+           {
+             free (yyss);
+             free (yyvs);
+#ifdef YYLSP_NEEDED
+             free (yyls);
+#endif
+           }

          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;

-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+                  size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+                  size * (unsigned int) sizeof (*yyvsp));

 #ifdef YYLSP_NEEDED
 #ifdef YYLSP_NEEDED

-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+                  size * (unsigned int) sizeof (*yylsp));

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


@@ -496,7 +537,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 498 "bison.simple"
+#line 541 "bison.simple"

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


@@ -691,4 +732,28 @@ yyerrhandle:
 
   yystate = yyn;
   goto yynewstate;
 
   yystate = yyn;
   goto yynewstate;

+
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
+
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 1;

 }
 }