OSDN Git Service

Enable tree browser for all front ends.
[pf3gnuchains/gcc-fork.git] / gcc / c-parse.in
index 47b5a3a..ed187cb 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,25 +20,25 @@ 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 32 /* 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"
@@ -46,17 +46,14 @@ end ifc
 #include "c-pragma.h"          /* For YYDEBUG definition, and parse_in.  */
 #include "c-tree.h"
 #include "flags.h"
+#include "varray.h"
 #include "output.h"
 #include "toplev.h"
 #include "ggc.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; }
@@ -79,15 +76,13 @@ do {                                                                        \
   newsize = *(YYSSZ) *= 2;                                             \
   if (malloced_yyss)                                                   \
     {                                                                  \
-      newss = (short *)                                                        \
-       really_call_realloc (*(SS), newsize * sizeof (short));          \
-      newvs = (YYSTYPE *)                                              \
-       really_call_realloc (*(VS), newsize * sizeof (YYSTYPE));        \
+      newss = really_call_realloc (*(SS), newsize * sizeof (short));   \
+      newvs = really_call_realloc (*(VS), newsize * sizeof (YYSTYPE)); \
     }                                                                  \
   else                                                                 \
     {                                                                  \
-      newss = (short *) really_call_malloc (newsize * sizeof (short)); \
-      newvs = (YYSTYPE *) really_call_malloc (newsize * sizeof (YYSTYPE)); \
+      newss = really_call_malloc (newsize * sizeof (short));           \
+      newvs = really_call_malloc (newsize * sizeof (YYSTYPE));         \
       if (newss)                                                       \
         memcpy (newss, *(SS), (SSSIZE));                               \
       if (newvs)                                                       \
@@ -108,7 +103,7 @@ do {                                                                        \
 %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 */
@@ -138,6 +133,7 @@ do {                                                                        \
 
 /* String constants in raw form.
    yylval is a STRING_CST node.  */
+
 %token STRING
 
 /* "...", used for functions with variable arglists.  */
@@ -150,9 +146,7 @@ do {                                                                        \
 %token ATTRIBUTE EXTENSION LABEL
 %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
 
 /* Add precedence rules to solve dangling else s/r conflict */
 %nonassoc IF
@@ -182,6 +176,8 @@ do {                                                                        \
    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
@@ -204,15 +200,15 @@ do {                                                                      \
 %type <ttype> typespec_reserved_nonattr typespec_reserved_attr
 %type <ttype> typespec_nonreserved_nonattr
 
-%type <ttype> scspec SCSPEC STATIC 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
@@ -235,12 +231,11 @@ do {                                                                      \
 %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
@@ -249,10 +244,13 @@ 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 OBJC_STRING
 
-%type <ttype> CLASSNAME OBJECTNAME
-end ifobjc
+%type <ttype> superclass
+%type <itype> objc_try_catch_stmt objc_finally_block
+@@end_ifobjc
 \f
 %{
 /* Number of statements (loosely speaking) and compound statements
@@ -260,10 +258,10 @@ end ifobjc
 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 GTY(()) tree current_declspecs;
@@ -298,22 +296,21 @@ static GTY(()) tree declspec_stack;
 
 /* For __extension__, save/restore the warning flags which are
    controlled by __extension__.  */
-#define SAVE_EXT_FLAGS()                       \
-       size_int (pedantic                      \
-                 | (warn_pointer_arith << 1)   \
-                 | (warn_traditional << 2)     \
-                 | (flag_iso << 3))
+#define SAVE_EXT_FLAGS()               \
+       (pedantic                       \
+        | (warn_pointer_arith << 1)    \
+        | (warn_traditional << 2)      \
+        | (flag_iso << 3))
 
-#define RESTORE_EXT_FLAGS(tval)                        \
+#define RESTORE_EXT_FLAGS(val)                 \
   do {                                         \
-    int val = tree_low_cst (tval, 0);          \
     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;
@@ -325,29 +322,26 @@ static int objc_pq_context = 0, objc_public_flag = 0;
    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
-
-static bool parsing_iso_function_signature;
+@@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 int yylexstring   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);
 
   /* Initialisation routine for this file.  */
 void
-c_parse_init ()
+c_parse_init (void)
 {
   init_reswords ();
 }
@@ -358,20 +352,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);
-                 /* __FUNCTION__ is defined at file scope ("").  This
-                    call may not be necessary as my tests indicate it
-                    still works without it.  */
-                 finish_fname_decls ();
-                  finish_file ();
-               }
        ;
 
 /* the reason for the strange actions in this rule
@@ -384,26 +366,14 @@ extdefs:
        ;
 
 extdef:
-       extdef_1
-       { parsing_iso_function_signature = false; } /* Reset after any external definition.  */
-       ;
-
-extdef_1:
        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_EXT_FLAGS ($1); }
+@@ifobjc
+       | objcdef
+@@end_ifobjc
        ;
 
 datadef:
@@ -433,12 +403,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, 1);
+         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; }
@@ -447,12 +416,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, 1);
+         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; }
@@ -461,12 +429,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, 1);
+         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; }
@@ -475,10 +442,10 @@ fndef:
 identifier:
        IDENTIFIER
        | TYPENAME
-ifobjc
+@@ifobjc
        | OBJECTNAME
        | CLASSNAME
-end ifobjc
+@@end_ifobjc
        ;
 
 unop:     '&'
@@ -487,10 +454,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; }
@@ -533,21 +500,6 @@ unary_expr:
        /* 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
@@ -577,6 +529,10 @@ alignof:
        ALIGNOF { skip_evaluation++; }
        ;
 
+typeof:
+       TYPEOF { skip_evaluation++; }
+       ;
+
 cast_expr:
        unary_expr
        | '(' typename ')' cast_expr  %prec UNARY
@@ -610,39 +566,38 @@ expr_no_commas:
        | expr_no_commas '^' expr_no_commas
                { $$ = parser_build_binary_op ($2, $1, $3); }
        | expr_no_commas ANDAND
-               { $1 = c_common_truthvalue_conversion
+               { $1 = lang_hooks.truthvalue_conversion
                    (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_false_node; }
+                 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 = c_common_truthvalue_conversion
+               { $1 = lang_hooks.truthvalue_conversion
                    (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_true_node; }
+                 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 = c_common_truthvalue_conversion
+               { $1 = lang_hooks.truthvalue_conversion
                    (default_conversion ($1));
-                 skip_evaluation += $1 == boolean_false_node; }
+                 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 = c_common_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;
@@ -671,8 +626,7 @@ primary:
                }
        | CONSTANT
        | STRING
-               { $$ = fix_string_type ($$); }
-       | VAR_FUNC_NAME
+       | FUNC_NAME
                { $$ = fname_decl (C_RID_CODE ($$), $$); }
        | '(' typename ')' '{'
                { start_init (NULL_TREE, NULL, 0);
@@ -684,7 +638,7 @@ primary:
                  finish_init ();
 
                  if (pedantic && ! flag_isoc99)
-                   pedwarn ("ISO C89 forbids compound literals");
+                   pedwarn ("ISO C90 forbids compound literals");
                  $$ = build_compound_literal (type, constructor);
                }
        | '(' expr ')'
@@ -699,8 +653,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;
@@ -709,10 +661,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;
@@ -739,36 +691,36 @@ primary:
                  e1 = TYPE_MAIN_VARIANT (groktypename ($3));
                  e2 = TYPE_MAIN_VARIANT (groktypename ($5));
 
-                 $$ = comptypes (e1, e2)
+                 $$ = comptypes (e1, e2, COMPARE_STRICT)
                    ? build_int_2 (1, 0) : build_int_2 (0, 0);
                }
        | primary '[' expr ']'   %prec '.'
                { $$ = build_array_ref ($1, $3); }
        | primary '.' identifier
                {
-ifobjc
+@@ifobjc
                    if (!is_public ($1, $3))
                      $$ = error_mark_node;
                    else
-end ifobjc
+@@end_ifobjc
                      $$ = build_component_ref ($1, $3);
                }
        | primary POINTSAT identifier
                {
                   tree expr = build_indirect_ref ($1, "->");
 
-ifobjc
+@@ifobjc
                      if (!is_public (expr, $3))
                        $$ = error_mark_node;
                      else
-end ifobjc
+@@end_ifobjc
                        $$ = 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
@@ -777,50 +729,21 @@ ifobjc
                { $$ = build_protocol_expr ($1); }
        | objcencodeexpr
                { $$ = build_encode_expr ($1); }
-       | objc_string
+       | OBJC_STRING
                { $$ = build_objc_string_object ($1); }
-end ifobjc
+@@end_ifobjc
        ;
 
-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); }
-       ;
-end ifobjc
-
 old_style_parm_decls:
-       old_style_parm_decls_1
-       {
-         parsing_iso_function_signature = false; /* Reset after decls.  */
-       }
-       ;
-
-old_style_parm_decls_1:
        /* empty */
-       {
-         if (warn_traditional && !in_system_header
-             && parsing_iso_function_signature)
-           warning ("traditional C rejects ISO C style function definitions");
-         parsing_iso_function_signature = false; /* Reset after warning.  */
-       }
        | 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
                { }
        ;
 
@@ -852,7 +775,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
                { }
        ;
 
@@ -1403,7 +1326,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
@@ -1413,11 +1336,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.  */
@@ -1432,13 +1359,6 @@ notype_initdecls:
        | notype_initdecls ',' maybe_resetattrs notype_initdcl
        ;
 
-maybeasm:
-         /* empty */
-               { $$ = NULL_TREE; }
-       | ASM_KEYWORD '(' STRING ')'
-               { $$ = $3; }
-       ;
-
 initdcl:
          declarator maybeasm maybe_attribute '='
                { $<ttype>$ = start_decl ($1, current_declspecs, 1,
@@ -1473,7 +1393,7 @@ notype_initdcl:
    so that the header files compile. */
 maybe_attribute:
       /* empty */
-               { $$ = NULL_TREE; }
+               { $$ = NULL_TREE; }
        | attributes
                { $$ = $1; }
        ;
@@ -1486,8 +1406,11 @@ attributes:
        ;
 
 attribute:
-      ATTRIBUTE '(' '(' attribute_list ')' ')'
-               { $$ = $4; }
+      ATTRIBUTE stop_string_translation
+                '(' '(' attribute_list ')' ')' start_string_translation
+               { $$ = $5; }
+      | ATTRIBUTE error start_string_translation
+                {}
        ;
 
 attribute_list:
@@ -1555,7 +1478,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 `='"); }
@@ -1606,21 +1529,20 @@ nested_function:
                      pop_function_context ();
                      YYERROR1;
                    }
-                 parsing_iso_function_signature = false; /* Don't warn about nested functions.  */
                }
-          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, 1);
+                 finish_function ();
                  pop_function_context ();
                  add_decl_stmt (decl); }
        ;
@@ -1637,21 +1559,20 @@ notype_nested_function:
                      pop_function_context ();
                      YYERROR1;
                    }
-                 parsing_iso_function_signature = false; /* Don't warn about nested functions.  */
                }
-         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, 1);
+                 finish_function ();
                  pop_function_context ();
                  add_decl_stmt (decl); }
        ;
@@ -1671,17 +1592,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
@@ -1696,23 +1614,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
@@ -1729,9 +1641,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
@@ -1774,18 +1683,20 @@ structsp_attr:
                  /* Start scope of tag before parsing components.  */
                }
          component_decl_list '}' maybe_attribute
-               { $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
+               { $$ = 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); }
@@ -1824,44 +1735,45 @@ 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
@@ -1869,7 +1781,7 @@ component_decl:
                  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;
@@ -1877,7 +1789,7 @@ 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; }
@@ -1889,45 +1801,47 @@ component_decl:
 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
@@ -1935,7 +1849,7 @@ enumlist:
                { if ($1 == error_mark_node)
                    $$ = $1;
                  else
-                   $$ = chainon ($3, $1); }
+                   TREE_CHAIN ($3) = $1, $$ = $3; }
        | error
                { $$ = error_mark_node; }
        ;
@@ -2011,16 +1925,16 @@ direct_absdcl1:
 /* The [...] part of a declarator for an array type.  */
 
 array_declarator:
-       '[' maybe_type_quals_attrs expr ']'
+       '[' maybe_type_quals_attrs expr_no_commas ']'
                { $$ = build_array_declarator ($3, $2, 0, 0); }
        | '[' maybe_type_quals_attrs ']'
                { $$ = build_array_declarator (NULL_TREE, $2, 0, 0); }
        | '[' maybe_type_quals_attrs '*' ']'
                { $$ = build_array_declarator (NULL_TREE, $2, 0, 1); }
-       | '[' STATIC maybe_type_quals_attrs expr ']'
+       | '[' 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 ']'
+       | '[' declspecs_nosc_nots STATIC expr_no_commas ']'
                { $$ = build_array_declarator ($4, $2, 1, 0); }
        ;
 
@@ -2035,7 +1949,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
        ;
@@ -2051,8 +1965,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
        ;
@@ -2080,19 +1997,21 @@ 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.  */
@@ -2100,13 +2019,9 @@ 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;
@@ -2120,7 +2035,7 @@ 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);
+                     $$ = pop_scope ();
                      SCOPE_STMT_BLOCK (TREE_PURPOSE (scope_stmt))
                        = SCOPE_STMT_BLOCK (TREE_VALUE (scope_stmt))
                        = $$;
@@ -2148,7 +2063,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);
                    }
@@ -2169,8 +2084,8 @@ compstmt_start: '{' { compstmt_count++;
 
 compstmt_nostart: '}'
                { $$ = convert (void_type_node, integer_zero_node); }
-       | pushlevel maybe_label_decls compstmt_contents_nonempty '}' poplevel
-               { $$ = poplevel (kept_level_p (), 1, 0);
+       | push_scope maybe_label_decls compstmt_contents_nonempty '}' pop_scope
+               { $$ = pop_scope ();
                  SCOPE_STMT_BLOCK (TREE_PURPOSE ($5))
                    = SCOPE_STMT_BLOCK (TREE_VALUE ($5))
                    = $$; }
@@ -2193,7 +2108,6 @@ 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));
                }
@@ -2217,7 +2131,7 @@ simple_if:
 
 if_prefix:
          /* We must build the IF_STMT node before parsing its
-            condition so that STMT_LINENO refers to the line
+            condition so that EXPR_LOCUS refers to the line
             containing the "if", and not the line containing
             the close-parenthesis.
 
@@ -2227,11 +2141,10 @@ if_prefix:
           IF
                 { $<ttype>$ = c_begin_if_stmt (); }
             '(' expr ')'
-               { c_expand_start_cond (c_common_truthvalue_conversion ($4),
+               { 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.
@@ -2241,6 +2154,7 @@ do_stmt_start:
          DO
                { stmt_count++;
                  compstmt_count++;
+                 c_in_iteration_stmt++;
                  $<ttype>$
                    = add_stmt (build_stmt (DO_STMT, NULL_TREE,
                                            NULL_TREE));
@@ -2251,22 +2165,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:
@@ -2282,24 +2192,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);
                    }
                }
        ;
@@ -2320,15 +2227,15 @@ 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 STMT_LINENO refers to the line
+         condition so that EXPR_LOCUS refers to the line
          containing the "while", and not the line containing
          the close-parenthesis.
 
@@ -2339,17 +2246,19 @@ select_or_iter_stmt:
                 { stmt_count++;
                  $<ttype>$ = c_begin_while_stmt (); }
          '(' expr ')'
-                { $4 = c_common_truthvalue_conversion ($4);
+                { c_in_iteration_stmt++;
+                 $4 = lang_hooks.truthvalue_conversion ($4);
                  c_finish_while_stmt_cond
-                   (c_common_truthvalue_conversion ($4), $<ttype>2);
+                   (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) = c_common_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);
@@ -2360,16 +2269,20 @@ select_or_iter_stmt:
          xexpr ';'
                 { if ($6)
                    FOR_COND ($<ttype>2)
-                     = c_common_truthvalue_conversion ($6); }
+                     = 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:
@@ -2379,6 +2292,12 @@ for_init_stmt:
                { check_for_loop_decls (); }
        ;
 
+xexpr:
+       /* empty */
+               { $$ = NULL_TREE; }
+       | expr
+       ;
+
 /* Parse a single real statement, not including any labels.  */
 stmt:
          compstmt
@@ -2392,9 +2311,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++;
@@ -2402,23 +2333,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++;
@@ -2439,6 +2354,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.
@@ -2454,12 +2422,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
@@ -2467,20 +2435,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
@@ -2497,12 +2514,13 @@ nonnull_asm_operands:
        ;
 
 asm_operand:
-         STRING '(' expr ')'
-               { $$ = build_tree_list (build_tree_list (NULL_TREE, $1), $3); }
-       | '[' identifier ']' STRING '(' expr ')'
+         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), $6); }
+                 $$ = build_tree_list (build_tree_list ($2, $4), $7); }
        ;
 
 asm_clobbers:
@@ -2511,6 +2529,15 @@ asm_clobbers:
        | 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
@@ -2519,54 +2546,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);
-                 parsing_iso_function_signature = true;
-               }
+               { $$ = get_parm_info (/*ellipsis=*/false); }
        | parms ',' ELLIPSIS
-               { $$ = get_parm_info (0); }
+               { $$ = get_parm_info (/*ellipsis=*/true); }
        ;
 
 parms:
@@ -2641,13 +2654,11 @@ setspecs_fp:
    Its value is a list of ..._TYPE nodes or a list of identifiers.  */
 parmlist_or_identifiers:
          maybe_attribute
-               { pushlevel (0);
-                 clear_parm_order ();
-                 declare_parm_level (1); }
+               { push_scope ();
+                 declare_parm_level (); }
          parmlist_or_identifiers_1
                { $$ = $3;
-                 parmlist_tags_warning ();
-                 poplevel (0, 0, 0); }
+                 pop_scope (); }
        ;
 
 parmlist_or_identifiers_1:
@@ -2693,7 +2704,7 @@ extension:
                  flag_iso = 0; }
        ;
 \f
-ifobjc
+@@ifobjc
 /* Objective-C productions.  */
 
 objcdef:
@@ -2737,103 +2748,41 @@ aliasdecl:
                }
        ;
 
-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
+         class_ivars
                {
-                 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
-               {
-                 objc_implementation_context
-                   = start_class (CLASS_IMPLEMENTATION_TYPE, $2, $4, NULL_TREE);
                   objc_ivar_chain
                    = continue_class (objc_implementation_context);
                }
@@ -2844,8 +2793,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;
@@ -2992,10 +2940,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
@@ -3014,14 +2961,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:
@@ -3039,10 +2980,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
        ;
@@ -3127,7 +3067,7 @@ myparm:
 optparmlist:
          /* empty */
                {
-                 $$ = NULL_TREE;
+                 $$ = NULL_TREE;
                }
        | ',' ELLIPSIS
                {
@@ -3136,13 +3076,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 ();
                }
        ;
 
@@ -3239,6 +3179,10 @@ receiver:
                {
                  $$ = get_class_reference ($1);
                }
+       | TYPENAME
+               {
+                 $$ = get_class_reference ($1);
+               }
        ;
 
 objcmessageexpr:
@@ -3293,7 +3237,7 @@ objcencodeexpr:
                }
        ;
 
-end ifobjc
+@@end_ifobjc
 %%
 
 /* yylex() is a thin wrapper around c_lex(), all it does is translate
@@ -3328,8 +3272,6 @@ 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_types_compatible_p", RID_TYPES_COMPATIBLE_P, 0 },
   { "__builtin_va_arg",        RID_VA_ARG,     0 },
@@ -3359,8 +3301,6 @@ static const struct resword reswords[] =
   { "__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 },
@@ -3399,7 +3339,7 @@ static const struct resword reswords[] =
   { "void",            RID_VOID,       0 },
   { "volatile",                RID_VOLATILE,   0 },
   { "while",           RID_WHILE,      0 },
-ifobjc
+@@ifobjc
   { "id",              RID_ID,                 D_OBJC },
 
   /* These objc keywords are recognized only immediately after
@@ -3416,7 +3356,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 },
@@ -3425,7 +3369,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))
 
@@ -3449,8 +3393,6 @@ 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,
 
@@ -3509,9 +3451,9 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_CHOOSE_EXPR */                        CHOOSE_EXPR,
   /* RID_TYPES_COMPATIBLE_P */         TYPES_COMPATIBLE_P,
 
-  /* RID_FUNCTION_NAME */              STRING_FUNC_NAME,
-  /* RID_PRETTY_FUNCTION_NAME */       STRING_FUNC_NAME,
-  /* RID_C99_FUNCTION_NAME */          VAR_FUNC_NAME,
+  /* RID_FUNCTION_NAME */              FUNC_NAME,
+  /* RID_PRETTY_FUNCTION_NAME */       FUNC_NAME,
+  /* RID_C99_FUNCTION_NAME */          FUNC_NAME,
 
   /* C++ */
   /* RID_BOOL */       TYPESPEC,
@@ -3527,6 +3469,7 @@ static const short rid_to_yy[RID_MAX] =
   /* RID_FALSE */      0,
   /* RID_NAMESPACE */  0,
   /* RID_NEW */                0,
+  /* RID_OFFSETOF */    0,
   /* RID_OPERATOR */   0,
   /* RID_THIS */       0,
   /* RID_THROW */      0,
@@ -3542,19 +3485,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,
@@ -3567,25 +3497,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_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
@@ -3603,48 +3535,26 @@ init_reswords ()
 #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)
@@ -3656,24 +3566,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);
-           C_ARTIFICIAL_STRING_P (yylval.ttype) = 1;
-           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];
       }
     }
 
@@ -3683,7 +3580,7 @@ end ifobjc
       if (TREE_CODE (decl) == TYPE_DECL)
        return TYPENAME;
     }
-ifobjc
+@@ifobjc
   else
     {
       tree objc_interface_decl = is_class_name (yylval.ttype);
@@ -3697,65 +3594,13 @@ ifobjc
          return CLASSNAME;
        }
     }
-end ifobjc
+@@end_ifobjc
 
   return IDENTIFIER;
 }
 
-/* Concatenate strings before returning them to the parser.  This isn't quite
-   as good as having it done in the lexer, but it's better than nothing.  */
-
-static int
-yylexstring ()
-{
-  enum cpp_ttype next_type;
-  tree orig = yylval.ttype;
-
-  next_type = c_lex (&yylval.ttype);
-  if (next_type == CPP_STRING
-      || next_type == CPP_WSTRING
-      || (next_type == CPP_NAME && yylexname () == STRING))
-    {
-      varray_type strings;
-
-ifc
-      static int last_lineno = 0;
-      static const char *last_input_filename = 0;
-      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
-
-      VARRAY_TREE_INIT (strings, 32, "strings");
-      VARRAY_PUSH_TREE (strings, orig);
-
-      do
-       {
-         VARRAY_PUSH_TREE (strings, yylval.ttype);
-         next_type = c_lex (&yylval.ttype);
-       }
-      while (next_type == CPP_STRING
-            || next_type == CPP_WSTRING
-            || (next_type == CPP_NAME && yylexname () == STRING));
-
-      yylval.ttype = combine_strings (strings);
-    }
-  else
-    yylval.ttype = orig;
-
-  /* We will have always read one token too many.  */
-  _cpp_backup_tokens (parse_in, 1);
-
-  return STRING;
-}
-
 static inline int
-_yylex ()
+_yylex (void)
 {
  get_next:
   last_token = c_lex (&yylval.ttype);
@@ -3819,13 +3664,11 @@ _yylex ()
       return 0;
 
     case CPP_NAME:
-      {
-       int ret = yylexname ();
-       if (ret == STRING)
-         return yylexstring ();
-       else
-         return ret;
-      }
+      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:
@@ -3834,30 +3677,10 @@ _yylex ()
 
     case CPP_STRING:
     case CPP_WSTRING:
-      return yylexstring ();
+      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).  */
@@ -3881,7 +3704,7 @@ end ifobjc
 }
 
 static int
-yylex()
+yylex (void)
 {
   int r;
   timevar_push (TV_LEX);
@@ -3893,10 +3716,7 @@ yylex()
 /* 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;
 
@@ -3918,41 +3738,29 @@ 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.  */
-
-/* Free malloced parser stacks if necessary.  */
+/* 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.  */
 
+/* Parse the file.  */
 void
-free_parser_stacks ()
+c_parse_file (void)
 {
+  yyparse ();
+
   if (malloced_yyss)
     {
       free (malloced_yyss);
       free (malloced_yyvs);
+      malloced_yyss = 0;
     }
 }