Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/dist/toolchain/gcc Revert previous; please don't regen ....



details:   https://anonhg.NetBSD.org/src/rev/642a0d22f621
branches:  trunk
changeset: 521367:642a0d22f621
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Jan 29 08:12:10 2002 +0000

description:
Revert previous; please don't regen .y output using BSD yacc for a file that
should be run through Bison.

diffstat:

 gnu/dist/toolchain/gcc/c-parse.c |  308 +++++++++++++++-----------------------
 gnu/dist/toolchain/gcc/c-parse.h |  118 +++++++-------
 2 files changed, 179 insertions(+), 247 deletions(-)

diffs (truncated from 579 to 300 lines):

diff -r 64496b07c3aa -r 642a0d22f621 gnu/dist/toolchain/gcc/c-parse.c
--- a/gnu/dist/toolchain/gcc/c-parse.c  Tue Jan 29 06:59:26 2002 +0000
+++ b/gnu/dist/toolchain/gcc/c-parse.c  Tue Jan 29 08:12:10 2002 +0000
@@ -1,68 +1,69 @@
 
 /*  A Bison parser, made from c-parse.y
-    by GNU Bison version 1.28  */
+ by  GNU Bison version 1.25
+  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#define        IDENTIFIER      257
-#define        TYPENAME        258
-#define        SCSPEC  259
-#define        TYPESPEC        260
-#define        TYPE_QUAL       261
-#define        CONSTANT        262
-#define        STRING  263
-#define        ELLIPSIS        264
-#define        SIZEOF  265
-#define        ENUM    266
-#define        STRUCT  267
-#define        UNION   268
-#define        IF      269
-#define        ELSE    270
-#define        WHILE   271
-#define        DO      272
-#define        FOR     273
-#define        SWITCH  274
-#define        CASE    275
-#define        DEFAULT 276
-#define        BREAK   277
-#define        CONTINUE        278
-#define        RETURN  279
-#define        GOTO    280
-#define        ASM_KEYWORD     281
-#define        TYPEOF  282
-#define        ALIGNOF 283
-#define        ATTRIBUTE       284
-#define        EXTENSION       285
-#define        LABEL   286
-#define        REALPART        287
-#define        IMAGPART        288
-#define        ASSIGN  289
-#define        OROR    290
-#define        ANDAND  291
-#define        EQCOMPARE       292
-#define        ARITHCOMPARE    293
-#define        LSHIFT  294
-#define        RSHIFT  295
-#define        UNARY   296
-#define        PLUSPLUS        297
-#define        MINUSMINUS      298
-#define        HYPERUNARY      299
-#define        POINTSAT        300
-#define        INTERFACE       301
-#define        IMPLEMENTATION  302
-#define        END     303
-#define        SELECTOR        304
-#define        DEFS    305
-#define        ENCODE  306
-#define        CLASSNAME       307
-#define        PUBLIC  308
-#define        PRIVATE 309
-#define        PROTECTED       310
-#define        PROTOCOL        311
-#define        OBJECTNAME      312
-#define        CLASS   313
-#define        ALIAS   314
-#define        OBJC_STRING     315
+#define        IDENTIFIER      258
+#define        TYPENAME        259
+#define        SCSPEC  260
+#define        TYPESPEC        261
+#define        TYPE_QUAL       262
+#define        CONSTANT        263
+#define        STRING  264
+#define        ELLIPSIS        265
+#define        SIZEOF  266
+#define        ENUM    267
+#define        STRUCT  268
+#define        UNION   269
+#define        IF      270
+#define        ELSE    271
+#define        WHILE   272
+#define        DO      273
+#define        FOR     274
+#define        SWITCH  275
+#define        CASE    276
+#define        DEFAULT 277
+#define        BREAK   278
+#define        CONTINUE        279
+#define        RETURN  280
+#define        GOTO    281
+#define        ASM_KEYWORD     282
+#define        TYPEOF  283
+#define        ALIGNOF 284
+#define        ATTRIBUTE       285
+#define        EXTENSION       286
+#define        LABEL   287
+#define        REALPART        288
+#define        IMAGPART        289
+#define        ASSIGN  290
+#define        OROR    291
+#define        ANDAND  292
+#define        EQCOMPARE       293
+#define        ARITHCOMPARE    294
+#define        LSHIFT  295
+#define        RSHIFT  296
+#define        UNARY   297
+#define        PLUSPLUS        298
+#define        MINUSMINUS      299
+#define        HYPERUNARY      300
+#define        POINTSAT        301
+#define        INTERFACE       302
+#define        IMPLEMENTATION  303
+#define        END     304
+#define        SELECTOR        305
+#define        DEFS    306
+#define        ENCODE  307
+#define        CLASSNAME       308
+#define        PUBLIC  309
+#define        PRIVATE 310
+#define        PROTECTED       311
+#define        PROTOCOL        312
+#define        OBJECTNAME      313
+#define        CLASS   314
+#define        ALIAS   315
+#define        OBJC_STRING     316
 
 #line 56 "c-parse.y"
 
@@ -137,7 +138,7 @@
 #define        YYFLAG          -32768
 #define        YYNTBASE        84
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 315 ? yytranslate[x] : 241)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 316 ? yytranslate[x] : 241)
 
 static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -165,13 +166,13 @@
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30,    31,    32,    33,    34,    35,    39,
-    40,    44,    45,    46,    47,    53,    54,    55,    56,    57,
-    61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-    71,    72,    73,    74,    75
+     2,     2,     2,     2,     2,     1,     2,     3,     4,     5,
+     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+    26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+    39,    40,    44,    45,    46,    47,    53,    54,    55,    56,
+    57,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+    70,    71,    72,    73,    74,    75
 };
 
 #if YYDEBUG != 0
@@ -1204,8 +1205,7 @@
     50,    51,    52
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/pkg/share/bison.simple"
-/* This file comes from bison-1.28.  */
+#line 3 "/usr/lib/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -1222,67 +1222,47 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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__
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#include <alloca.h>
+#else /* not sparc */
+#if defined (MSDOS) && !defined (__TURBOC__)
+#include <malloc.h>
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+#include <malloc.h>
+ #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 */
+#endif /* __hpux */
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc.  */
+#endif /* not GNU C.  */
+#endif /* alloca not defined.  */
+
 /* This is the parser code that is written into each bison parser
   when the %semantic_parser declaration is not specified in the grammar.
   It was written by Richard Stallman by simplifying the hairy parser
   used when %semantic_parser is specified.  */
 
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#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 YYSTACK_USE_ALLOCA
-#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
-   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>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* 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
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible%ilog.fr@localhost 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
-#endif /* not _AIX */
-#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
    as one case of the switch.  */
@@ -1291,8 +1271,8 @@
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define YYEOF          0
-#define YYACCEPT       goto yyacceptlab
-#define YYABORT        goto yyabortlab
+#define YYACCEPT       return(0)
+#define YYABORT        return(1)
 #define YYERROR                goto yyerrlab1
 /* Like YYERROR except do call yyerror.
    This remains here temporarily to ease the
@@ -1373,12 +1353,12 @@
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+int yyparse (void);
+#endif
 
-/* 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++ */



Home | Main Index | Thread Index | Old Index