OSDN Git Service

PR c/14765
[pf3gnuchains/gcc-fork.git] / gcc / c-parse.in
index 14a0253..b89c19d 100644 (file)
@@ -1,6 +1,6 @@
 /* YACC parser for C syntax and for Objective C.  -*-c-*-
-   Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996,
-   1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
+   1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -20,60 +20,90 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 /* This file defines the grammar of C and that of Objective C.
-   ifobjc ... end ifobjc  conditionals contain code for Objective C only.
-   ifc ... end ifc  conditionals contain code for C only.
+   @@ifobjc ... @@end_ifobjc  conditionals contain code for Objective C only.
+   @@ifc ... @@end_ifc  conditionals contain code for C only.
    Sed commands in Makefile.in are used to convert this file into
    c-parse.y and into objc-parse.y.  */
 
 /* To whomever it may concern: I have heard that such a thing was once
    written by AT&T, but I have never seen it.  */
 
-ifobjc
-%expect 31 /* shift/reduce conflicts, and 1 reduce/reduce conflict.  */
-end ifobjc
-ifc
+@@ifc
 %expect 10 /* shift/reduce conflicts, and no reduce/reduce conflicts.  */
-end ifc
+@@end_ifc
 
 %{
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
+#include "langhooks.h"
 #include "input.h"
 #include "cpplib.h"
 #include "intl.h"
 #include "timevar.h"
-#include "c-lex.h"
+#include "c-pragma.h"          /* For YYDEBUG definition, and parse_in.  */
 #include "c-tree.h"
-#include "c-pragma.h"
 #include "flags.h"
+#include "varray.h"
 #include "output.h"
 #include "toplev.h"
 #include "ggc.h"
-#include "diagnostic.h"  
-  
-#ifdef MULTIBYTE_CHARS
-#include <locale.h>
-#endif
 
-ifobjc
+@@ifobjc
 #include "objc-act.h"
-end ifobjc
+@@end_ifobjc
 
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
-/* Cause the "yydebug" variable to be defined.  */
-#define YYDEBUG 1
-
-/* Rename the "yyparse" function so that we can override it elsewhere.  */
-#define yyparse yyparse_1
+/* Like the default stack expander, except (1) use realloc when possible,
+   (2) impose no hard maxiumum on stack size, (3) REALLY do not use alloca.
+
+   Irritatingly, YYSTYPE is defined after this %{ %} block, so we cannot
+   give malloced_yyvs its proper type.  This is ok since all we need from
+   it is to be able to free it.  */
+
+static short *malloced_yyss;
+static void *malloced_yyvs;
+
+#define yyoverflow(MSG, SS, SSSIZE, VS, VSSIZE, YYSSZ)                 \
+do {                                                                   \
+  size_t newsize;                                                      \
+  short *newss;                                                                \
+  YYSTYPE *newvs;                                                      \
+  newsize = *(YYSSZ) *= 2;                                             \
+  if (malloced_yyss)                                                   \
+    {                                                                  \
+      newss = really_call_realloc (*(SS), newsize * sizeof (short));   \
+      newvs = really_call_realloc (*(VS), newsize * sizeof (YYSTYPE)); \
+    }                                                                  \
+  else                                                                 \
+    {                                                                  \
+      newss = really_call_malloc (newsize * sizeof (short));           \
+      newvs = really_call_malloc (newsize * sizeof (YYSTYPE));         \
+      if (newss)                                                       \
+        memcpy (newss, *(SS), (SSSIZE));                               \
+      if (newvs)                                                       \
+        memcpy (newvs, *(VS), (VSSIZE));                               \
+    }                                                                  \
+  if (!newss || !newvs)                                                        \
+    {                                                                  \
+      yyerror (MSG);                                                   \
+      return 2;                                                                \
+    }                                                                  \
+  *(SS) = newss;                                                       \
+  *(VS) = newvs;                                                       \
+  malloced_yyss = newss;                                               \
+  malloced_yyvs = (void *) newvs;                                      \
+} while (0)
 %}
 
 %start program
 
 %union {long itype; tree ttype; enum tree_code code;
-       const char *filename; int lineno; }
+       location_t location; }
 
 /* All identifiers that are not reserved words
    and are not declared typedefs in the current block */
@@ -86,7 +116,8 @@ end ifobjc
 
 /* Reserved words that specify storage class.
    yylval contains an IDENTIFIER_NODE which indicates which one.  */
-%token SCSPEC
+%token SCSPEC                  /* Storage class other than static.  */
+%token STATIC                  /* Static storage class.  */
 
 /* Reserved words that specify type.
    yylval contains an IDENTIFIER_NODE which indicates which one.  */
@@ -102,6 +133,7 @@ end ifobjc
 
 /* String constants in raw form.
    yylval is a STRING_CST node.  */
+
 %token STRING
 
 /* "...", used for functions with variable arglists.  */
@@ -112,11 +144,9 @@ end ifobjc
 %token SIZEOF ENUM STRUCT UNION IF ELSE WHILE DO FOR SWITCH CASE DEFAULT
 %token BREAK CONTINUE RETURN GOTO ASM_KEYWORD TYPEOF ALIGNOF
 %token ATTRIBUTE EXTENSION LABEL
-%token REALPART IMAGPART VA_ARG
+%token REALPART IMAGPART VA_ARG CHOOSE_EXPR TYPES_COMPATIBLE_P
 %token PTR_VALUE PTR_BASE PTR_EXTENT
-
-/* function name can be a string const or a var decl. */
-%token STRING_FUNC_NAME VAR_FUNC_NAME
+%token FUNC_NAME OFFSETOF
 
 /* Add precedence rules to solve dangling else s/r conflict */
 %nonassoc IF
@@ -146,13 +176,15 @@ end ifobjc
    Objective C, so that the token codes are the same in both.  */
 %token INTERFACE IMPLEMENTATION END SELECTOR DEFS ENCODE
 %token CLASSNAME PUBLIC PRIVATE PROTECTED PROTOCOL OBJECTNAME CLASS ALIAS
+%token AT_THROW AT_TRY AT_CATCH AT_FINALLY AT_SYNCHRONIZED
+%token OBJC_STRING
 
 %type <code> unop
 %type <ttype> ENUM STRUCT UNION IF ELSE WHILE DO FOR SWITCH CASE DEFAULT
 %type <ttype> BREAK CONTINUE RETURN GOTO ASM_KEYWORD SIZEOF TYPEOF ALIGNOF
 
 %type <ttype> identifier IDENTIFIER TYPENAME CONSTANT expr nonnull_exprlist exprlist
-%type <ttype> expr_no_commas cast_expr unary_expr primary string STRING
+%type <ttype> expr_no_commas cast_expr unary_expr primary STRING
 %type <ttype> declspecs_nosc_nots_nosa_noea declspecs_nosc_nots_nosa_ea
 %type <ttype> declspecs_nosc_nots_sa_noea declspecs_nosc_nots_sa_ea
 %type <ttype> declspecs_nosc_ts_nosa_noea declspecs_nosc_ts_nosa_ea
@@ -167,16 +199,17 @@ end ifobjc
 %type <ttype> maybe_type_quals_attrs typespec_nonattr typespec_attr
 %type <ttype> typespec_reserved_nonattr typespec_reserved_attr
 %type <ttype> typespec_nonreserved_nonattr
+%type <ttype> offsetof_member_designator
 
-%type <ttype> SCSPEC TYPESPEC TYPE_QUAL maybe_type_qual
-%type <ttype> initdecls notype_initdecls initdcl notype_initdcl
-%type <ttype> init maybeasm
+%type <ttype> scspec SCSPEC STATIC TYPESPEC TYPE_QUAL maybe_volatile
+%type <ttype> initdecls notype_initdecls initdcl notype_initdcl init
+%type <ttype> simple_asm_expr maybeasm asm_stmt asm_argument
 %type <ttype> asm_operands nonnull_asm_operands asm_operand asm_clobbers
 %type <ttype> maybe_attribute attributes attribute attribute_list attrib
-%type <ttype> any_word extension
+%type <ttype> any_word
 
 %type <ttype> compstmt compstmt_start compstmt_nostart compstmt_primary_start
-%type <ttype> do_stmt_start poplevel stmt label
+%type <ttype> do_stmt_start pop_scope stmt label
 
 %type <ttype> c99_block_start c99_block_end
 %type <ttype> declarator
@@ -199,12 +232,11 @@ end ifobjc
 %type <ttype> parmlist_or_identifiers parmlist_or_identifiers_1
 %type <ttype> identifiers_or_typenames
 
-%type <itype> setspecs setspecs_fp
+%type <itype> setspecs setspecs_fp extension
 
-%type <filename> save_filename
-%type <lineno> save_lineno
+%type <location> save_location
 \f
-ifobjc
+@@ifobjc
 /* the Objective-C nonterminals */
 
 %type <ttype> ivar_decl_list ivar_decls ivar_decl ivars ivar_declarator
@@ -213,34 +245,37 @@ ifobjc
 %type <ttype> keywordexpr keywordarglist keywordarg
 %type <ttype> myparms myparm optparmlist reservedwords objcselectorexpr
 %type <ttype> selectorarg keywordnamelist keywordname objcencodeexpr
-%type <ttype> objc_string non_empty_protocolrefs protocolrefs identifier_list objcprotocolexpr
+%type <ttype> non_empty_protocolrefs protocolrefs identifier_list objcprotocolexpr
 
-%type <ttype> CLASSNAME OBJECTNAME
-end ifobjc
+%type <ttype> CLASSNAME OBJECTNAME OBJC_STRING
+
+%type <ttype> superclass
+%type <itype> objc_try_catch_stmt objc_finally_block
+@@end_ifobjc
 \f
 %{
-/* Number of statements (loosely speaking) and compound statements 
+/* Number of statements (loosely speaking) and compound statements
    seen so far.  */
 static int stmt_count;
 static int compstmt_count;
-  
-/* Input file and line number of the end of the body of last simple_if;
+
+/* Input location of the end of the body of last simple_if;
    used by the stmt-rule immediately after simple_if returns.  */
-static const char *if_stmt_file;
-static int if_stmt_line;
+static location_t if_stmt_locus;
+
 
 /* List of types and structure classes of the current declaration.  */
-static tree current_declspecs = NULL_TREE;
-static tree prefix_attributes = NULL_TREE;
+static GTY(()) tree current_declspecs;
+static GTY(()) tree prefix_attributes;
 
 /* List of all the attributes applying to the identifier currently being
    declared; includes prefix_attributes and possibly some more attributes
    just after a comma.  */
-static tree all_prefix_attributes = NULL_TREE;
+static GTY(()) tree all_prefix_attributes;
 
 /* Stack of saved values of current_declspecs, prefix_attributes and
    all_prefix_attributes.  */
-static tree declspec_stack;
+static GTY(()) tree declspec_stack;
 
 /* PUSH_DECLSPEC_STACK is called from setspecs; POP_DECLSPEC_STACK
    should be called from the productions making use of setspecs.  */
@@ -262,54 +297,54 @@ static tree declspec_stack;
 
 /* For __extension__, save/restore the warning flags which are
    controlled by __extension__.  */
-#define SAVE_WARN_FLAGS()      \
-       size_int (pedantic | (warn_pointer_arith << 1))
-#define RESTORE_WARN_FLAGS(tval) \
-  do {                                     \
-    int val = tree_low_cst (tval, 0);      \
-    pedantic = val & 1;                    \
-    warn_pointer_arith = (val >> 1) & 1;   \
+#define SAVE_EXT_FLAGS()               \
+       (pedantic                       \
+        | (warn_pointer_arith << 1)    \
+        | (warn_traditional << 2)      \
+        | (flag_iso << 3))
+
+#define RESTORE_EXT_FLAGS(val)                 \
+  do {                                         \
+    pedantic = val & 1;                                \
+    warn_pointer_arith = (val >> 1) & 1;       \
+    warn_traditional = (val >> 2) & 1;         \
+    flag_iso = (val >> 3) & 1;                 \
   } while (0)
 
-ifobjc
+@@ifobjc
 /* Objective-C specific parser/lexer information */
 
 static enum tree_code objc_inherit_code;
 static int objc_pq_context = 0, objc_public_flag = 0;
 
 /* The following flag is needed to contextualize ObjC lexical analysis.
-   In some cases (e.g., 'int NSObject;'), it is undesirable to bind 
-   an identifier to an ObjC class, even if a class with that name 
+   In some cases (e.g., 'int NSObject;'), it is undesirable to bind
+   an identifier to an ObjC class, even if a class with that name
    exists.  */
 static int objc_need_raw_identifier;
 #define OBJC_NEED_RAW_IDENTIFIER(VAL)  objc_need_raw_identifier = VAL
-end ifobjc
+@@end_ifobjc
 
-ifc
+@@ifc
 #define OBJC_NEED_RAW_IDENTIFIER(VAL)  /* nothing */
-end ifc
+@@end_ifc
 
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
 
-static void yyprint      PARAMS ((FILE *, int, YYSTYPE));
-static void yyerror      PARAMS ((const char *));
-static int yylexname     PARAMS ((void));
-static inline int _yylex  PARAMS ((void));
-static int  yylex        PARAMS ((void));
-static void init_reswords PARAMS ((void));
+static void yyprint (FILE *, int, YYSTYPE);
+static void yyerror (const char *);
+static int yylexname (void);
+static inline int _yylex (void);
+static int  yylex (void);
+static void init_reswords (void);
 
-/* Add GC roots for variables local to this file.  */
+  /* Initialisation routine for this file.  */
 void
-c_parse_init ()
+c_parse_init (void)
 {
   init_reswords ();
-
-  ggc_add_tree_root (&declspec_stack, 1);
-  ggc_add_tree_root (&current_declspecs, 1);
-  ggc_add_tree_root (&prefix_attributes, 1);
-  ggc_add_tree_root (&all_prefix_attributes, 1);
 }
 
 %}
@@ -318,19 +353,8 @@ c_parse_init ()
 program: /* empty */
                { if (pedantic)
                    pedwarn ("ISO C forbids an empty source file");
-                 finish_file ();
                }
        | extdefs
-               {
-                 /* In case there were missing closebraces,
-                    get us back to the global binding level.  */
-                 while (! global_bindings_p ())
-                   poplevel (0, 0, 0);
-ifc
-                 finish_fname_decls ();
-end ifc
-                  finish_file ();
-               }
        ;
 
 /* the reason for the strange actions in this rule
@@ -345,27 +369,20 @@ extdefs:
 extdef:
        fndef
        | datadef
-ifobjc
-       | objcdef
-end ifobjc
-       | ASM_KEYWORD '(' expr ')' ';'
-               { STRIP_NOPS ($3);
-                 if ((TREE_CODE ($3) == ADDR_EXPR
-                      && TREE_CODE (TREE_OPERAND ($3, 0)) == STRING_CST)
-                     || TREE_CODE ($3) == STRING_CST)
-                   assemble_asm ($3);
-                 else
-                   error ("argument of `asm' is not a constant string"); }
+       | asmdef
        | extension extdef
-               { RESTORE_WARN_FLAGS ($1); }
+               { RESTORE_EXT_FLAGS ($1); }
+@@ifobjc
+       | objcdef
+@@end_ifobjc
        ;
 
 datadef:
          setspecs notype_initdecls ';'
                { if (pedantic)
                    error ("ISO C forbids data definition with no type or storage class");
-                 else if (!flag_traditional)
-                   warning ("data definition has no type or storage class"); 
+                 else
+                   warning ("data definition has no type or storage class");
 
                  POP_DECLSPEC_STACK; }
         | declspecs_nots setspecs notype_initdecls ';'
@@ -387,12 +404,11 @@ fndef:
                                        all_prefix_attributes))
                    YYERROR1;
                }
-         old_style_parm_decls
-               { store_parm_decls (); }
-         save_filename save_lineno compstmt_or_error
-               { DECL_SOURCE_FILE (current_function_decl) = $7;
-                 DECL_SOURCE_LINE (current_function_decl) = $8;
-                 finish_function (0); 
+         old_style_parm_decls save_location
+               { DECL_SOURCE_LOCATION (current_function_decl) = $6;
+                 store_parm_decls (); }
+         compstmt_or_error
+               { finish_function ();
                  POP_DECLSPEC_STACK; }
        | declspecs_ts setspecs declarator error
                { POP_DECLSPEC_STACK; }
@@ -401,12 +417,11 @@ fndef:
                                        all_prefix_attributes))
                    YYERROR1;
                }
-         old_style_parm_decls
-               { store_parm_decls (); }
-         save_filename save_lineno compstmt_or_error
-               { DECL_SOURCE_FILE (current_function_decl) = $7;
-                 DECL_SOURCE_LINE (current_function_decl) = $8;
-                 finish_function (0); 
+         old_style_parm_decls save_location
+               { DECL_SOURCE_LOCATION (current_function_decl) = $6;
+                 store_parm_decls (); }
+         compstmt_or_error
+               { finish_function ();
                  POP_DECLSPEC_STACK; }
        | declspecs_nots setspecs notype_declarator error
                { POP_DECLSPEC_STACK; }
@@ -415,12 +430,11 @@ fndef:
                                        all_prefix_attributes))
                    YYERROR1;
                }
-         old_style_parm_decls
-               { store_parm_decls (); }
-         save_filename save_lineno compstmt_or_error
-               { DECL_SOURCE_FILE (current_function_decl) = $6;
-                 DECL_SOURCE_LINE (current_function_decl) = $7;
-                 finish_function (0); 
+         old_style_parm_decls save_location
+               { DECL_SOURCE_LOCATION (current_function_decl) = $5;
+                 store_parm_decls (); }
+         compstmt_or_error
+               { finish_function ();
                  POP_DECLSPEC_STACK; }
        | setspecs notype_declarator error
                { POP_DECLSPEC_STACK; }
@@ -429,10 +443,10 @@ fndef:
 identifier:
        IDENTIFIER
        | TYPENAME
-ifobjc
+@@ifobjc
        | OBJECTNAME
        | CLASSNAME
-end ifobjc
+@@end_ifobjc
        ;
 
 unop:     '&'
@@ -441,10 +455,10 @@ unop:     '&'
                { $$ = NEGATE_EXPR; }
        | '+'
                { $$ = CONVERT_EXPR;
-ifc
+@@ifc
   if (warn_traditional && !in_system_header)
     warning ("traditional C rejects the unary plus operator");
-end ifc
+@@end_ifc
                }
        | PLUSPLUS
                { $$ = PREINCREMENT_EXPR; }
@@ -480,28 +494,13 @@ unary_expr:
        /* __extension__ turns off -pedantic for following primary.  */
        | extension cast_expr     %prec UNARY
                { $$ = $2;
-                 RESTORE_WARN_FLAGS ($1); }
+                 RESTORE_EXT_FLAGS ($1); }
        | unop cast_expr  %prec UNARY
                { $$ = build_unary_op ($1, $2, 0);
                  overflow_warning ($$); }
        /* Refer to the address of a label as a pointer.  */
        | ANDAND identifier
                { $$ = finish_label_address_expr ($2); }
-/* This seems to be impossible on some machines, so let's turn it off.
-   You can use __builtin_next_arg to find the anonymous stack args.
-       | '&' ELLIPSIS
-               { tree types = TYPE_ARG_TYPES (TREE_TYPE (current_function_decl));
-                 $$ = error_mark_node;
-                 if (TREE_VALUE (tree_last (types)) == void_type_node)
-                   error ("`&...' used in function with fixed number of arguments");
-                 else
-                   {
-                     if (pedantic)
-                       pedwarn ("ISO C forbids `&...'");
-                     $$ = tree_last (DECL_ARGUMENTS (current_function_decl));
-                     $$ = build_unary_op (ADDR_EXPR, $$, 0);
-                   } }
-*/
        | sizeof unary_expr  %prec UNARY
                { skip_evaluation--;
                  if (TREE_CODE ($2) == COMPONENT_REF
@@ -531,6 +530,10 @@ alignof:
        ALIGNOF { skip_evaluation++; }
        ;
 
+typeof:
+       TYPEOF { skip_evaluation++; }
+       ;
+
 cast_expr:
        unary_expr
        | '(' typename ')' cast_expr  %prec UNARY
@@ -564,35 +567,38 @@ expr_no_commas:
        | expr_no_commas '^' expr_no_commas
                { $$ = parser_build_binary_op ($2, $1, $3); }
        | expr_no_commas ANDAND
-               { $1 = truthvalue_conversion (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_false_node; }
+               { $1 = lang_hooks.truthvalue_conversion
+                   (default_conversion ($1));
+                 skip_evaluation += $1 == truthvalue_false_node; }
          expr_no_commas
-               { skip_evaluation -= $1 == boolean_false_node;
+               { skip_evaluation -= $1 == truthvalue_false_node;
                  $$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $4); }
        | expr_no_commas OROR
-               { $1 = truthvalue_conversion (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_true_node; }
+               { $1 = lang_hooks.truthvalue_conversion
+                   (default_conversion ($1));
+                 skip_evaluation += $1 == truthvalue_true_node; }
          expr_no_commas
-               { skip_evaluation -= $1 == boolean_true_node;
+               { skip_evaluation -= $1 == truthvalue_true_node;
                  $$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $4); }
        | expr_no_commas '?'
-               { $1 = truthvalue_conversion (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_false_node; }
+               { $1 = lang_hooks.truthvalue_conversion
+                   (default_conversion ($1));
+                 skip_evaluation += $1 == truthvalue_false_node; }
           expr ':'
-               { skip_evaluation += (($1 == boolean_true_node)
-                                     - ($1 == boolean_false_node)); }
+               { skip_evaluation += (($1 == truthvalue_true_node)
+                                     - ($1 == truthvalue_false_node)); }
          expr_no_commas
-               { skip_evaluation -= $1 == boolean_true_node;
+               { skip_evaluation -= $1 == truthvalue_true_node;
                  $$ = build_conditional_expr ($1, $4, $7); }
        | expr_no_commas '?'
                { if (pedantic)
                    pedwarn ("ISO C forbids omitting the middle term of a ?: expression");
                  /* Make sure first operand is calculated only once.  */
-                 $<ttype>2 = save_expr ($1);
-                 $1 = truthvalue_conversion (default_conversion ($<ttype>2));
-                 skip_evaluation += $1 == boolean_true_node; }
+                 $<ttype>2 = save_expr (default_conversion ($1));
+                 $1 = lang_hooks.truthvalue_conversion ($<ttype>2);
+                 skip_evaluation += $1 == truthvalue_true_node; }
          ':' expr_no_commas
-               { skip_evaluation -= $1 == boolean_true_node;
+               { skip_evaluation -= $1 == truthvalue_true_node;
                  $$ = build_conditional_expr ($1, $<ttype>2, $5); }
        | expr_no_commas '=' expr_no_commas
                { char class;
@@ -604,7 +610,8 @@ expr_no_commas:
        | expr_no_commas ASSIGN expr_no_commas
                { char class;
                  $$ = build_modify_expr ($1, $2, $3);
-                 /* This inhibits warnings in truthvalue_conversion.  */
+                 /* This inhibits warnings in
+                    c_common_truthvalue_conversion.  */
                  class = TREE_CODE_CLASS (TREE_CODE ($$));
                  if (IS_EXPR_CODE_CLASS (class))
                    C_SET_EXP_ORIGINAL_CODE ($$, ERROR_MARK);
@@ -619,38 +626,21 @@ primary:
                  $$ = build_external_ref ($1, yychar == '(');
                }
        | CONSTANT
-       | string
-               { $$ = combine_strings ($1); }
-       | VAR_FUNC_NAME
+       | STRING
+       | FUNC_NAME
                { $$ = fname_decl (C_RID_CODE ($$), $$); }
-       | '(' typename ')' '{' 
+       | '(' typename ')' '{'
                { start_init (NULL_TREE, NULL, 0);
                  $2 = groktypename ($2);
                  really_start_incremental_init ($2); }
          initlist_maybe_comma '}'  %prec UNARY
-               { const char *name;
-                 tree result = pop_init_level (0);
+               { tree constructor = pop_init_level (0);
                  tree type = $2;
                  finish_init ();
 
                  if (pedantic && ! flag_isoc99)
-                   pedwarn ("ISO C89 forbids compound literals");
-                 if (TYPE_NAME (type) != 0)
-                   {
-                     if (TREE_CODE (TYPE_NAME (type)) == IDENTIFIER_NODE)
-                       name = IDENTIFIER_POINTER (TYPE_NAME (type));
-                     else
-                       name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
-                   }
-                 else
-                   name = "";
-                 $$ = result;
-                 if (TREE_CODE (type) == ARRAY_TYPE && !COMPLETE_TYPE_P (type))
-                   {
-                     int failure = complete_array_type (type, $$, 1);
-                     if (failure)
-                       abort ();
-                   }
+                   pedwarn ("ISO C90 forbids compound literals");
+                 $$ = build_compound_literal (type, constructor);
                }
        | '(' expr ')'
                { char class = TREE_CODE_CLASS (TREE_CODE ($2));
@@ -664,8 +654,6 @@ primary:
 
                   if (pedantic)
                     pedwarn ("ISO C forbids braced-groups within expressions");
-                 pop_label_level ();
-
                  saved_last_tree = COMPOUND_BODY ($1);
                  RECHAIN_STMTS ($1, COMPOUND_BODY ($1));
                  last_tree = saved_last_tree;
@@ -674,10 +662,10 @@ primary:
                    last_expr_type = void_type_node;
                  $$ = build1 (STMT_EXPR, last_expr_type, $1);
                  TREE_SIDE_EFFECTS ($$) = 1;
+                 annotate_with_locus ($$, input_location);
                }
        | compstmt_primary_start error ')'
                {
-                 pop_label_level ();
                  last_tree = COMPOUND_BODY ($1);
                  TREE_CHAIN (last_tree) = NULL_TREE;
                  $$ = error_mark_node;
@@ -686,33 +674,51 @@ primary:
                { $$ = build_function_call ($1, $3); }
        | VA_ARG '(' expr_no_commas ',' typename ')'
                { $$ = build_va_arg ($3, groktypename ($5)); }
+
+       | OFFSETOF '(' typename ',' offsetof_member_designator ')'
+               { $$ = build_offsetof (groktypename ($3), $5); }
+       | OFFSETOF '(' error ')'
+               { $$ = error_mark_node; }
+       | CHOOSE_EXPR '(' expr_no_commas ',' expr_no_commas ','
+                         expr_no_commas ')'
+               {
+                  tree c;
+
+                  c = fold ($3);
+                  STRIP_NOPS (c);
+                  if (TREE_CODE (c) != INTEGER_CST)
+                    error ("first argument to __builtin_choose_expr not"
+                          " a constant");
+                  $$ = integer_zerop (c) ? $7 : $5;
+               }
+       | CHOOSE_EXPR '(' error ')'
+               { $$ = error_mark_node; }
+       | TYPES_COMPATIBLE_P '(' typename ',' typename ')'
+               {
+                 tree e1, e2;
+
+                 e1 = TYPE_MAIN_VARIANT (groktypename ($3));
+                 e2 = TYPE_MAIN_VARIANT (groktypename ($5));
+
+                 $$ = comptypes (e1, e2, COMPARE_STRICT)
+                   ? build_int_2 (1, 0) : build_int_2 (0, 0);
+               }
+       | TYPES_COMPATIBLE_P '(' error ')'
+               { $$ = error_mark_node; }
        | primary '[' expr ']'   %prec '.'
                { $$ = build_array_ref ($1, $3); }
        | primary '.' identifier
-               {
-ifobjc
-                   if (!is_public ($1, $3))
-                     $$ = error_mark_node;
-                   else
-end ifobjc
-                     $$ = build_component_ref ($1, $3);
-               }
+               { $$ = build_component_ref ($1, $3); }
        | primary POINTSAT identifier
                {
                   tree expr = build_indirect_ref ($1, "->");
-
-ifobjc
-                     if (!is_public (expr, $3))
-                       $$ = error_mark_node;
-                     else
-end ifobjc
-                       $$ = build_component_ref (expr, $3);
+                 $$ = build_component_ref (expr, $3);
                }
        | primary PLUSPLUS
                { $$ = build_unary_op (POSTINCREMENT_EXPR, $1, 0); }
        | primary MINUSMINUS
                { $$ = build_unary_op (POSTDECREMENT_EXPR, $1, 0); }
-ifobjc
+@@ifobjc
        | objcmessageexpr
                { $$ = build_message_expr ($1); }
        | objcselectorexpr
@@ -721,60 +727,36 @@ ifobjc
                { $$ = build_protocol_expr ($1); }
        | objcencodeexpr
                { $$ = build_encode_expr ($1); }
-       | objc_string
+       | OBJC_STRING
                { $$ = build_objc_string_object ($1); }
-end ifobjc
+@@end_ifobjc
        ;
 
-/* Produces a STRING_CST with perhaps more STRING_CSTs chained onto it.  */
-string:
-         STRING
-       | string STRING
-               {
-ifc
-                  static int last_lineno = 0;
-                  static const char *last_input_filename = 0;
-end ifc
-                  $$ = chainon ($1, $2);
-ifc
-                 if (warn_traditional && !in_system_header
-                     && (lineno != last_lineno || !last_input_filename ||
-                         strcmp (last_input_filename, input_filename)))
-                   {
-                     warning ("traditional C rejects string concatenation");
-                     last_lineno = lineno;
-                     last_input_filename = input_filename;
-                   }
-end ifc
-               }
-       ;
+/* This is the second argument to __builtin_offsetof.  We must have one
+   identifier, and beyond that we want to accept sub structure and sub
+   array references.  We return tree list where each element has
+   PURPOSE set for component refs or VALUE set for array refs.  We'll
+   turn this into something real inside build_offsetof.  */
 
-ifobjc
-/* Produces an STRING_CST with perhaps more STRING_CSTs chained
-   onto it, which is to be read as an ObjC string object.  */
-objc_string:
-         '@' STRING
-               { $$ = $2; }
-       | objc_string '@' STRING
-               { $$ = chainon ($1, $3); }
+offsetof_member_designator:
+         identifier
+               { $$ = tree_cons ($1, NULL_TREE, NULL_TREE); }
+       | offsetof_member_designator '.' identifier
+               { $$ = tree_cons ($3, NULL_TREE, $1); }
+       | offsetof_member_designator '[' expr ']'
+               { $$ = tree_cons (NULL_TREE, $3, $1); }
        ;
-end ifobjc
 
 old_style_parm_decls:
        /* empty */
        | datadecls
-       | datadecls ELLIPSIS
-               /* ... is used here to indicate a varargs function.  */
-               { c_mark_varargs ();
-                 if (pedantic)
-                   pedwarn ("ISO C does not permit use of `varargs.h'"); }
        ;
 
 /* The following are analogous to lineno_decl, decls and decl
    except that they do not allow nested functions.
    They are used for old-style parm decls.  */
 lineno_datadecl:
-         save_filename save_lineno datadecl
+         save_location datadecl
                { }
        ;
 
@@ -806,7 +788,7 @@ datadecl:
    This is to avoid shift/reduce conflicts in contexts
    where statement labels are allowed.  */
 lineno_decl:
-         save_filename save_lineno decl
+         save_location decl
                { }
        ;
 
@@ -841,12 +823,12 @@ decl:
        | declspecs ';'
                { shadow_tag ($1); }
        | extension decl
-               { RESTORE_WARN_FLAGS ($1); }
+               { RESTORE_EXT_FLAGS ($1); }
        ;
 
 /* A list of declaration specifiers.  These are:
 
-   - Storage class specifiers (SCSPEC), which for GCC currently include
+   - Storage class specifiers (scspec), which for GCC currently includes
    function specifiers ("inline").
 
    - Type specifiers (typespec_*).
@@ -1017,7 +999,7 @@ declspecs_nosc_ts_sa_ea:
        ;
 
 declspecs_sc_nots_nosa_noea:
-         SCSPEC
+         scspec
                { $$ = tree_cons (NULL_TREE, $1, NULL_TREE);
                  TREE_STATIC ($$) = 0; }
        | declspecs_sc_nots_nosa_noea TYPE_QUAL
@@ -1026,25 +1008,25 @@ declspecs_sc_nots_nosa_noea:
        | declspecs_sc_nots_nosa_ea TYPE_QUAL
                { $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = 1; }
-       | declspecs_nosc_nots_nosa_noea SCSPEC
+       | declspecs_nosc_nots_nosa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_nosc_nots_nosa_ea SCSPEC
+       | declspecs_nosc_nots_nosa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_nots_nosa_noea SCSPEC
+       | declspecs_sc_nots_nosa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_nots_nosa_ea SCSPEC
+       | declspecs_sc_nots_nosa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
@@ -1065,25 +1047,25 @@ declspecs_sc_nots_sa_noea:
        | declspecs_sc_nots_sa_ea TYPE_QUAL
                { $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = 1; }
-       | declspecs_nosc_nots_sa_noea SCSPEC
+       | declspecs_nosc_nots_sa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_nosc_nots_sa_ea SCSPEC
+       | declspecs_nosc_nots_sa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_nots_sa_noea SCSPEC
+       | declspecs_sc_nots_sa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_nots_sa_ea SCSPEC
+       | declspecs_sc_nots_sa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
@@ -1116,25 +1098,25 @@ declspecs_sc_ts_nosa_noea:
        | declspecs_sc_nots_nosa_ea typespec_nonattr
                { $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = 1; }
-       | declspecs_nosc_ts_nosa_noea SCSPEC
+       | declspecs_nosc_ts_nosa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_nosc_ts_nosa_ea SCSPEC
+       | declspecs_nosc_ts_nosa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_ts_nosa_noea SCSPEC
+       | declspecs_sc_ts_nosa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_ts_nosa_ea SCSPEC
+       | declspecs_sc_ts_nosa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
@@ -1179,25 +1161,25 @@ declspecs_sc_ts_sa_noea:
        | declspecs_sc_nots_sa_ea typespec_nonattr
                { $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = 1; }
-       | declspecs_nosc_ts_sa_noea SCSPEC
+       | declspecs_nosc_ts_sa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_nosc_ts_sa_ea SCSPEC
+       | declspecs_nosc_ts_sa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_ts_sa_noea SCSPEC
+       | declspecs_sc_ts_sa_noea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = TREE_STATIC ($1); }
-       | declspecs_sc_ts_sa_ea SCSPEC
+       | declspecs_sc_ts_sa_ea scspec
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
@@ -1357,7 +1339,7 @@ typespec_nonreserved_nonattr:
                { /* For a typedef name, record the meaning, not the name.
                     In case of `foo foo, bar;'.  */
                  $$ = lookup_name ($1); }
-ifobjc
+@@ifobjc
        | CLASSNAME protocolrefs
                { $$ = get_static_reference ($1, $2); }
        | OBJECTNAME protocolrefs
@@ -1367,11 +1349,15 @@ ifobjc
    - nisse@lysator.liu.se */
         | non_empty_protocolrefs
                 { $$ = get_object_reference ($1); }
-end ifobjc
-       | TYPEOF '(' expr ')'
-               { $$ = TREE_TYPE ($3); }
-       | TYPEOF '(' typename ')'
-               { $$ = groktypename ($3); }
+@@end_ifobjc
+       | typeof '(' expr ')'
+               { skip_evaluation--;
+                 if (TREE_CODE ($3) == COMPONENT_REF
+                     && DECL_C_BIT_FIELD (TREE_OPERAND ($3, 1)))
+                   error ("`typeof' applied to a bit-field");
+                 $$ = TREE_TYPE ($3); }
+       | typeof '(' typename ')'
+               { skip_evaluation--; $$ = groktypename ($3); }
        ;
 
 /* typespec_nonreserved_attr does not exist.  */
@@ -1386,15 +1372,6 @@ notype_initdecls:
        | notype_initdecls ',' maybe_resetattrs notype_initdcl
        ;
 
-maybeasm:
-         /* empty */
-               { $$ = NULL_TREE; }
-       | ASM_KEYWORD '(' string ')'
-               { if (TREE_CHAIN ($3)) $3 = combine_strings ($3);
-                 $$ = $3;
-               }
-       ;
-
 initdcl:
          declarator maybeasm maybe_attribute '='
                { $<ttype>$ = start_decl ($1, current_declspecs, 1,
@@ -1407,7 +1384,7 @@ initdcl:
        | declarator maybeasm maybe_attribute
                { tree d = start_decl ($1, current_declspecs, 0,
                                       chainon ($3, all_prefix_attributes));
-                 finish_decl (d, NULL_TREE, $2); 
+                 finish_decl (d, NULL_TREE, $2);
                 }
        ;
 
@@ -1429,11 +1406,11 @@ notype_initdcl:
    so that the header files compile. */
 maybe_attribute:
       /* empty */
-               { $$ = NULL_TREE; }
+               { $$ = NULL_TREE; }
        | attributes
                { $$ = $1; }
        ;
+
 attributes:
       attribute
                { $$ = $1; }
@@ -1442,8 +1419,11 @@ attributes:
        ;
 
 attribute:
-      ATTRIBUTE '(' '(' attribute_list ')' ')'
-               { $$ = $4; }
+      ATTRIBUTE stop_string_translation
+                '(' '(' attribute_list ')' ')' start_string_translation
+               { $$ = $5; }
+      | ATTRIBUTE error start_string_translation
+                {}
        ;
 
 attribute_list:
@@ -1452,7 +1432,7 @@ attribute_list:
        | attribute_list ',' attrib
                { $$ = chainon ($1, $3); }
        ;
+
 attrib:
     /* empty */
                { $$ = NULL_TREE; }
@@ -1471,10 +1451,15 @@ attrib:
 
 any_word:
          identifier
-       | SCSPEC
+       | scspec
        | TYPESPEC
        | TYPE_QUAL
        ;
+
+scspec:
+         STATIC
+       | SCSPEC
+       ;
 \f
 /* Initializers.  `init' is the entry point.  */
 
@@ -1506,7 +1491,7 @@ initlist1:
 initelt:
          designator_list '=' initval
                { if (pedantic && ! flag_isoc99)
-                   pedwarn ("ISO C89 forbids specifying subobject to initialize"); }
+                   pedwarn ("ISO C90 forbids specifying subobject to initialize"); }
        | designator initval
                { if (pedantic)
                    pedwarn ("obsolete use of designated initializer without `='"); }
@@ -1515,6 +1500,7 @@ initelt:
                  if (pedantic)
                    pedwarn ("obsolete use of designated initializer with `:'"); }
          initval
+               {}
        | initval
        ;
 
@@ -1536,17 +1522,12 @@ designator_list:
 designator:
          '.' identifier
                { set_init_label ($2); }
-       /* These are for labeled elements.  The syntax for an array element
-          initializer conflicts with the syntax for an Objective-C message,
-          so don't include these productions in the Objective-C grammar.  */
-ifc
        | '[' expr_no_commas ELLIPSIS expr_no_commas ']'
                { set_init_index ($2, $4);
                  if (pedantic)
                    pedwarn ("ISO C forbids specifying range of elements to initialize"); }
        | '[' expr_no_commas ']'
                { set_init_index ($2, NULL_TREE); }
-end ifc
        ;
 \f
 nested_function:
@@ -1562,20 +1543,20 @@ nested_function:
                      YYERROR1;
                    }
                }
-          old_style_parm_decls
-               { store_parm_decls (); }
+          old_style_parm_decls save_location
+               { tree decl = current_function_decl;
+                 DECL_SOURCE_LOCATION (decl) = $4;
+                 store_parm_decls (); }
 /* This used to use compstmt_or_error.
    That caused a bug with input `f(g) int g {}',
    where the use of YYERROR1 above caused an error
    which then was handled by compstmt_or_error.
    There followed a repeated execution of that same rule,
    which called YYERROR1 again, and so on.  */
-         save_filename save_lineno compstmt
+         compstmt
                { tree decl = current_function_decl;
-                 DECL_SOURCE_FILE (decl) = $5;
-                 DECL_SOURCE_LINE (decl) = $6;
-                 finish_function (1);
-                 pop_function_context (); 
+                 finish_function ();
+                 pop_function_context ();
                  add_decl_stmt (decl); }
        ;
 
@@ -1592,20 +1573,20 @@ notype_nested_function:
                      YYERROR1;
                    }
                }
-         old_style_parm_decls
-               { store_parm_decls (); }
+         old_style_parm_decls save_location
+               { tree decl = current_function_decl;
+                 DECL_SOURCE_LOCATION (decl) = $4;
+                 store_parm_decls (); }
 /* This used to use compstmt_or_error.
    That caused a bug with input `f(g) int g {}',
    where the use of YYERROR1 above caused an error
    which then was handled by compstmt_or_error.
    There followed a repeated execution of that same rule,
    which called YYERROR1 again, and so on.  */
-         save_filename save_lineno compstmt
+         compstmt
                { tree decl = current_function_decl;
-                 DECL_SOURCE_FILE (decl) = $5;
-                 DECL_SOURCE_LINE (decl) = $6;
-                 finish_function (1);
-                 pop_function_context (); 
+                 finish_function ();
+                 pop_function_context ();
                  add_decl_stmt (decl); }
        ;
 
@@ -1624,17 +1605,14 @@ after_type_declarator:
                { $$ = $2 ? tree_cons ($2, $3, NULL_TREE) : $3; }
        | after_type_declarator '(' parmlist_or_identifiers  %prec '.'
                { $$ = build_nt (CALL_EXPR, $1, $3, NULL_TREE); }
-/*     | after_type_declarator '(' error ')'  %prec '.'
-               { $$ = build_nt (CALL_EXPR, $1, NULL_TREE, NULL_TREE);
-                 poplevel (0, 0, 0); }  */
        | after_type_declarator array_declarator  %prec '.'
                { $$ = set_array_declarator_type ($2, $1, 0); }
        | '*' maybe_type_quals_attrs after_type_declarator  %prec UNARY
                { $$ = make_pointer_declarator ($2, $3); }
        | TYPENAME
-ifobjc
+@@ifobjc
        | OBJECTNAME
-end ifobjc
+@@end_ifobjc
        ;
 
 /* Kinds of declarator that can appear in a parameter list
@@ -1649,23 +1627,17 @@ parm_declarator:
 parm_declarator_starttypename:
          parm_declarator_starttypename '(' parmlist_or_identifiers  %prec '.'
                { $$ = build_nt (CALL_EXPR, $1, $3, NULL_TREE); }
-/*     | parm_declarator_starttypename '(' error ')'  %prec '.'
-               { $$ = build_nt (CALL_EXPR, $1, NULL_TREE, NULL_TREE);
-                 poplevel (0, 0, 0); }  */
        | parm_declarator_starttypename array_declarator  %prec '.'
                { $$ = set_array_declarator_type ($2, $1, 0); }
        | TYPENAME
-ifobjc
+@@ifobjc
        | OBJECTNAME
-end ifobjc
+@@end_ifobjc
        ;
 
 parm_declarator_nostarttypename:
          parm_declarator_nostarttypename '(' parmlist_or_identifiers  %prec '.'
                { $$ = build_nt (CALL_EXPR, $1, $3, NULL_TREE); }
-/*     | parm_declarator_nostarttypename '(' error ')'  %prec '.'
-               { $$ = build_nt (CALL_EXPR, $1, NULL_TREE, NULL_TREE);
-                 poplevel (0, 0, 0); }  */
        | parm_declarator_nostarttypename array_declarator  %prec '.'
                { $$ = set_array_declarator_type ($2, $1, 0); }
        | '*' maybe_type_quals_attrs parm_declarator_starttypename  %prec UNARY
@@ -1682,9 +1654,6 @@ parm_declarator_nostarttypename:
 notype_declarator:
          notype_declarator '(' parmlist_or_identifiers  %prec '.'
                { $$ = build_nt (CALL_EXPR, $1, $3, NULL_TREE); }
-/*     | notype_declarator '(' error ')'  %prec '.'
-               { $$ = build_nt (CALL_EXPR, $1, NULL_TREE, NULL_TREE);
-                 poplevel (0, 0, 0); }  */
        | '(' maybe_attribute notype_declarator ')'
                { $$ = $2 ? tree_cons ($2, $3, NULL_TREE) : $3; }
        | '*' maybe_type_quals_attrs notype_declarator  %prec UNARY
@@ -1726,19 +1695,21 @@ structsp_attr:
                { $$ = start_struct (RECORD_TYPE, $2);
                  /* Start scope of tag before parsing components.  */
                }
-         component_decl_list '}' maybe_attribute 
-               { $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
+         component_decl_list '}' maybe_attribute
+               { $$ = finish_struct ($<ttype>4, nreverse ($5),
+                                     chainon ($1, $7)); }
        | struct_head '{' component_decl_list '}' maybe_attribute
                { $$ = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
-                                     $3, chainon ($1, $5));
+                                     nreverse ($3), chainon ($1, $5));
                }
        | union_head identifier '{'
                { $$ = start_struct (UNION_TYPE, $2); }
          component_decl_list '}' maybe_attribute
-               { $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
+               { $$ = finish_struct ($<ttype>4, nreverse ($5),
+                                     chainon ($1, $7)); }
        | union_head '{' component_decl_list '}' maybe_attribute
                { $$ = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
-                                     $3, chainon ($1, $5));
+                                     nreverse ($3), chainon ($1, $5));
                }
        | enum_head identifier '{'
                { $$ = start_enum ($2); }
@@ -1777,52 +1748,53 @@ maybecomma_warn:
                    pedwarn ("comma at end of enumerator list"); }
        ;
 
+/* We chain the components in reverse order.  They are put in forward
+   order in structsp_attr.
+
+   Note that component_declarator returns single decls, so components
+   and components_notype can use TREE_CHAIN directly, wheras components
+   and components_notype return lists (of comma separated decls), so
+   component_decl_list and component_decl_list2 must use chainon.
+
+   The theory behind all this is that there will be more semicolon
+   separated fields than comma separated fields, and so we'll be
+   minimizing the number of node traversals required by chainon.  */
+
 component_decl_list:
          component_decl_list2
                { $$ = $1; }
        | component_decl_list2 component_decl
-               { $$ = chainon ($1, $2);
+               { $$ = chainon ($2, $1);
                  pedwarn ("no semicolon at end of struct or union"); }
        ;
 
 component_decl_list2:  /* empty */
                { $$ = NULL_TREE; }
        | component_decl_list2 component_decl ';'
-               { $$ = chainon ($1, $2); }
+               { $$ = chainon ($2, $1); }
        | component_decl_list2 ';'
                { if (pedantic)
                    pedwarn ("extra semicolon in struct or union specified"); }
-ifobjc
+@@ifobjc
        /* foo(sizeof(struct{ @defs(ClassName)})); */
        | DEFS '(' CLASSNAME ')'
-               {
-                 tree interface = lookup_interface ($3);
-
-                 if (interface)
-                   $$ = get_class_ivars (interface);
-                 else
-                   {
-                     error ("Cannot find interface declaration for `%s'",
-                            IDENTIFIER_POINTER ($3));
-                     $$ = NULL_TREE;
-                   }
-               }
-end ifobjc
+               { $$ = nreverse (get_class_ivars_from_name ($3)); }
+@@end_ifobjc
        ;
 
 component_decl:
          declspecs_nosc_ts setspecs components
                { $$ = $3;
                  POP_DECLSPEC_STACK; }
-       | declspecs_nosc_ts setspecs save_filename save_lineno
+       | declspecs_nosc_ts setspecs
                {
-                 /* Support for unnamed structs or unions as members of 
-                    structs or unions (which is [a] useful and [b] supports 
+                 /* Support for unnamed structs or unions as members of
+                    structs or unions (which is [a] useful and [b] supports
                     MS P-SDK).  */
                  if (pedantic)
                    pedwarn ("ISO C doesn't support unnamed structs/unions");
 
-                 $$ = grokfield($3, $4, NULL, current_declspecs, NULL_TREE);
+                 $$ = grokfield(NULL, current_declspecs, NULL_TREE);
                  POP_DECLSPEC_STACK; }
        | declspecs_nosc_nots setspecs components_notype
                { $$ = $3;
@@ -1830,57 +1802,59 @@ component_decl:
        | declspecs_nosc_nots
                { if (pedantic)
                    pedwarn ("ISO C forbids member declarations with no members");
-                 shadow_tag($1);
+                 shadow_tag_warned ($1, pedantic);
                  $$ = NULL_TREE; }
        | error
                { $$ = NULL_TREE; }
        | extension component_decl
                { $$ = $2;
-                 RESTORE_WARN_FLAGS ($1); }
+                 RESTORE_EXT_FLAGS ($1); }
        ;
 
 components:
          component_declarator
        | components ',' maybe_resetattrs component_declarator
-               { $$ = chainon ($1, $4); }
+               { TREE_CHAIN ($4) = $1; $$ = $4; }
        ;
 
 components_notype:
          component_notype_declarator
        | components_notype ',' maybe_resetattrs component_notype_declarator
-               { $$ = chainon ($1, $4); }
+               { TREE_CHAIN ($4) = $1; $$ = $4; }
        ;
 
 component_declarator:
-         save_filename save_lineno declarator maybe_attribute
-               { $$ = grokfield ($1, $2, $3, current_declspecs, NULL_TREE);
-                 decl_attributes (&$$, chainon ($4, all_prefix_attributes), 0); }
-       | save_filename save_lineno
-         declarator ':' expr_no_commas maybe_attribute
-               { $$ = grokfield ($1, $2, $3, current_declspecs, $5);
-                 decl_attributes (&$$, chainon ($6, all_prefix_attributes), 0); }
-       | save_filename save_lineno ':' expr_no_commas maybe_attribute
-               { $$ = grokfield ($1, $2, NULL_TREE, current_declspecs, $4);
-                 decl_attributes (&$$, chainon ($5, all_prefix_attributes), 0); }
+         declarator maybe_attribute
+               { $$ = grokfield ($1, current_declspecs, NULL_TREE);
+                 decl_attributes (&$$,
+                                  chainon ($2, all_prefix_attributes), 0); }
+       | declarator ':' expr_no_commas maybe_attribute
+               { $$ = grokfield ($1, current_declspecs, $3);
+                 decl_attributes (&$$,
+                                  chainon ($4, all_prefix_attributes), 0); }
+       | ':' expr_no_commas maybe_attribute
+               { $$ = grokfield (NULL_TREE, current_declspecs, $2);
+                 decl_attributes (&$$,
+                                  chainon ($3, all_prefix_attributes), 0); }
        ;
 
 component_notype_declarator:
-         save_filename save_lineno notype_declarator maybe_attribute
-               { $$ = grokfield ($1, $2, $3, current_declspecs, NULL_TREE);
-                 decl_attributes (&$$, chainon ($4, all_prefix_attributes), 0); }
-       | save_filename save_lineno
-         notype_declarator ':' expr_no_commas maybe_attribute
-               { $$ = grokfield ($1, $2, $3, current_declspecs, $5);
-                 decl_attributes (&$$, chainon ($6, all_prefix_attributes), 0); }
-       | save_filename save_lineno ':' expr_no_commas maybe_attribute
-               { $$ = grokfield ($1, $2, NULL_TREE, current_declspecs, $4);
-                 decl_attributes (&$$, chainon ($5, all_prefix_attributes), 0); }
+         notype_declarator maybe_attribute
+               { $$ = grokfield ($1, current_declspecs, NULL_TREE);
+                 decl_attributes (&$$,
+                                  chainon ($2, all_prefix_attributes), 0); }
+       | notype_declarator ':' expr_no_commas maybe_attribute
+               { $$ = grokfield ($1, current_declspecs, $3);
+                 decl_attributes (&$$,
+                                  chainon ($4, all_prefix_attributes), 0); }
+       | ':' expr_no_commas maybe_attribute
+               { $$ = grokfield (NULL_TREE, current_declspecs, $2);
+                 decl_attributes (&$$,
+                                  chainon ($3, all_prefix_attributes), 0); }
        ;
 
 /* We chain the enumerators in reverse order.
-   They are put in forward order where enumlist is used.
-   (The order used to be significant, but no longer is so.
-   However, we still maintain the order, just to be clean.)  */
+   They are put in forward order in structsp_attr.  */
 
 enumlist:
          enumerator
@@ -1888,7 +1862,7 @@ enumlist:
                { if ($1 == error_mark_node)
                    $$ = $1;
                  else
-                   $$ = chainon ($3, $1); }
+                   TREE_CHAIN ($3) = $1, $$ = $3; }
        | error
                { $$ = error_mark_node; }
        ;
@@ -1903,13 +1877,8 @@ enumerator:
 
 typename:
          declspecs_nosc
-               { tree specs, attrs;
-                 pending_xref_error ();
-                 split_specs_attrs ($1, &specs, &attrs);
-                 /* We don't yet support attributes here.  */
-                 if (attrs != NULL_TREE)
-                   warning ("attributes on type name ignored");
-                 $<ttype>$ = specs; }
+               { pending_xref_error ();
+                 $<ttype>$ = $1; }
          absdcl
                { $$ = build_tree_list ($<ttype>2, $3); }
        ;
@@ -1969,30 +1938,17 @@ direct_absdcl1:
 /* The [...] part of a declarator for an array type.  */
 
 array_declarator:
-         '[' expr ']'
-               { $$ = build_array_declarator ($2, NULL_TREE, 0, 0); }
-       | '[' declspecs_nosc expr ']'
+       '[' maybe_type_quals_attrs expr_no_commas ']'
                { $$ = build_array_declarator ($3, $2, 0, 0); }
-       | '[' ']'
-               { $$ = build_array_declarator (NULL_TREE, NULL_TREE, 0, 0); }
-       | '[' declspecs_nosc ']'
+       | '[' maybe_type_quals_attrs ']'
                { $$ = build_array_declarator (NULL_TREE, $2, 0, 0); }
-       | '[' '*' ']'
-               { $$ = build_array_declarator (NULL_TREE, NULL_TREE, 0, 1); }
-       | '[' declspecs_nosc '*' ']'
+       | '[' maybe_type_quals_attrs '*' ']'
                { $$ = build_array_declarator (NULL_TREE, $2, 0, 1); }
-       | '[' SCSPEC expr ']'
-               { if (C_RID_CODE ($2) != RID_STATIC)
-                   error ("storage class specifier in array declarator");
-                 $$ = build_array_declarator ($3, NULL_TREE, 1, 0); }
-       | '[' SCSPEC declspecs_nosc expr ']'
-               { if (C_RID_CODE ($2) != RID_STATIC)
-                   error ("storage class specifier in array declarator");
-                 $$ = build_array_declarator ($4, $3, 1, 0); }
-       | '[' declspecs_nosc SCSPEC expr ']'
-               { if (C_RID_CODE ($3) != RID_STATIC)
-                   error ("storage class specifier in array declarator");
-                 $$ = build_array_declarator ($4, $2, 1, 0); }
+       | '[' STATIC maybe_type_quals_attrs expr_no_commas ']'
+               { $$ = build_array_declarator ($4, $3, 1, 0); }
+       /* declspecs_nosc_nots is a synonym for type_quals_attrs.  */
+       | '[' declspecs_nosc_nots STATIC expr_no_commas ']'
+               { $$ = build_array_declarator ($4, $2, 1, 0); }
        ;
 
 /* A nonempty series of declarations and statements (possibly followed by
@@ -2006,7 +1962,7 @@ stmts_and_decls:
        | lineno_stmt_decl_or_labels_ending_decl
        | lineno_stmt_decl_or_labels_ending_label
                {
-                 pedwarn ("deprecated use of label at end of compound statement");
+                 error ("label at end of compound statement");
                }
        | lineno_stmt_decl_or_labels_ending_error
        ;
@@ -2022,8 +1978,11 @@ lineno_stmt_decl_or_labels_ending_stmt:
 lineno_stmt_decl_or_labels_ending_decl:
          lineno_decl
        | lineno_stmt_decl_or_labels_ending_stmt lineno_decl
-               { if (pedantic && !flag_isoc99)
-                   pedwarn ("ISO C89 forbids mixed declarations and code"); }
+               {
+                 if ((pedantic && !flag_isoc99)
+                     || warn_declaration_after_statement)
+                   pedwarn_c90 ("ISO C90 forbids mixed declarations and code");
+               }
        | lineno_stmt_decl_or_labels_ending_decl lineno_decl
        | lineno_stmt_decl_or_labels_ending_error lineno_decl
        ;
@@ -2051,32 +2010,31 @@ lineno_stmt_decl_or_labels:
 errstmt:  error ';'
        ;
 
-pushlevel:  /* empty */
-               { pushlevel (0);
+push_scope:  /* empty */
+               { push_scope ();
                  clear_last_expr ();
                  add_scope_stmt (/*begin_p=*/1, /*partial_p=*/0);
-ifobjc
-                 if (objc_method_context)
-                   add_objc_decls ();
-end ifobjc
                }
        ;
 
-poplevel:  /* empty */
-                { $$ = add_scope_stmt (/*begin_p=*/0, /*partial_p=*/0); }
+pop_scope:  /* empty */
+                {
+@@ifobjc
+                 if (c_dialect_objc ())
+                   objc_clear_super_receiver ();
+@@end_ifobjc
+                 $$ = add_scope_stmt (/*begin_p=*/0, /*partial_p=*/0);
+               }
+        ;
 
 /* Start and end blocks created for the new scopes of C99.  */
 c99_block_start: /* empty */
                { if (flag_isoc99)
                    {
                      $$ = c_begin_compound_stmt ();
-                     pushlevel (0);
+                     push_scope ();
                      clear_last_expr ();
                      add_scope_stmt (/*begin_p=*/1, /*partial_p=*/0);
-ifobjc
-                     if (objc_method_context)
-                       add_objc_decls ();
-end ifobjc
                    }
                  else
                    $$ = NULL_TREE;
@@ -2090,8 +2048,8 @@ c99_block_end: /* empty */
                 { if (flag_isoc99)
                    {
                      tree scope_stmt = add_scope_stmt (/*begin_p=*/0, /*partial_p=*/0);
-                     $$ = poplevel (kept_level_p (), 0, 0); 
-                     SCOPE_STMT_BLOCK (TREE_PURPOSE (scope_stmt)) 
+                     $$ = pop_scope ();
+                     SCOPE_STMT_BLOCK (TREE_PURPOSE (scope_stmt))
                        = SCOPE_STMT_BLOCK (TREE_VALUE (scope_stmt))
                        = $$;
                    }
@@ -2118,7 +2076,7 @@ label_decl:
                { tree link;
                  for (link = $2; link; link = TREE_CHAIN (link))
                    {
-                     tree label = shadow_label (TREE_VALUE (link));
+                     tree label = declare_label (TREE_VALUE (link));
                      C_DECLARED_LABEL_FLAG (label) = 1;
                      add_decl_stmt (label);
                    }
@@ -2134,13 +2092,14 @@ compstmt_or_error:
        ;
 
 compstmt_start: '{' { compstmt_count++;
-                      $$ = c_begin_compound_stmt (); } 
+                      $$ = c_begin_compound_stmt (); }
+        ;
 
 compstmt_nostart: '}'
                { $$ = convert (void_type_node, integer_zero_node); }
-       | pushlevel maybe_label_decls compstmt_contents_nonempty '}' poplevel
-               { $$ = poplevel (kept_level_p (), 1, 0); 
-                 SCOPE_STMT_BLOCK (TREE_PURPOSE ($5)) 
+       | push_scope maybe_label_decls compstmt_contents_nonempty '}' pop_scope
+               { $$ = pop_scope ();
+                 SCOPE_STMT_BLOCK (TREE_PURPOSE ($5))
                    = SCOPE_STMT_BLOCK (TREE_VALUE ($5))
                    = $$; }
        ;
@@ -2162,13 +2121,15 @@ compstmt_primary_start:
                     there is a way to turn off the entire subtree of blocks
                     that are contained in it.  */
                  keep_next_level ();
-                 push_label_level ();
                  compstmt_count++;
                  $$ = add_stmt (build_stmt (COMPOUND_STMT, last_tree));
+                 last_expr_type = NULL_TREE;
                }
+        ;
 
 compstmt: compstmt_start compstmt_nostart
-               { RECHAIN_STMTS ($1, COMPOUND_BODY ($1)); 
+               { RECHAIN_STMTS ($1, COMPOUND_BODY ($1));
+                 last_expr_type = NULL_TREE;
                   $$ = $1; }
        ;
 
@@ -2183,13 +2144,22 @@ simple_if:
        ;
 
 if_prefix:
-         IF '(' expr ')'
-               { c_expand_start_cond (truthvalue_conversion ($3), 
-                                      compstmt_count);
+         /* We must build the IF_STMT node before parsing its
+            condition so that EXPR_LOCUS refers to the line
+            containing the "if", and not the line containing
+            the close-parenthesis.
+
+            c_begin_if_stmt returns the IF_STMT node, which
+            we later pass to c_expand_start_cond to fill
+            in the condition and other tidbits.  */
+          IF
+                { $<ttype>$ = c_begin_if_stmt (); }
+            '(' expr ')'
+               { c_expand_start_cond (lang_hooks.truthvalue_conversion ($4),
+                                      compstmt_count,$<ttype>2);
                  $<itype>$ = stmt_count;
-                 if_stmt_file = $<filename>-2;
-                 if_stmt_line = $<lineno>-1; }
-       ;
+                 if_stmt_locus = $<location>-1; }
+        ;
 
 /* This is a subroutine of stmt.
    It is used twice, once for valid DO statements
@@ -2198,7 +2168,8 @@ do_stmt_start:
          DO
                { stmt_count++;
                  compstmt_count++;
-                 $<ttype>$ 
+                 c_in_iteration_stmt++;
+                 $<ttype>$
                    = add_stmt (build_stmt (DO_STMT, NULL_TREE,
                                            NULL_TREE));
                  /* In the event that a parse error prevents
@@ -2208,22 +2179,18 @@ do_stmt_start:
                  DO_COND ($<ttype>$) = error_mark_node; }
          c99_block_lineno_labeled_stmt WHILE
                { $$ = $<ttype>2;
-                 RECHAIN_STMTS ($$, DO_BODY ($$)); }
+                 RECHAIN_STMTS ($$, DO_BODY ($$));
+                 c_in_iteration_stmt--; }
        ;
 
 /* The forced readahead in here is because we might be at the end of a
    line, and the line and file won't be bumped until yylex absorbs the
    first token on the next line.  */
-save_filename:
-               { if (yychar == YYEMPTY)
-                   yychar = YYLEX;
-                 $$ = input_filename; }
-       ;
 
-save_lineno:
+save_location:
                { if (yychar == YYEMPTY)
                    yychar = YYLEX;
-                 $$ = lineno; }
+                 $$ = input_location; }
        ;
 
 lineno_labeled_stmt:
@@ -2239,24 +2206,21 @@ c99_block_lineno_labeled_stmt:
        ;
 
 lineno_stmt:
-         save_filename save_lineno stmt
-               { if ($3)
+         save_location stmt
+               { if ($2)
                    {
-                     STMT_LINENO ($3) = $2;
-                     /* ??? We currently have no way of recording
-                        the filename for a statement.  This probably
-                        matters little in practice at the moment,
-                        but I suspect that problems will occur when
-                        doing inlining at the tree level.  */
+                     SET_EXPR_LOCUS ($2, NULL);
+                     annotate_with_locus ($2, $1);
                    }
                }
        ;
 
 lineno_label:
-         save_filename save_lineno label
-               { if ($3)
+         save_location label
+               { if ($2)
                    {
-                     STMT_LINENO ($3) = $2;
+                     SET_EXPR_LOCUS ($2, NULL);
+                     annotate_with_locus ($2, $1);
                    }
                }
        ;
@@ -2277,54 +2241,77 @@ select_or_iter_stmt:
                     else statement.  Increment stmt_count so we don't
                     give a second error if this is a nested `if'.  */
                  if (extra_warnings && stmt_count++ == $<itype>1)
-                   warning_with_file_and_line (if_stmt_file, if_stmt_line,
-                                               "empty body in an if-statement"); }
+                   warning ("%Hempty body in an if-statement",
+                             &if_stmt_locus); }
 /* Make sure c_expand_end_cond is run once
    for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
        | simple_if ELSE error
                { c_expand_end_cond (); }
+       /* We must build the WHILE_STMT node before parsing its
+         condition so that EXPR_LOCUS refers to the line
+         containing the "while", and not the line containing
+         the close-parenthesis.
+
+         c_begin_while_stmt returns the WHILE_STMT node, which
+         we later pass to c_finish_while_stmt_cond to fill
+         in the condition and other tidbits.  */
        | WHILE
-                { stmt_count++; }
+                { stmt_count++;
+                 $<ttype>$ = c_begin_while_stmt (); }
          '(' expr ')'
-                { $4 = truthvalue_conversion ($4);
-                 $<ttype>$ 
-                   = add_stmt (build_stmt (WHILE_STMT, $4, NULL_TREE)); }
+                { c_in_iteration_stmt++;
+                 $4 = lang_hooks.truthvalue_conversion ($4);
+                 c_finish_while_stmt_cond
+                   (lang_hooks.truthvalue_conversion ($4), $<ttype>2);
+                 $<ttype>$ = add_stmt ($<ttype>2); }
          c99_block_lineno_labeled_stmt
-               { RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
+                { c_in_iteration_stmt--;
+                 RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
        | do_stmt_start
          '(' expr ')' ';'
-                { DO_COND ($1) = truthvalue_conversion ($3); }
+                { DO_COND ($1) = lang_hooks.truthvalue_conversion ($3); }
        | do_stmt_start error
-               { }
+               { }
        | FOR
                { $<ttype>$ = build_stmt (FOR_STMT, NULL_TREE, NULL_TREE,
                                          NULL_TREE, NULL_TREE);
-                 add_stmt ($<ttype>$); } 
+                 add_stmt ($<ttype>$); }
          '(' for_init_stmt
                { stmt_count++;
                  RECHAIN_STMTS ($<ttype>2, FOR_INIT_STMT ($<ttype>2)); }
          xexpr ';'
-                { if ($6) 
-                   FOR_COND ($<ttype>2) = truthvalue_conversion ($6); }
+                { if ($6)
+                   FOR_COND ($<ttype>2)
+                     = lang_hooks.truthvalue_conversion ($6); }
          xexpr ')'
-               { FOR_EXPR ($<ttype>2) = $9; }
+                { c_in_iteration_stmt++;
+                 FOR_EXPR ($<ttype>2) = $9; }
          c99_block_lineno_labeled_stmt
-                { RECHAIN_STMTS ($<ttype>2, FOR_BODY ($<ttype>2)); }
+                { RECHAIN_STMTS ($<ttype>2, FOR_BODY ($<ttype>2));
+                 c_in_iteration_stmt--;}
        | SWITCH '(' expr ')'
                { stmt_count++;
-                 $<ttype>$ = c_start_case ($3); }
+                 $<ttype>$ = c_start_case ($3);
+                 c_in_case_stmt++; }
          c99_block_lineno_labeled_stmt
-                { c_finish_case (); }
+                { c_finish_case ();
+                 c_in_case_stmt--; }
        ;
 
 for_init_stmt:
          xexpr ';'
-               { add_stmt (build_stmt (EXPR_STMT, $1)); } 
+               { add_stmt (build_stmt (EXPR_STMT, $1)); }
        | decl
                { check_for_loop_decls (); }
        ;
 
+xexpr:
+       /* empty */
+               { $$ = NULL_TREE; }
+       | expr
+       ;
+
 /* Parse a single real statement, not including any labels.  */
 stmt:
          compstmt
@@ -2338,9 +2325,21 @@ stmt:
                  $$ = NULL_TREE; }
        | BREAK ';'
                { stmt_count++;
+               if (!(c_in_iteration_stmt || c_in_case_stmt))
+                 {
+                   error ("break statement not within loop or switch");
+                   $$ = NULL_TREE;
+                 }
+               else
                  $$ = add_stmt (build_break_stmt ()); }
        | CONTINUE ';'
                 { stmt_count++;
+               if (!c_in_iteration_stmt)
+                 {
+                   error ("continue statement not within a loop");
+                   $$ = NULL_TREE;
+                 }
+               else
                  $$ = add_stmt (build_continue_stmt ()); }
        | RETURN ';'
                 { stmt_count++;
@@ -2348,23 +2347,7 @@ stmt:
        | RETURN expr ';'
                 { stmt_count++;
                  $$ = c_expand_return ($2); }
-       | ASM_KEYWORD maybe_type_qual '(' expr ')' ';'
-               { stmt_count++;
-                 $$ = simple_asm_stmt ($4); }
-       /* This is the case with just output operands.  */
-       | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ')' ';'
-               { stmt_count++;
-                 $$ = build_asm_stmt ($2, $4, $6, NULL_TREE, NULL_TREE); }
-       /* This is the case with input operands as well.  */
-       | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':'
-         asm_operands ')' ';'
-               { stmt_count++;
-                 $$ = build_asm_stmt ($2, $4, $6, $8, NULL_TREE); }
-       /* This is the case with clobbered registers as well.  */
-       | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':'
-         asm_operands ':' asm_clobbers ')' ';'
-               { stmt_count++;
-                 $$ = build_asm_stmt ($2, $4, $6, $8, $10); }
+       | asm_stmt
        | GOTO identifier ';'
                { tree decl;
                  stmt_count++;
@@ -2385,6 +2368,59 @@ stmt:
                  $$ = add_stmt (build_stmt (GOTO_STMT, $3)); }
        | ';'
                { $$ = NULL_TREE; }
+@@ifobjc
+       | AT_THROW expr ';'
+               { stmt_count++;
+                 $$ = objc_build_throw_stmt ($2);
+               }
+       | AT_THROW ';'
+               { stmt_count++;
+                 $$ = objc_build_throw_stmt (NULL_TREE);
+               }
+       | objc_try_catch_stmt
+               { objc_build_finally_prologue (); }
+         objc_finally_block
+               { $$ = objc_build_try_catch_finally_stmt ($1, $3); }
+       | AT_SYNCHRONIZED '(' expr ')'
+               { objc_build_synchronized_prologue ($3); }
+         compstmt
+               { $$ = objc_build_synchronized_epilogue (); }
+       ;
+
+objc_try_catch_stmt:
+         objc_try_stmt
+               { objc_build_try_epilogue (1); }
+         objc_catch_list
+               { objc_build_catch_epilogue (); $$ = 1; }
+       | objc_try_stmt
+               { objc_build_try_epilogue (0); $$ = 0; }
+       ;
+
+
+objc_try_stmt:
+         AT_TRY
+               { objc_build_try_prologue (); }
+         compstmt
+       ;
+
+objc_catch_list:
+         objc_catch_list objc_catch_block
+       | objc_catch_block
+       ;
+
+objc_catch_block:
+         AT_CATCH '(' parm ')'
+               { objc_build_catch_stmt ($3); }
+         compstmt
+               { stmt_count++; }
+       ;
+
+objc_finally_block:
+         AT_FINALLY compstmt
+           { $$ = 1; }
+       | /* NULL */
+           { $$ = 0; }
+@@end_ifobjc
        ;
 
 /* Any kind of label, including jump labels and case labels.
@@ -2400,12 +2436,12 @@ label:    CASE expr_no_commas ':'
        | DEFAULT ':'
                 { stmt_count++;
                  $$ = do_case (NULL_TREE, NULL_TREE); }
-       | identifier save_filename save_lineno ':' maybe_attribute
-               { tree label = define_label ($2, $3, $1);
+       | identifier save_location ':' maybe_attribute
+               { tree label = define_label ($2, $1);
                  stmt_count++;
                  if (label)
                    {
-                     decl_attributes (&label, $5, 0);
+                     decl_attributes (&label, $4, 0);
                      $$ = add_stmt (build_stmt (LABEL_STMT, label));
                    }
                  else
@@ -2413,20 +2449,69 @@ label:    CASE expr_no_commas ':'
                }
        ;
 
-/* Either a type-qualifier or nothing.  First thing in an `asm' statement.  */
+/* Asm expressions and statements */
 
-maybe_type_qual:
-       /* empty */
-               { emit_line_note (input_filename, lineno);
-                 $$ = NULL_TREE; }
-       | TYPE_QUAL
-               { emit_line_note (input_filename, lineno); }
+/* simple_asm_expr is used in restricted contexts, where a full
+   expression with inputs and outputs does not make sense.  */
+simple_asm_expr:
+       ASM_KEYWORD stop_string_translation
+             '(' STRING ')' start_string_translation
+               { $$ = $4; }
        ;
 
-xexpr:
-       /* empty */
+/* maybeasm: used for assembly names for declarations */
+maybeasm:
+         /* empty */
                { $$ = NULL_TREE; }
-       | expr
+       | simple_asm_expr
+       ;
+
+/* asmdef: asm() outside a function body.  */
+asmdef:
+       simple_asm_expr ';'
+               { assemble_asm ($1); }
+        | ASM_KEYWORD error start_string_translation ';'
+                {}
+       ;
+
+/* Full-blown asm statement with inputs, outputs, clobbers, and
+   volatile tag allowed.  */
+asm_stmt:
+       ASM_KEYWORD maybe_volatile stop_string_translation
+               '(' asm_argument ')' start_string_translation ';'
+               { stmt_count++;
+                 $$ = build_asm_stmt ($2, $5); }
+       ;
+
+asm_argument:
+       /* no operands */
+       STRING
+               { $$ = build_asm_expr ($1, 0, 0, 0, true); }
+       /* output operands */
+       | STRING ':' asm_operands
+               { $$ = build_asm_expr ($1, $3, 0, 0, false); }
+       /* output and input operands */
+       | STRING ':' asm_operands ':' asm_operands
+               { $$ = build_asm_expr ($1, $3, $5, 0, false); }
+       /* output and input operands and clobbers */
+       | STRING ':' asm_operands ':' asm_operands ':' asm_clobbers
+               { $$ = build_asm_expr ($1, $3, $5, $7, false); }
+       ;
+
+/* Either 'volatile' or nothing.  First thing in an `asm' statement.  */
+
+maybe_volatile:
+       /* empty */
+               { $$ = 0; }
+       | TYPE_QUAL
+               { if ($1 != ridpointers[RID_VOLATILE])
+                   {
+                     warning ("%E qualifier ignored on asm", $1);
+                     $$ = 0;
+                   }
+                 else
+                   $$ = $1;
+               }
        ;
 
 /* These are the operands other than the first string and colon
@@ -2443,18 +2528,30 @@ nonnull_asm_operands:
        ;
 
 asm_operand:
-         STRING '(' expr ')'
-               { $$ = build_tree_list (build_tree_list (NULL_TREE, $1), $3); }
-       | '[' identifier ']' STRING '(' expr ')'
-               { $$ = build_tree_list (build_tree_list ($2, $4), $6); }
+         STRING start_string_translation '(' expr ')' stop_string_translation
+               { $$ = build_tree_list (build_tree_list (NULL_TREE, $1), $4); }
+       | '[' identifier ']' STRING start_string_translation
+         '(' expr ')' stop_string_translation
+               { $2 = build_string (IDENTIFIER_LENGTH ($2),
+                                    IDENTIFIER_POINTER ($2));
+                 $$ = build_tree_list (build_tree_list ($2, $4), $7); }
        ;
 
 asm_clobbers:
-         string
-               { $$ = tree_cons (NULL_TREE, combine_strings ($1), NULL_TREE); }
-       | asm_clobbers ',' string
-               { $$ = tree_cons (NULL_TREE, combine_strings ($3), $1); }
+         STRING
+               { $$ = tree_cons (NULL_TREE, $1, NULL_TREE); }
+       | asm_clobbers ',' STRING
+               { $$ = tree_cons (NULL_TREE, $3, $1); }
        ;
+
+stop_string_translation:
+        { c_lex_string_translate = false; }
+        ;
+
+start_string_translation:
+        { c_lex_string_translate = true; }
+        ;
+
 \f
 /* This is what appears inside the parens in a function declarator.
    Its value is a list of ..._TYPE nodes.  Attributes must appear here
@@ -2463,52 +2560,40 @@ asm_clobbers:
    "void bar (int (__attribute__((__mode__(SI))) int foo));".  */
 parmlist:
          maybe_attribute
-               { pushlevel (0);
-                 clear_parm_order ();
-                 declare_parm_level (0); }
+               { push_scope ();
+                 declare_parm_level (); }
          parmlist_1
                { $$ = $3;
-                 parmlist_tags_warning ();
-                 poplevel (0, 0, 0); }
+                 pop_scope (); }
        ;
 
 parmlist_1:
          parmlist_2 ')'
        | parms ';'
-               { tree parm;
-                 if (pedantic)
-                   pedwarn ("ISO C forbids forward parameter declarations");
-                 /* Mark the forward decls as such.  */
-                 for (parm = getdecls (); parm; parm = TREE_CHAIN (parm))
-                   TREE_ASM_WRITTEN (parm) = 1;
-                 clear_parm_order (); }
+               { mark_forward_parm_decls (); }
          maybe_attribute
                { /* Dummy action so attributes are in known place
                     on parser stack.  */ }
          parmlist_1
                { $$ = $6; }
        | error ')'
-               { $$ = tree_cons (NULL_TREE, NULL_TREE, NULL_TREE); }
+               { $$ = make_node (TREE_LIST); }
        ;
 
 /* This is what appears inside the parens in a function declarator.
    Is value is represented in the format that grokdeclarator expects.  */
 parmlist_2:  /* empty */
-               { $$ = get_parm_info (0); }
+               { $$ = make_node (TREE_LIST); }
        | ELLIPSIS
-               { $$ = get_parm_info (0);
-                 /* Gcc used to allow this as an extension.  However, it does
-                    not work for all targets, and thus has been disabled.
-                    Also, since func (...) and func () are indistinguishable,
-                    it caused problems with the code in expand_builtin which
-                    tries to verify that BUILT_IN_NEXT_ARG is being used
-                    correctly.  */
+               { $$ = make_node (TREE_LIST); 
+                 /* Suppress -Wold-style-definition for this case.  */
+                 TREE_CHAIN ($$) = error_mark_node;
                  error ("ISO C requires a named argument before `...'");
                }
        | parms
-               { $$ = get_parm_info (1); }
+               { $$ = get_parm_info (/*ellipsis=*/false); }
        | parms ',' ELLIPSIS
-               { $$ = get_parm_info (0); }
+               { $$ = get_parm_info (/*ellipsis=*/true); }
        ;
 
 parms:
@@ -2529,7 +2614,7 @@ parm:
        | declspecs_ts setspecs notype_declarator maybe_attribute
                { $$ = build_tree_list (build_tree_list (current_declspecs,
                                                         $3),
-                                       chainon ($4, all_prefix_attributes)); 
+                                       chainon ($4, all_prefix_attributes));
                  POP_DECLSPEC_STACK; }
        | declspecs_ts setspecs absdcl_maybe_attribute
                { $$ = $3;
@@ -2556,7 +2641,7 @@ firstparm:
        | declspecs_ts_nosa setspecs_fp notype_declarator maybe_attribute
                { $$ = build_tree_list (build_tree_list (current_declspecs,
                                                         $3),
-                                       chainon ($4, all_prefix_attributes)); 
+                                       chainon ($4, all_prefix_attributes));
                  POP_DECLSPEC_STACK; }
        | declspecs_ts_nosa setspecs_fp absdcl_maybe_attribute
                { $$ = $3;
@@ -2582,13 +2667,12 @@ setspecs_fp:
    where either a parmlist or an identifier list is ok.
    Its value is a list of ..._TYPE nodes or a list of identifiers.  */
 parmlist_or_identifiers:
-               { pushlevel (0);
-                 clear_parm_order ();
-                 declare_parm_level (1); }
+         maybe_attribute
+               { push_scope ();
+                 declare_parm_level (); }
          parmlist_or_identifiers_1
-               { $$ = $2;
-                 parmlist_tags_warning ();
-                 poplevel (0, 0, 0); }
+               { $$ = $3;
+                 pop_scope (); }
        ;
 
 parmlist_or_identifiers_1:
@@ -2598,7 +2682,15 @@ parmlist_or_identifiers_1:
                  for (t = $1; t; t = TREE_CHAIN (t))
                    if (TREE_VALUE (t) == NULL_TREE)
                      error ("`...' in old-style identifier list");
-                 $$ = tree_cons (NULL_TREE, NULL_TREE, $1); }
+                 $$ = tree_cons (NULL_TREE, NULL_TREE, $1);
+
+                 /* Make sure we have a parmlist after attributes.  */
+                 if ($<ttype>-1 != 0
+                     && (TREE_CODE ($$) != TREE_LIST
+                         || TREE_PURPOSE ($$) == 0
+                         || TREE_CODE (TREE_PURPOSE ($$)) != PARM_DECL))
+                   YYERROR1;
+               }
        ;
 
 /* A nonempty list of identifiers.  */
@@ -2619,12 +2711,14 @@ identifiers_or_typenames:
 
 extension:
        EXTENSION
-               { $$ = SAVE_WARN_FLAGS();
+               { $$ = SAVE_EXT_FLAGS();
                  pedantic = 0;
-                 warn_pointer_arith = 0; }
+                 warn_pointer_arith = 0;
+                 warn_traditional = 0;
+                 flag_iso = 0; }
        ;
 \f
-ifobjc
+@@ifobjc
 /* Objective-C productions.  */
 
 objcdef:
@@ -2659,110 +2753,50 @@ classdecl:
                {
                  objc_declare_class ($2);
                }
+       ;
 
 aliasdecl:
          ALIAS identifier identifier ';'
                {
                  objc_declare_alias ($2, $3);
                }
+       ;
 
-classdef:
-         INTERFACE identifier protocolrefs '{'
-               {
-                 objc_interface_context = objc_ivar_context
-                   = start_class (CLASS_INTERFACE_TYPE, $2, NULL_TREE, $3);
-                  objc_public_flag = 0;
-               }
-         ivar_decl_list '}'
-               {
-                  continue_class (objc_interface_context);
-               }
-         methodprotolist
-         END
-               {
-                 finish_class (objc_interface_context);
-                 objc_interface_context = NULL_TREE;
-               }
+superclass:
+         ':' identifier { $$ = $2; }
+       | /* NULL */ %prec HYPERUNARY    { $$ = NULL_TREE; }
+       ;
 
-       | INTERFACE identifier protocolrefs
-               {
-                 objc_interface_context
-                   = start_class (CLASS_INTERFACE_TYPE, $2, NULL_TREE, $3);
-                  continue_class (objc_interface_context);
-               }
-         methodprotolist
-         END
-               {
-                 finish_class (objc_interface_context);
-                 objc_interface_context = NULL_TREE;
-               }
+class_ivars:
+         '{' ivar_decl_list '}'
+       | /* NULL */
+       ;
 
-       | INTERFACE identifier ':' identifier protocolrefs '{'
+classdef:
+         INTERFACE identifier superclass protocolrefs
                {
                  objc_interface_context = objc_ivar_context
-                   = start_class (CLASS_INTERFACE_TYPE, $2, $4, $5);
+                   = start_class (CLASS_INTERFACE_TYPE, $2, $3, $4);
                   objc_public_flag = 0;
                }
-         ivar_decl_list '}'
-               {
-                  continue_class (objc_interface_context);
-               }
-         methodprotolist
-         END
-               {
-                 finish_class (objc_interface_context);
-                 objc_interface_context = NULL_TREE;
-               }
-
-       | INTERFACE identifier ':' identifier protocolrefs
+         class_ivars
                {
-                 objc_interface_context
-                   = start_class (CLASS_INTERFACE_TYPE, $2, $4, $5);
                   continue_class (objc_interface_context);
                }
-         methodprotolist
-         END
+         methodprotolist END
                {
                  finish_class (objc_interface_context);
                  objc_interface_context = NULL_TREE;
                }
 
-       | IMPLEMENTATION identifier '{'
+       | IMPLEMENTATION identifier superclass
                {
                  objc_implementation_context = objc_ivar_context
-                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, NULL_TREE, NULL_TREE);
+                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, $3, NULL_TREE);
                   objc_public_flag = 0;
                }
-         ivar_decl_list '}'
-               {
-                  objc_ivar_chain
-                   = continue_class (objc_implementation_context);
-               }
-
-       | IMPLEMENTATION identifier
-               {
-                 objc_implementation_context
-                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, NULL_TREE, NULL_TREE);
-                  objc_ivar_chain
-                   = continue_class (objc_implementation_context);
-               }
-
-       | IMPLEMENTATION identifier ':' identifier '{'
-               {
-                 objc_implementation_context = objc_ivar_context
-                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, $4, NULL_TREE);
-                  objc_public_flag = 0;
-               }
-         ivar_decl_list '}'
-               {
-                  objc_ivar_chain
-                   = continue_class (objc_implementation_context);
-               }
-
-       | IMPLEMENTATION identifier ':' identifier
+         class_ivars
                {
-                 objc_implementation_context
-                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, $4, NULL_TREE);
                   objc_ivar_chain
                    = continue_class (objc_implementation_context);
                }
@@ -2773,8 +2807,7 @@ classdef:
                    = start_class (CATEGORY_INTERFACE_TYPE, $2, $4, $6);
                   continue_class (objc_interface_context);
                }
-         methodprotolist
-         END
+         methodprotolist END
                {
                  finish_class (objc_interface_context);
                  objc_interface_context = NULL_TREE;
@@ -2921,10 +2954,9 @@ methoddef:
          methoddecl
                {
                  objc_pq_context = 0;
-                 if (objc_inherit_code == CLASS_METHOD_DECL)
-                   add_class_method (objc_implementation_context, $3);
-                 else
-                   add_instance_method (objc_implementation_context, $3);
+                 objc_add_method (objc_implementation_context,
+                                  $3,
+                                  objc_inherit_code == CLASS_METHOD_DECL);
                  start_method_def ($3);
                }
          optarglist
@@ -2943,14 +2975,8 @@ methoddef:
 
 methodprotolist:
          /* empty  */
-       | {$<ttype>$ = NULL_TREE; } methodprotolist2
-       ;
-
-methodprotolist2:               /* eliminates a shift/reduce conflict */
-          methodproto
-       |  datadef
-       | methodprotolist2 methodproto
-       | methodprotolist2 {$<ttype>$ = NULL_TREE; } datadef
+       | methodprotolist methodproto
+       | methodprotolist { $<ttype>$ = NULL_TREE; } datadef
        ;
 
 semi_or_error:
@@ -2968,10 +2994,9 @@ methodproto:
                {
                  /* Forget protocol qualifiers here.  */
                  objc_pq_context = 0;
-                 if (objc_inherit_code == CLASS_METHOD_DECL)
-                   add_class_method (objc_interface_context, $3);
-                 else
-                   add_instance_method (objc_interface_context, $3);
+                 objc_add_method (objc_interface_context,
+                                  $3,
+                                  objc_inherit_code == CLASS_METHOD_DECL);
                }
          semi_or_error
        ;
@@ -3056,7 +3081,7 @@ myparm:
 optparmlist:
          /* empty */
                {
-                 $$ = NULL_TREE;
+                 $$ = NULL_TREE;
                }
        | ',' ELLIPSIS
                {
@@ -3065,13 +3090,13 @@ optparmlist:
                }
        | ','
                {
-                 pushlevel (0);
+                 push_scope ();
                }
          parmlist_2
                {
-                 /* returns a tree list node generated by get_parm_info */
+                 /* returns a tree list node generated by get_parm_info */
                  $$ = $3;
-                 poplevel (0, 0, 0);
+                 pop_scope ();
                }
        ;
 
@@ -3168,17 +3193,15 @@ receiver:
                {
                  $$ = get_class_reference ($1);
                }
+       | TYPENAME
+               {
+                 $$ = get_class_reference ($1);
+               }
        ;
 
 objcmessageexpr:
-         '['
-               { objc_receiver_context = 1; }
-         receiver
-               { objc_receiver_context = 0; }
-         messageargs ']'
-               {
-                 $$ = build_tree_list ($3, $5);
-               }
+         '[' receiver messageargs ']'
+               { $$ = build_tree_list ($2, $3); }
        ;
 
 selectorarg:
@@ -3228,7 +3251,7 @@ objcencodeexpr:
                }
        ;
 
-end ifobjc
+@@end_ifobjc
 %%
 
 /* yylex() is a thin wrapper around c_lex(), all it does is translate
@@ -3246,11 +3269,10 @@ struct resword
 
 /* Disable mask.  Keywords are disabled if (reswords[i].disable & mask) is
    _true_.  */
-#define D_TRAD 0x01    /* not in traditional C */
-#define D_C89  0x02    /* not in C89 */
-#define D_EXT  0x04    /* GCC extension */
-#define D_EXT89        0x08    /* GCC extension incorporated in C99 */
-#define D_OBJC 0x10    /* Objective C only */
+#define D_C89  0x01    /* not in C89 */
+#define D_EXT  0x02    /* GCC extension */
+#define D_EXT89        0x04    /* GCC extension incorporated in C99 */
+#define D_OBJC 0x08    /* Objective C only */
 
 static const struct resword reswords[] =
 {
@@ -3264,8 +3286,9 @@ static const struct resword reswords[] =
   { "__asm__",         RID_ASM,        0 },
   { "__attribute",     RID_ATTRIBUTE,  0 },
   { "__attribute__",   RID_ATTRIBUTE,  0 },
-  { "__bounded",       RID_BOUNDED,    0 },
-  { "__bounded__",     RID_BOUNDED,    0 },
+  { "__builtin_choose_expr", RID_CHOOSE_EXPR, 0 },
+  { "__builtin_offsetof", RID_OFFSETOF, 0 },
+  { "__builtin_types_compatible_p", RID_TYPES_COMPATIBLE_P, 0 },
   { "__builtin_va_arg",        RID_VA_ARG,     0 },
   { "__complex",       RID_COMPLEX,    0 },
   { "__complex__",     RID_COMPLEX,    0 },
@@ -3290,10 +3313,9 @@ static const struct resword reswords[] =
   { "__restrict__",    RID_RESTRICT,   0 },
   { "__signed",                RID_SIGNED,     0 },
   { "__signed__",      RID_SIGNED,     0 },
+  { "__thread",                RID_THREAD,     0 },
   { "__typeof",                RID_TYPEOF,     0 },
   { "__typeof__",      RID_TYPEOF,     0 },
-  { "__unbounded",     RID_UNBOUNDED,  0 },
-  { "__unbounded__",   RID_UNBOUNDED,  0 },
   { "__volatile",      RID_VOLATILE,   0 },
   { "__volatile__",    RID_VOLATILE,   0 },
   { "asm",             RID_ASM,        D_EXT },
@@ -3301,7 +3323,7 @@ static const struct resword reswords[] =
   { "break",           RID_BREAK,      0 },
   { "case",            RID_CASE,       0 },
   { "char",            RID_CHAR,       0 },
-  { "const",           RID_CONST,      D_TRAD },
+  { "const",           RID_CONST,      0 },
   { "continue",                RID_CONTINUE,   0 },
   { "default",         RID_DEFAULT,    0 },
   { "do",              RID_DO,         0 },
@@ -3313,26 +3335,26 @@ static const struct resword reswords[] =
   { "for",             RID_FOR,        0 },
   { "goto",            RID_GOTO,       0 },
   { "if",              RID_IF,         0 },
-  { "inline",          RID_INLINE,     D_TRAD|D_EXT89 },
+  { "inline",          RID_INLINE,     D_EXT89 },
   { "int",             RID_INT,        0 },
   { "long",            RID_LONG,       0 },
   { "register",                RID_REGISTER,   0 },
-  { "restrict",                RID_RESTRICT,   D_TRAD|D_C89 },
+  { "restrict",                RID_RESTRICT,   D_C89 },
   { "return",          RID_RETURN,     0 },
   { "short",           RID_SHORT,      0 },
-  { "signed",          RID_SIGNED,     D_TRAD },
+  { "signed",          RID_SIGNED,     0 },
   { "sizeof",          RID_SIZEOF,     0 },
   { "static",          RID_STATIC,     0 },
   { "struct",          RID_STRUCT,     0 },
   { "switch",          RID_SWITCH,     0 },
   { "typedef",         RID_TYPEDEF,    0 },
-  { "typeof",          RID_TYPEOF,     D_TRAD|D_EXT },
+  { "typeof",          RID_TYPEOF,     D_EXT },
   { "union",           RID_UNION,      0 },
   { "unsigned",                RID_UNSIGNED,   0 },
   { "void",            RID_VOID,       0 },
-  { "volatile",                RID_VOLATILE,   D_TRAD },
+  { "volatile",                RID_VOLATILE,   0 },
   { "while",           RID_WHILE,      0 },
-ifobjc
+@@ifobjc
   { "id",              RID_ID,                 D_OBJC },
 
   /* These objc keywords are recognized only immediately after
@@ -3349,7 +3371,11 @@ ifobjc
   { "protocol",                RID_AT_PROTOCOL,        D_OBJC },
   { "public",          RID_AT_PUBLIC,          D_OBJC },
   { "selector",                RID_AT_SELECTOR,        D_OBJC },
-
+  { "throw",           RID_AT_THROW,           D_OBJC },
+  { "try",             RID_AT_TRY,             D_OBJC },
+  { "catch",           RID_AT_CATCH,           D_OBJC },
+  { "finally",         RID_AT_FINALLY,         D_OBJC },
+  { "synchronized",    RID_AT_SYNCHRONIZED,    D_OBJC },
   /* These are recognized only in protocol-qualifier context
      (see above) */
   { "bycopy",          RID_BYCOPY,             D_OBJC },
@@ -3358,7 +3384,7 @@ ifobjc
   { "inout",           RID_INOUT,              D_OBJC },
   { "oneway",          RID_ONEWAY,             D_OBJC },
   { "out",             RID_OUT,                D_OBJC },
-end ifobjc
+@@end_ifobjc
 };
 #define N_reswords (sizeof reswords / sizeof (struct resword))
 
@@ -3367,7 +3393,7 @@ end ifobjc
    three languages.  */
 static const short rid_to_yy[RID_MAX] =
 {
-  /* RID_STATIC */     SCSPEC,
+  /* RID_STATIC */     STATIC,
   /* RID_UNSIGNED */   TYPESPEC,
   /* RID_LONG */       TYPESPEC,
   /* RID_CONST */      TYPE_QUAL,
@@ -3382,9 +3408,8 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_RESTRICT */   TYPE_QUAL,
 
   /* C extensions */
-  /* RID_BOUNDED */    TYPE_QUAL,
-  /* RID_UNBOUNDED */  TYPE_QUAL,
   /* RID_COMPLEX */    TYPESPEC,
+  /* RID_THREAD */     SCSPEC,
 
   /* C++ */
   /* RID_FRIEND */     0,
@@ -3400,7 +3425,7 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_BYCOPY */     TYPE_QUAL,
   /* RID_BYREF */      TYPE_QUAL,
   /* RID_ONEWAY */     TYPE_QUAL,
-  
+
   /* C */
   /* RID_INT */                TYPESPEC,
   /* RID_CHAR */       TYPESPEC,
@@ -3438,9 +3463,12 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_PTREXTENT */  PTR_EXTENT,
   /* RID_PTRVALUE */   PTR_VALUE,
 
-  /* RID_FUNCTION_NAME */              STRING_FUNC_NAME,
-  /* RID_PRETTY_FUNCTION_NAME */       STRING_FUNC_NAME,
-  /* RID_C99_FUNCTION_NAME */          VAR_FUNC_NAME,
+  /* RID_CHOOSE_EXPR */                        CHOOSE_EXPR,
+  /* RID_TYPES_COMPATIBLE_P */         TYPES_COMPATIBLE_P,
+
+  /* RID_FUNCTION_NAME */              FUNC_NAME,
+  /* RID_PRETTY_FUNCTION_NAME */       FUNC_NAME,
+  /* RID_C99_FUNCTION_NAME */          FUNC_NAME,
 
   /* C++ */
   /* RID_BOOL */       TYPESPEC,
@@ -3456,6 +3484,7 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_FALSE */      0,
   /* RID_NAMESPACE */  0,
   /* RID_NEW */                0,
+  /* RID_OFFSETOF */    OFFSETOF,
   /* RID_OPERATOR */   0,
   /* RID_THIS */       0,
   /* RID_THROW */      0,
@@ -3471,19 +3500,6 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_REINTCAST */  0,
   /* RID_STATCAST */   0,
 
-  /* alternate spellings */
-  /* RID_AND */                0,
-  /* RID_AND_EQ */     0,
-  /* RID_NOT */                0,
-  /* RID_NOT_EQ */     0,
-  /* RID_OR */         0,
-  /* RID_OR_EQ */      0,
-  /* RID_XOR */                0,
-  /* RID_XOR_EQ */     0,
-  /* RID_BITAND */     0,
-  /* RID_BITOR */      0,
-  /* RID_COMPL */      0,
-  
   /* Objective C */
   /* RID_ID */                 OBJECTNAME,
   /* RID_AT_ENCODE */          ENCODE,
@@ -3496,26 +3512,27 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_AT_PUBLIC */          PUBLIC,
   /* RID_AT_PROTOCOL */                PROTOCOL,
   /* RID_AT_SELECTOR */                SELECTOR,
+  /* RID_AT_THROW */           AT_THROW,
+  /* RID_AT_TRY */             AT_TRY,
+  /* RID_AT_CATCH */           AT_CATCH,
+  /* RID_AT_FINALLY */         AT_FINALLY,
+  /* RID_AT_SYNCHRONIZED */    AT_SYNCHRONIZED,
   /* RID_AT_INTERFACE */       INTERFACE,
   /* RID_AT_IMPLEMENTATION */  IMPLEMENTATION
 };
 
 static void
-init_reswords ()
+init_reswords (void)
 {
   unsigned int i;
   tree id;
   int mask = (flag_isoc99 ? 0 : D_C89)
-             | (flag_traditional ? D_TRAD : 0)
              | (flag_no_asm ? (flag_isoc99 ? D_EXT : D_EXT|D_EXT89) : 0);
 
-  if (c_language != clk_objective_c)
+  if (!c_dialect_objc ())
      mask |= D_OBJC;
 
-  /* It is not necessary to register ridpointers as a GC root, because
-     all the trees it points to are permanently interned in the
-     get_identifier hash anyway.  */
-  ridpointers = (tree *) xcalloc ((int) RID_MAX, sizeof (tree));
+  ridpointers = ggc_calloc ((int) RID_MAX, sizeof (tree));
   for (i = 0; i < N_reswords; i++)
     {
       /* If a keyword is disabled, do not enter it into the table
@@ -3530,59 +3547,29 @@ init_reswords ()
     }
 }
 
-void
-finish_parse ()
-{
-  cpp_finish (parse_in);
-  /* Call to cpp_destroy () omitted for performance reasons.  */
-  errorcount += cpp_errors (parse_in);
-}
-
 #define NAME(type) cpp_type2name (type)
 
 static void
-yyerror (msgid)
-     const char *msgid;
+yyerror (const char *msgid)
 {
-  const char *string = _(msgid);
-
-  if (last_token == CPP_EOF)
-    error ("%s at end of input", string);
-  else if (last_token == CPP_CHAR || last_token == CPP_WCHAR)
-    {
-      unsigned int val = TREE_INT_CST_LOW (yylval.ttype);
-      const char *const ell = (last_token == CPP_CHAR) ? "" : "L";
-      if (val <= UCHAR_MAX && ISGRAPH (val))
-       error ("%s before %s'%c'", string, ell, val);
-      else
-       error ("%s before %s'\\x%x'", string, ell, val);
-    }
-  else if (last_token == CPP_STRING
-          || last_token == CPP_WSTRING)
-    error ("%s before string constant", string);
-  else if (last_token == CPP_NUMBER)
-    error ("%s before numeric constant", string);
-  else if (last_token == CPP_NAME)
-    error ("%s before \"%s\"", string, IDENTIFIER_POINTER (yylval.ttype));
-  else
-    error ("%s before '%s' token", string, NAME(last_token));
+  c_parse_error (msgid, last_token, yylval.ttype);
 }
 
 static int
-yylexname ()
+yylexname (void)
 {
   tree decl;
-  
-ifobjc
+
+@@ifobjc
   int objc_force_identifier = objc_need_raw_identifier;
   OBJC_NEED_RAW_IDENTIFIER (0);
-end ifobjc
-  
+@@end_ifobjc
+
   if (C_IS_RESERVED_WORD (yylval.ttype))
     {
       enum rid rid_code = C_RID_CODE (yylval.ttype);
 
-ifobjc
+@@ifobjc
       /* Turn non-typedefed refs to "id" into plain identifiers; this
         allows constructs like "void foo(id id);" to work.  */
       if (rid_code == RID_ID)
@@ -3594,23 +3581,11 @@ ifobjc
 
       if (!OBJC_IS_AT_KEYWORD (rid_code)
          && (!OBJC_IS_PQ_KEYWORD (rid_code) || objc_pq_context))
-end ifobjc
+@@end_ifobjc
       {
-       int yycode = rid_to_yy[(int) rid_code];
-       if (yycode == STRING_FUNC_NAME)
-         {
-           /* __FUNCTION__ and __PRETTY_FUNCTION__ get converted
-              to string constants.  */
-           const char *name = fname_string (rid_code);
-         
-           yylval.ttype = build_string (strlen (name) + 1, name);
-           last_token = CPP_STRING;  /* so yyerror won't choke */
-           return STRING;
-         }
-      
        /* Return the canonical spelling for this keyword.  */
        yylval.ttype = ridpointers[(int) rid_code];
-       return yycode;
+       return rid_to_yy[(int) rid_code];
       }
     }
 
@@ -3620,28 +3595,27 @@ end ifobjc
       if (TREE_CODE (decl) == TYPE_DECL)
        return TYPENAME;
     }
-ifobjc
+@@ifobjc
   else
     {
       tree objc_interface_decl = is_class_name (yylval.ttype);
       /* ObjC class names are in the same namespace as variables and
         typedefs, and hence are shadowed by local declarations.  */
-      if (objc_interface_decl 
-         && (global_bindings_p () 
+      if (objc_interface_decl
+         && (global_bindings_p ()
              || (!objc_force_identifier && !decl)))
        {
          yylval.ttype = objc_interface_decl;
          return CLASSNAME;
        }
     }
-end ifobjc
+@@end_ifobjc
 
   return IDENTIFIER;
 }
 
-
 static inline int
-_yylex ()
+_yylex (void)
 {
  get_next:
   last_token = c_lex (&yylval.ttype);
@@ -3707,6 +3681,10 @@ _yylex ()
     case CPP_NAME:
       return yylexname ();
 
+    case CPP_AT_NAME:
+      /* This only happens in Objective-C; it must be a keyword.  */
+      return rid_to_yy [(int) C_RID_CODE (yylval.ttype)];
+
     case CPP_NUMBER:
     case CPP_CHAR:
     case CPP_WCHAR:
@@ -3715,29 +3693,9 @@ _yylex ()
     case CPP_STRING:
     case CPP_WSTRING:
       return STRING;
-      
-      /* This token is Objective-C specific.  It gives the next token
-        special significance.  */
-    case CPP_ATSIGN:
-ifobjc
-      {
-       tree after_at;
-       enum cpp_ttype after_at_type;
-
-       after_at_type = c_lex (&after_at);
-
-       if (after_at_type == CPP_NAME
-           && C_IS_RESERVED_WORD (after_at)
-           && OBJC_IS_AT_KEYWORD (C_RID_CODE (after_at)))
-         {
-           yylval.ttype = after_at;
-           last_token = after_at_type;
-           return rid_to_yy [(int) C_RID_CODE (after_at)];
-         }
-       _cpp_backup_tokens (parse_in, 1);
-       return '@';
-      }
-end ifobjc
+
+    case CPP_OBJC_STRING:
+      return OBJC_STRING;
 
       /* These tokens are C++ specific (and will not be generated
          in C mode, but let's be cautious).  */
@@ -3761,7 +3719,7 @@ end ifobjc
 }
 
 static int
-yylex()
+yylex (void)
 {
   int r;
   timevar_push (TV_LEX);
@@ -3770,33 +3728,15 @@ yylex()
   return r;
 }
 
-/* Sets the value of the 'yydebug' variable to VALUE.
-   This is a function so we don't have to have YYDEBUG defined
-   in order to build the compiler.  */
-
-void
-c_set_yydebug (value)
-     int value;
-{
-#if YYDEBUG != 0
-  yydebug = value;
-#else
-  warning ("YYDEBUG not defined.");
-#endif
-}
-
 /* Function used when yydebug is set, to print a token in more detail.  */
 
 static void
-yyprint (file, yychar, yyl)
-     FILE *file;
-     int yychar;
-     YYSTYPE yyl;
+yyprint (FILE *file, int yychar, YYSTYPE yyl)
 {
   tree t = yyl.ttype;
 
   fprintf (file, " [%s]", NAME(last_token));
-  
+
   switch (yychar)
     {
     case IDENTIFIER:
@@ -3805,6 +3745,7 @@ yyprint (file, yychar, yyl)
     case TYPESPEC:
     case TYPE_QUAL:
     case SCSPEC:
+    case STATIC:
       if (IDENTIFIER_POINTER (t))
        fprintf (file, " `%s'", IDENTIFIER_POINTER (t));
       break;
@@ -3812,49 +3753,30 @@ yyprint (file, yychar, yyl)
     case CONSTANT:
       fprintf (file, " %s", GET_MODE_NAME (TYPE_MODE (TREE_TYPE (t))));
       if (TREE_CODE (t) == INTEGER_CST)
-       fprintf (file,
-#if HOST_BITS_PER_WIDE_INT == 64
-#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT
-                " 0x%x%016x",
-#else
-#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
-                " 0x%lx%016lx",
-#else
-                " 0x%llx%016llx",
-#endif
-#endif
-#else
-#if HOST_BITS_PER_WIDE_INT != HOST_BITS_PER_INT
-                " 0x%lx%08lx",
-#else
-                " 0x%x%08x",
-#endif
-#endif
-                TREE_INT_CST_HIGH (t), TREE_INT_CST_LOW (t));
+       {
+         fputs (" ", file);
+         fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
+                  TREE_INT_CST_HIGH (t), TREE_INT_CST_LOW (t));
+       }
       break;
     }
 }
 \f
-/* This is not the ideal place to put these, but we have to get them out
-   of c-lex.c because cp/lex.c has its own versions.  */
-
-/* Return something to represent absolute declarators containing a *.
-   TARGET is the absolute declarator that the * contains.
-   TYPE_QUALS_ATTRS is a list of modifiers such as const or volatile
-   to apply to the pointer type, represented as identifiers, possible mixed
-   with attributes.
+/* This is not the ideal place to put this, but we have to get it out
+   of c-lex.c because cp/lex.c has its own version.  */
 
-   We return an INDIRECT_REF whose "contents" are TARGET (inside a TREE_LIST,
-   if attributes are present) and whose type is the modifier list.  */
-
-tree
-make_pointer_declarator (type_quals_attrs, target)
-     tree type_quals_attrs, target;
+/* Parse the file.  */
+void
+c_parse_file (void)
 {
-  tree quals, attrs;
-  tree itarget = target;
-  split_specs_attrs (type_quals_attrs, &quals, &attrs);
-  if (attrs != NULL_TREE)
-    itarget = tree_cons (attrs, target, NULL_TREE);
-  return build1 (INDIRECT_REF, quals, itarget);
+  yyparse ();
+
+  if (malloced_yyss)
+    {
+      free (malloced_yyss);
+      free (malloced_yyvs);
+      malloced_yyss = 0;
+    }
 }
+
+#include "gt-c-parse.h"