Source-Changes-HG archive

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

[src/netbsd-2-0]: src/gnu/dist/gcc/gcc Pull up revision 1.4 (requested by mrg...



details:   https://anonhg.NetBSD.org/src/rev/a05c821d9239
branches:  netbsd-2-0
changeset: 561223:a05c821d9239
user:      tron <tron%NetBSD.org@localhost>
date:      Sun May 30 11:50:03 2004 +0000

description:
Pull up revision 1.4 (requested by mrg in ticket #422):
fix merge cornflakes with GCC 3.3.3 (final)

diffstat:

 gnu/dist/gcc/gcc/c-parse.c         |   7272 +++++++---------
 gnu/dist/gcc/gcc/cp/parse.c        |  14903 ++++++++++++++++------------------
 gnu/dist/gcc/gcc/cp/parse.h        |    318 +-
 gnu/dist/gcc/gcc/doc/fsf-funding.7 |      4 +-
 gnu/dist/gcc/gcc/doc/gfdl.7        |      4 +-
 gnu/dist/gcc/gcc/doc/gpl.7         |      4 +-
 gnu/dist/gcc/gcc/gengtype-lex.c    |     74 +-
 gnu/dist/gcc/gcc/gengtype-yacc.c   |   1739 +--
 gnu/dist/gcc/gcc/gengtype-yacc.h   |    109 +-
 gnu/dist/gcc/gcc/objc/objc-parse.c |   9201 +++++++++-----------
 10 files changed, 15379 insertions(+), 18249 deletions(-)

diffs (truncated from 38942 to 300 lines):

diff -r 2f20967a5a10 -r a05c821d9239 gnu/dist/gcc/gcc/c-parse.c
--- a/gnu/dist/gcc/gcc/c-parse.c        Sun May 30 11:40:39 2004 +0000
+++ b/gnu/dist/gcc/gcc/c-parse.c        Sun May 30 11:50:03 2004 +0000
@@ -1,199 +1,76 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
-   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,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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.  */
-
-/* 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.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     IDENTIFIER = 258,
-     TYPENAME = 259,
-     SCSPEC = 260,
-     STATIC = 261,
-     TYPESPEC = 262,
-     TYPE_QUAL = 263,
-     CONSTANT = 264,
-     STRING = 265,
-     ELLIPSIS = 266,
-     SIZEOF = 267,
-     ENUM = 268,
-     STRUCT = 269,
-     UNION = 270,
-     IF = 271,
-     ELSE = 272,
-     WHILE = 273,
-     DO = 274,
-     FOR = 275,
-     SWITCH = 276,
-     CASE = 277,
-     DEFAULT = 278,
-     BREAK = 279,
-     CONTINUE = 280,
-     RETURN = 281,
-     GOTO = 282,
-     ASM_KEYWORD = 283,
-     TYPEOF = 284,
-     ALIGNOF = 285,
-     ATTRIBUTE = 286,
-     EXTENSION = 287,
-     LABEL = 288,
-     REALPART = 289,
-     IMAGPART = 290,
-     VA_ARG = 291,
-     CHOOSE_EXPR = 292,
-     TYPES_COMPATIBLE_P = 293,
-     PTR_VALUE = 294,
-     PTR_BASE = 295,
-     PTR_EXTENT = 296,
-     STRING_FUNC_NAME = 297,
-     VAR_FUNC_NAME = 298,
-     ASSIGN = 299,
-     OROR = 300,
-     ANDAND = 301,
-     EQCOMPARE = 302,
-     ARITHCOMPARE = 303,
-     RSHIFT = 304,
-     LSHIFT = 305,
-     MINUSMINUS = 306,
-     PLUSPLUS = 307,
-     UNARY = 308,
-     HYPERUNARY = 309,
-     POINTSAT = 310,
-     INTERFACE = 311,
-     IMPLEMENTATION = 312,
-     END = 313,
-     SELECTOR = 314,
-     DEFS = 315,
-     ENCODE = 316,
-     CLASSNAME = 317,
-     PUBLIC = 318,
-     PRIVATE = 319,
-     PROTECTED = 320,
-     PROTOCOL = 321,
-     OBJECTNAME = 322,
-     CLASS = 323,
-     ALIAS = 324
-   };
-#endif
-#define IDENTIFIER 258
-#define TYPENAME 259
-#define SCSPEC 260
-#define STATIC 261
-#define TYPESPEC 262
-#define TYPE_QUAL 263
-#define CONSTANT 264
-#define STRING 265
-#define ELLIPSIS 266
-#define SIZEOF 267
-#define ENUM 268
-#define STRUCT 269
-#define UNION 270
-#define IF 271
-#define ELSE 272
-#define WHILE 273
-#define DO 274
-#define FOR 275
-#define SWITCH 276
-#define CASE 277
-#define DEFAULT 278
-#define BREAK 279
-#define CONTINUE 280
-#define RETURN 281
-#define GOTO 282
-#define ASM_KEYWORD 283
-#define TYPEOF 284
-#define ALIGNOF 285
-#define ATTRIBUTE 286
-#define EXTENSION 287
-#define LABEL 288
-#define REALPART 289
-#define IMAGPART 290
-#define VA_ARG 291
-#define CHOOSE_EXPR 292
-#define TYPES_COMPATIBLE_P 293
-#define PTR_VALUE 294
-#define PTR_BASE 295
-#define PTR_EXTENT 296
-#define STRING_FUNC_NAME 297
-#define VAR_FUNC_NAME 298
-#define ASSIGN 299
-#define OROR 300
-#define ANDAND 301
-#define EQCOMPARE 302
-#define ARITHCOMPARE 303
-#define RSHIFT 304
-#define LSHIFT 305
-#define MINUSMINUS 306
-#define PLUSPLUS 307
-#define UNARY 308
-#define HYPERUNARY 309
-#define POINTSAT 310
-#define INTERFACE 311
-#define IMPLEMENTATION 312
-#define END 313
-#define SELECTOR 314
-#define DEFS 315
-#define ENCODE 316
-#define CLASSNAME 317
-#define PUBLIC 318
-#define PRIVATE 319
-#define PROTECTED 320
-#define PROTOCOL 321
-#define OBJECTNAME 322
-#define CLASS 323
-#define ALIAS 324
-
-
-
-
-/* Copy the first part of user declarations.  */
+/* A Bison parser, made from c-parse.y
+   by GNU bison 1.33.  */
+
+#define YYBISON 1  /* Identify Bison output.  */
+
+# define       IDENTIFIER      257
+# define       TYPENAME        258
+# define       SCSPEC  259
+# define       STATIC  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       VA_ARG  290
+# define       CHOOSE_EXPR     291
+# define       TYPES_COMPATIBLE_P      292
+# define       PTR_VALUE       293
+# define       PTR_BASE        294
+# define       PTR_EXTENT      295
+# define       STRING_FUNC_NAME        296
+# define       VAR_FUNC_NAME   297
+# define       ASSIGN  298
+# define       OROR    299
+# define       ANDAND  300
+# define       EQCOMPARE       301
+# define       ARITHCOMPARE    302
+# define       LSHIFT  303
+# define       RSHIFT  304
+# define       UNARY   305
+# define       PLUSPLUS        306
+# define       MINUSMINUS      307
+# define       HYPERUNARY      308
+# define       POINTSAT        309
+# define       INTERFACE       310
+# define       IMPLEMENTATION  311
+# define       END     312
+# define       SELECTOR        313
+# define       DEFS    314
+# define       ENCODE  315
+# define       CLASSNAME       316
+# define       PUBLIC  317
+# define       PRIVATE 318
+# define       PROTECTED       319
+# define       PROTOCOL        320
+# define       OBJECTNAME      321
+# define       CLASS   322
+# define       ALIAS   323
+
 #line 34 "c-parse.y"
 
 #include "config.h"
@@ -261,34 +138,12 @@
   malloced_yyvs = (void *) newvs;                                      \
 } while (0)
 
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
+#line 103 "c-parse.y"
+#ifndef YYSTYPE
+typedef union {long itype; tree ttype; enum tree_code code;
+       const char *filename; int lineno; } yystype;
+# define YYSTYPE yystype
 #endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)



Home | Main Index | Thread Index | Old Index