OSDN Git Service

* ifcvt.c: New file.
[pf3gnuchains/gcc-fork.git] / gcc / c-parse.in
index 0862d30..deea8e9 100644 (file)
@@ -1,5 +1,6 @@
 /* YACC parser for C syntax and for Objective C.  -*-c-*-
-   Copyright (C) 1987, 88, 89, 92, 93, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996,
+   1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -15,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free 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.
@@ -24,43 +26,29 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    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.  */
+   written by AT&T, but I have never seen it.  */
 
 ifobjc
-%expect 22
+%expect 74
 end ifobjc
 ifc
-%expect 10
-
-/* These are the 10 conflicts you should get in parse.output;
-   the state numbers may vary if minor changes in the grammar are made.
-
-State 41 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 97 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 104 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 108 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 124 contains 1 shift/reduce conflict.  (See comment at component_decl.)
-State 191 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 204 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 210 contains 1 shift/reduce conflict.  (Two ways to recover from error.)
-State 449 contains 2 shift/reduce conflicts.  (Four ways to parse this.)
-*/
+%expect 53
 end ifc
 
 %{
-#include <stdio.h>
-#include <errno.h>
-#include <setjmp.h>
-
 #include "config.h"
+#include "system.h"
+#include <setjmp.h>
 #include "tree.h"
 #include "input.h"
 #include "c-lex.h"
 #include "c-tree.h"
 #include "flags.h"
-
+#include "output.h"
+#include "toplev.h"
+#include "ggc.h"
+  
 #ifdef MULTIBYTE_CHARS
-#include <stdlib.h>
 #include <locale.h>
 #endif
 
@@ -71,18 +59,12 @@ end ifobjc
 /* Since parsers are distinct for each language, put the language string
    definition here.  */
 ifobjc
-char *language_string = "GNU Obj-C";
+const char * const language_string = "GNU Obj-C";
 end ifobjc
 ifc
-char *language_string = "GNU C";
+const char * const language_string = "GNU C";
 end ifc
 
-#ifndef errno
-extern int errno;
-#endif
-
-void yyerror ();
-
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
@@ -93,7 +75,7 @@ void yyerror ();
 %start program
 
 %union {long itype; tree ttype; enum tree_code code;
-       char *filename; int lineno; }
+       char *filename; int lineno; int ends_in_label; }
 
 /* All identifiers that are not reserved words
    and are not declared typedefs in the current block */
@@ -112,7 +94,7 @@ void yyerror ();
    yylval contains an IDENTIFIER_NODE which indicates which one.  */
 %token TYPESPEC
 
-/* Reserved words that qualify type: "const" or "volatile".
+/* Reserved words that qualify type: "const", "volatile", or "restrict".
    yylval contains an IDENTIFIER_NODE which indicates which one.  */
 %token TYPE_QUAL
 
@@ -130,9 +112,13 @@ void yyerror ();
 /* the reserved words */
 /* SCO include files test "ASM", so use something else. */
 %token SIZEOF ENUM STRUCT UNION IF ELSE WHILE DO FOR SWITCH CASE DEFAULT
-%token BREAK CONTINUE RETURN GOTO ASM_KEYWORD TYPEOF ALIGNOF ALIGN
+%token BREAK CONTINUE RETURN GOTO ASM_KEYWORD TYPEOF ALIGNOF
 %token ATTRIBUTE EXTENSION LABEL
-%token REALPART IMAGPART
+%token REALPART IMAGPART VA_ARG
+%token PTR_VALUE PTR_BASE PTR_EXTENT
+
+/* Used in c-lex.c for parsing pragmas.  */
+%token END_OF_LINE
 
 /* Add precedence rules to solve dangling else s/r conflict */
 %nonassoc IF
@@ -175,14 +161,16 @@ void yyerror ();
 %type <ttype> typed_declspecs reserved_declspecs
 %type <ttype> typed_typespecs reserved_typespecquals
 %type <ttype> declmods typespec typespecqual_reserved
+%type <ttype> typed_declspecs_no_prefix_attr reserved_declspecs_no_prefix_attr
+%type <ttype> declmods_no_prefix_attr
 %type <ttype> SCSPEC TYPESPEC TYPE_QUAL nonempty_type_quals maybe_type_qual
 %type <ttype> initdecls notype_initdecls initdcl notype_initdcl
 %type <ttype> init maybeasm
 %type <ttype> asm_operands nonnull_asm_operands asm_operand asm_clobbers
 %type <ttype> maybe_attribute attributes attribute attribute_list attrib
-%type <ttype> any_word
+%type <ttype> any_word extension
 
-%type <ttype> compstmt
+%type <ttype> compstmt compstmt_nostart compstmt_primary_start
 
 %type <ttype> declarator
 %type <ttype> notype_declarator after_type_declarator
@@ -191,6 +179,7 @@ void yyerror ();
 %type <ttype> structsp component_decl_list component_decl_list2
 %type <ttype> component_decl components component_declarator
 %type <ttype> enumlist enumerator
+%type <ttype> struct_head union_head enum_head
 %type <ttype> typename absdcl absdcl1 type_quals
 %type <ttype> xexpr parms parm identifiers
 
@@ -200,6 +189,8 @@ void yyerror ();
 
 %type <itype> setspecs
 
+%type <ends_in_label> lineno_stmt_or_label lineno_stmt_or_labels stmt_or_label
+
 %type <filename> save_filename
 %type <lineno> save_lineno
 \f
@@ -212,28 +203,43 @@ ifobjc
 %type <ttype> keywordexpr keywordarglist keywordarg
 %type <ttype> myparms myparm optparmlist reservedwords objcselectorexpr
 %type <ttype> selectorarg keywordnamelist keywordname objcencodeexpr
-%type <ttype> objc_string protocolrefs identifier_list objcprotocolexpr
+%type <ttype> objc_string non_empty_protocolrefs protocolrefs identifier_list objcprotocolexpr
+
 %type <ttype> CLASSNAME OBJC_STRING OBJECTNAME
 end ifobjc
 \f
 %{
-/* Number of statements (loosely speaking) seen so far.  */
+/* 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;
    used by the stmt-rule immediately after simple_if returns.  */
 static char *if_stmt_file;
 static int if_stmt_line;
 
 /* List of types and structure classes of the current declaration.  */
-static tree current_declspecs;
+static tree current_declspecs = NULL_TREE;
+static tree prefix_attributes = NULL_TREE;
 
-/* Stack of saved values of current_declspecs.  */
+/* Stack of saved values of current_declspecs and prefix_attributes.  */
 static tree declspec_stack;
 
 /* 1 if we explained undeclared var errors.  */
 static int undeclared_variable_notice;
 
+/* 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;   \
+  } while (0)
+
 ifobjc
 /* Objective-C specific information */
 
@@ -251,7 +257,24 @@ end ifobjc
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint ();
+extern void yyprint                    PARAMS ((FILE *, int, YYSTYPE));
+
+/* Add GC roots for variables local to this file.  */
+void
+c_parse_init ()
+{
+  ggc_add_tree_root (&declspec_stack, 1);
+  ggc_add_tree_root (&current_declspecs, 1);
+  ggc_add_tree_root (&prefix_attributes, 1);
+ifobjc
+  ggc_add_tree_root (&objc_interface_context, 1);
+  ggc_add_tree_root (&objc_implementation_context, 1);
+  ggc_add_tree_root (&objc_method_context, 1);
+  ggc_add_tree_root (&objc_ivar_chain, 1);
+  ggc_add_tree_root (&objc_ivar_context, 1);
+end ifobjc
+}
+
 %}
 \f
 %%
@@ -293,6 +316,8 @@ end ifobjc
                    assemble_asm ($3);
                  else
                    error ("argument of `asm' is not a constant string"); }
+       | extension extdef
+               { RESTORE_WARN_FLAGS ($1); }
        ;
 
 datadef:
@@ -300,11 +325,19 @@ datadef:
                { if (pedantic)
                    error ("ANSI C forbids data definition with no type or storage class");
                  else if (!flag_traditional)
-                   warning ("data definition has no type or storage class"); }
+                   warning ("data definition has no type or storage class"); 
+
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
         | declmods setspecs notype_initdecls ';'
-         {}
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | typed_declspecs setspecs initdecls ';'
-         {}
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
         | declmods ';'
          { pedwarn ("empty declaration"); }
        | typed_declspecs ';'
@@ -318,35 +351,53 @@ datadef:
 \f
 fndef:
          typed_declspecs setspecs declarator
-               { if (! start_function ($1, $3, 0))
+               { if (! start_function (current_declspecs, $3,
+                                       prefix_attributes, NULL_TREE))
                    YYERROR1;
                  reinit_parse_for_function (); }
-         xdecls
+         old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
-               { finish_function (0); }
+               { finish_function (0); 
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | typed_declspecs setspecs declarator error
-               { }
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | declmods setspecs notype_declarator
-               { if (! start_function ($1, $3, 0))
+               { if (! start_function (current_declspecs, $3,
+                                       prefix_attributes, NULL_TREE))
                    YYERROR1;
                  reinit_parse_for_function (); }
-         xdecls
+         old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
-               { finish_function (0); }
+               { finish_function (0); 
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | declmods setspecs notype_declarator error
-               { }
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | setspecs notype_declarator
-               { if (! start_function (NULL_TREE, $2, 0))
+               { if (! start_function (NULL_TREE, $2,
+                                       prefix_attributes, NULL_TREE))
                    YYERROR1;
                  reinit_parse_for_function (); }
-         xdecls
+         old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
-               { finish_function (0); }
+               { finish_function (0); 
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | setspecs notype_declarator error
-               { }
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        ;
 
 identifier:
@@ -396,18 +447,17 @@ unary_expr:
        | '*' cast_expr   %prec UNARY
                { $$ = build_indirect_ref ($2, "unary *"); }
        /* __extension__ turns off -pedantic for following primary.  */
-       | EXTENSION
-               { $<itype>1 = pedantic;
-                 pedantic = 0; }
-         cast_expr       %prec UNARY
-               { $$ = $3;
-                 pedantic = $<itype>1; }
+       | extension cast_expr     %prec UNARY
+               { $$ = $2;
+                 RESTORE_WARN_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
                { tree label = lookup_label ($2);
+                 if (pedantic)
+                   pedwarn ("ANSI C forbids `&&'");
                  if (label == 0)
                    $$ = null_pointer_node;
                  else
@@ -432,21 +482,35 @@ unary_expr:
                      $$ = build_unary_op (ADDR_EXPR, $$, 0);
                    } }
 */
-       | SIZEOF unary_expr  %prec UNARY
-               { if (TREE_CODE ($2) == COMPONENT_REF
-                     && DECL_BIT_FIELD (TREE_OPERAND ($2, 1)))
+       | sizeof unary_expr  %prec UNARY
+               { skip_evaluation--;
+                 if (TREE_CODE ($2) == COMPONENT_REF
+                     && DECL_C_BIT_FIELD (TREE_OPERAND ($2, 1)))
                    error ("`sizeof' applied to a bit-field");
                  $$ = c_sizeof (TREE_TYPE ($2)); }
-       | SIZEOF '(' typename ')'  %prec HYPERUNARY
-               { $$ = c_sizeof (groktypename ($3)); }
-       | ALIGNOF unary_expr  %prec UNARY
-               { $$ = c_alignof_expr ($2); }
-       | ALIGNOF '(' typename ')'  %prec HYPERUNARY
-               { $$ = c_alignof (groktypename ($3)); }
+       | sizeof '(' typename ')'  %prec HYPERUNARY
+               { skip_evaluation--;
+                 $$ = c_sizeof (groktypename ($3)); }
+       | alignof unary_expr  %prec UNARY
+               { skip_evaluation--;
+                 $$ = c_alignof_expr ($2); }
+       | alignof '(' typename ')'  %prec HYPERUNARY
+               { skip_evaluation--;
+                 $$ = c_alignof (groktypename ($3)); }
        | REALPART cast_expr %prec UNARY
                { $$ = build_unary_op (REALPART_EXPR, $2, 0); }
        | IMAGPART cast_expr %prec UNARY
                { $$ = build_unary_op (IMAGPART_EXPR, $2, 0); }
+       | VA_ARG '(' expr_no_commas ',' typename ')'
+               { $$ = build_va_arg ($3, groktypename ($5)); }
+       ;
+
+sizeof:
+       SIZEOF { skip_evaluation++; }
+       ;
+
+alignof:
+       ALIGNOF { skip_evaluation++; }
        ;
 
 cast_expr:
@@ -459,12 +523,12 @@ cast_expr:
                  $2 = groktypename ($2);
                  really_start_incremental_init ($2); }
          initlist_maybe_comma '}'  %prec UNARY
-               { char *name;
+               { const char *name;
                  tree result = pop_init_level (0);
                  tree type = $2;
                  finish_init ();
 
-                 if (pedantic)
+                 if (pedantic && ! flag_isoc99)
                    pedwarn ("ANSI C forbids constructor expressions");
                  if (TYPE_NAME (type) != 0)
                    {
@@ -476,7 +540,7 @@ cast_expr:
                  else
                    name = "";
                  $$ = result;
-                 if (TREE_CODE (type) == ARRAY_TYPE && TYPE_SIZE (type) == 0)
+                 if (TREE_CODE (type) == ARRAY_TYPE && !COMPLETE_TYPE_P (type))
                    {
                      int failure = complete_array_type (type, $$, 1);
                      if (failure)
@@ -511,19 +575,54 @@ expr_no_commas:
                { $$ = parser_build_binary_op ($2, $1, $3); }
        | expr_no_commas '^' expr_no_commas
                { $$ = parser_build_binary_op ($2, $1, $3); }
-       | expr_no_commas ANDAND expr_no_commas
-               { $$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $3); }
-       | expr_no_commas OROR expr_no_commas
-               { $$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $3); }
-       | expr_no_commas '?' xexpr ':' expr_no_commas
-               { $$ = build_conditional_expr ($1, $3, $5); }
+       | expr_no_commas ANDAND
+               { $1 = truthvalue_conversion (default_conversion ($1));
+                 skip_evaluation += $1 == boolean_false_node; }
+         expr_no_commas
+               { skip_evaluation -= $1 == boolean_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; }
+         expr_no_commas
+               { skip_evaluation -= $1 == boolean_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; }
+          expr ':'
+               { skip_evaluation += (($1 == boolean_true_node)
+                                     - ($1 == boolean_false_node)); }
+         expr_no_commas
+               { skip_evaluation -= $1 == boolean_true_node;
+                 $$ = build_conditional_expr ($1, $4, $7); }
+       | expr_no_commas '?'
+               { if (pedantic)
+                   pedwarn ("ANSI 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; }
+         ':' expr_no_commas
+               { skip_evaluation -= $1 == boolean_true_node;
+                 $$ = build_conditional_expr ($1, $<ttype>2, $5); }
        | expr_no_commas '=' expr_no_commas
-               { $$ = build_modify_expr ($1, NOP_EXPR, $3);
-                 C_SET_EXP_ORIGINAL_CODE ($$, MODIFY_EXPR); }
+               { char class;
+                 $$ = build_modify_expr ($1, NOP_EXPR, $3);
+                 class = TREE_CODE_CLASS (TREE_CODE ($$));
+                 if (class == 'e' || class == '1'
+                     || class == '2' || class == '<')
+                   C_SET_EXP_ORIGINAL_CODE ($$, MODIFY_EXPR);
+               }
        | expr_no_commas ASSIGN expr_no_commas
-               { $$ = build_modify_expr ($1, $2, $3);
+               { char class;
+                 $$ = build_modify_expr ($1, $2, $3);
                  /* This inhibits warnings in truthvalue_conversion.  */
-                 C_SET_EXP_ORIGINAL_CODE ($$, ERROR_MARK); }
+                 class = TREE_CODE_CLASS (TREE_CODE ($$));
+                 if (class == 'e' || class == '1'
+                     || class == '2' || class == '<')
+                   C_SET_EXP_ORIGINAL_CODE ($$, ERROR_MARK);
+               }
        ;
 
 primary:
@@ -590,7 +689,7 @@ end ifobjc
                              if (IDENTIFIER_GLOBAL_VALUE ($1) != error_mark_node
                                  || IDENTIFIER_ERROR_LOCUS ($1) != current_function_decl)
                                {
-                                 error ("`%s' undeclared (first use this function)",
+                                 error ("`%s' undeclared (first use in this function)",
                                         IDENTIFIER_POINTER ($1));
 
                                  if (! undeclared_variable_notice)
@@ -705,42 +804,37 @@ end ifobjc
                  $$ = $2; }
        | '(' error ')'
                { $$ = error_mark_node; }
-       | '('
-               { if (current_function_decl == 0)
-                   {
-                     error ("braced-group within expression allowed only inside a function");
-                     YYERROR;
-                   }
-                 /* We must force a BLOCK for this level
-                    so that, if it is not expanded later,
-                    there is a way to turn off the entire subtree of blocks
-                    that are contained in it.  */
-                 keep_next_level ();
-                 push_iterator_stack ();
-                 push_label_level ();
-                 $<ttype>$ = expand_start_stmt_expr (); }
-         compstmt ')'
+       | compstmt_primary_start compstmt_nostart ')'
                { tree rtl_exp;
                  if (pedantic)
                    pedwarn ("ANSI C forbids braced-groups within expressions");
                  pop_iterator_stack ();
                  pop_label_level ();
-                 rtl_exp = expand_end_stmt_expr ($<ttype>2);
+                 rtl_exp = expand_end_stmt_expr ($1);
                  /* The statements have side effects, so the group does.  */
                  TREE_SIDE_EFFECTS (rtl_exp) = 1;
 
-                 if (TREE_CODE ($3) == BLOCK)
+                 if (TREE_CODE ($2) == BLOCK)
                    {
                      /* Make a BIND_EXPR for the BLOCK already made.  */
                      $$ = build (BIND_EXPR, TREE_TYPE (rtl_exp),
-                                 NULL_TREE, rtl_exp, $3);
+                                 NULL_TREE, rtl_exp, $2);
                      /* Remove the block from the tree at this point.
                         It gets put back at the proper place
                         when the BIND_EXPR is expanded.  */
-                     delete_block ($3);
+                     delete_block ($2);
                    }
                  else
-                   $$ = $3;
+                   $$ = $2;
+               }
+       | compstmt_primary_start error ')'
+               {
+                 /* Make sure we call expand_end_stmt_expr.  Otherwise
+                    we are likely to lose sequences and crash later.  */
+                 pop_iterator_stack ();
+                 pop_label_level ();
+                 expand_end_stmt_expr ($1);
+                 $$ = error_mark_node;
                }
        | primary '(' exprlist ')'   %prec '.'
                { $$ = build_function_call ($1, $3); }
@@ -798,11 +892,16 @@ end ifobjc
 string:
          STRING
        | string STRING
-               { $$ = chainon ($1, $2); }
+               { $$ = chainon ($1, $2);
+ifc
+                 if (warn_traditional && !in_system_header)
+                   warning ("Use of ANSI string concatenation");
+end ifc
+               }
        ;
 
 ifobjc
-/* Produces an OBJC_STRING_CST with prehaps more OBJC_STRING_CSTs chained
+/* Produces an OBJC_STRING_CST with perhaps more OBJC_STRING_CSTs chained
    onto it.  */
 objc_string:
          OBJC_STRING
@@ -811,7 +910,7 @@ objc_string:
        ;
 end ifobjc
 
-xdecls:
+old_style_parm_decls:
        /* empty */
        | datadecls
        | datadecls ELLIPSIS
@@ -836,19 +935,23 @@ datadecls:
        | lineno_datadecl errstmt
        ;
 
+/* We don't allow prefix attributes here because they cause reduce/reduce
+   conflicts: we can't know whether we're parsing a function decl with
+   attribute suffix, or function defn with attribute prefix on first old
+   style parm.  */
 datadecl:
-       typed_declspecs setspecs initdecls ';'
+       typed_declspecs_no_prefix_attr setspecs initdecls ';'
                { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
-       | declmods setspecs notype_initdecls ';'
-               { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
-       | typed_declspecs ';'
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | declmods_no_prefix_attr setspecs notype_initdecls ';'
+               { current_declspecs = TREE_VALUE (declspec_stack);      
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | typed_declspecs_no_prefix_attr ';'
                { shadow_tag_warned ($1, 1);
                  pedwarn ("empty declaration"); }
-       | declmods ';'
+       | declmods_no_prefix_attr ';'
                { pedwarn ("empty declaration"); }
        ;
 
@@ -873,39 +976,48 @@ decls:
    Maintains a stack of outer-level values of current_declspecs,
    for the sake of parm declarations nested in function declarators.  */
 setspecs: /* empty */
-               { $$ = suspend_momentary ();
-                 pending_xref_error ();
-                 declspec_stack = tree_cons (NULL_TREE, current_declspecs,
+               { pending_xref_error ();
+                 declspec_stack = tree_cons (prefix_attributes,
+                                             current_declspecs,
                                              declspec_stack);
-                 current_declspecs = $<ttype>0; }
+                 split_specs_attrs ($<ttype>0,
+                                    &current_declspecs, &prefix_attributes); }
+       ;
+
+/* ??? Yuck.  See after_type_declarator.  */
+setattrs: /* empty */
+               { prefix_attributes = chainon (prefix_attributes, $<ttype>0); }
        ;
 
 decl:
        typed_declspecs setspecs initdecls ';'
                { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | declmods setspecs notype_initdecls ';'
                { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | typed_declspecs setspecs nested_function
                { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | declmods setspecs notype_nested_function
                { current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | typed_declspecs ';'
                { shadow_tag ($1); }
        | declmods ';'
                { pedwarn ("empty declaration"); }
+       | extension decl
+               { RESTORE_WARN_FLAGS ($1); }
        ;
 
 /* Declspecs which contain at least one type specifier or typedef name.
    (Just `const' or `volatile' is not enough.)
-   A typedef'd name following these is taken as a name to be declared.  */
+   A typedef'd name following these is taken as a name to be declared.
+   Declspecs have a non-NULL TREE_VALUE, attributes do not.  */
 
 typed_declspecs:
          typespec reserved_declspecs
@@ -923,22 +1035,55 @@ reserved_declspecs:  /* empty */
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
                  $$ = tree_cons (NULL_TREE, $2, $1); }
+       | reserved_declspecs attributes
+               { $$ = tree_cons ($2, NULL_TREE, $1); }
+       ;
+
+typed_declspecs_no_prefix_attr:
+         typespec reserved_declspecs_no_prefix_attr
+               { $$ = tree_cons (NULL_TREE, $1, $2); }
+       | declmods_no_prefix_attr typespec reserved_declspecs_no_prefix_attr
+               { $$ = chainon ($3, tree_cons (NULL_TREE, $2, $1)); }
+       ;
+
+reserved_declspecs_no_prefix_attr:
+         /* empty */
+               { $$ = NULL_TREE; }
+       | reserved_declspecs_no_prefix_attr typespecqual_reserved
+               { $$ = tree_cons (NULL_TREE, $2, $1); }
+       | reserved_declspecs_no_prefix_attr SCSPEC
+               { if (extra_warnings)
+                   warning ("`%s' is not at beginning of declaration",
+                            IDENTIFIER_POINTER ($2));
+                 $$ = tree_cons (NULL_TREE, $2, $1); }
        ;
 
-/* List of just storage classes and type modifiers.
+/* List of just storage classes, type modifiers, and prefix attributes.
    A declaration can start with just this, but then it cannot be used
-   to redeclare a typedef-name.  */
+   to redeclare a typedef-name.
+   Declspecs have a non-NULL TREE_VALUE, attributes do not.  */
 
 declmods:
+         declmods_no_prefix_attr
+               { $$ = $1; }
+       | attributes
+               { $$ = tree_cons ($1, NULL_TREE, NULL_TREE); }
+       | declmods declmods_no_prefix_attr
+               { $$ = chainon ($2, $1); }
+       | declmods attributes
+               { $$ = tree_cons ($2, NULL_TREE, $1); }
+       ;
+
+declmods_no_prefix_attr:
          TYPE_QUAL
                { $$ = tree_cons (NULL_TREE, $1, NULL_TREE);
                  TREE_STATIC ($$) = 1; }
        | SCSPEC
                { $$ = tree_cons (NULL_TREE, $1, NULL_TREE); }
-       | declmods TYPE_QUAL
+       | declmods_no_prefix_attr TYPE_QUAL
                { $$ = tree_cons (NULL_TREE, $2, $1);
                  TREE_STATIC ($$) = 1; }
-       | declmods SCSPEC
+       | declmods_no_prefix_attr SCSPEC
                { if (extra_warnings && TREE_STATIC ($1))
                    warning ("`%s' is not at beginning of declaration",
                             IDENTIFIER_POINTER ($2));
@@ -979,6 +1124,11 @@ ifobjc
                { $$ = get_static_reference ($1, $2); }
        | OBJECTNAME protocolrefs
                { $$ = get_object_reference ($2); }
+
+/* Make "<SomeProtocol>" equivalent to "id <SomeProtocol>"
+   - nisse@lysator.liu.se */
+        | non_empty_protocolrefs
+                { $$ = get_object_reference ($1); }
 end ifobjc
        | TYPEOF '(' expr ')'
                { $$ = TREE_TYPE ($3); }
@@ -1014,33 +1164,33 @@ maybeasm:
 
 initdcl:
          declarator maybeasm maybe_attribute '='
-               { $<ttype>$ = start_decl ($1, current_declspecs, 1);
-                 decl_attributes ($<ttype>$, $3);
+               { $<ttype>$ = start_decl ($1, current_declspecs, 1,
+                                         $3, prefix_attributes);
                  start_init ($<ttype>$, $2, global_bindings_p ()); }
          init
 /* Note how the declaration of the variable is in effect while its init is parsed! */
                { finish_init ();
-                 decl_attributes ($<ttype>5, $3);
                  finish_decl ($<ttype>5, $6, $2); }
        | declarator maybeasm maybe_attribute
-               { tree d = start_decl ($1, current_declspecs, 0);
-                 decl_attributes (d, $3);
-                 finish_decl (d, NULL_TREE, $2); }
+               { tree d = start_decl ($1, current_declspecs, 0,
+                                      $3, prefix_attributes);
+                 finish_decl (d, NULL_TREE, $2); 
+                }
        ;
 
 notype_initdcl:
          notype_declarator maybeasm maybe_attribute '='
-               { $<ttype>$ = start_decl ($1, current_declspecs, 1);
-                 decl_attributes ($<ttype>$, $3);
+               { $<ttype>$ = start_decl ($1, current_declspecs, 1,
+                                         $3, prefix_attributes);
                  start_init ($<ttype>$, $2, global_bindings_p ()); }
          init
 /* Note how the declaration of the variable is in effect while its init is parsed! */
                { finish_init ();
-                 decl_attributes ($<ttype>5, $3);
+                 decl_attributes ($<ttype>5, $3, prefix_attributes);
                  finish_decl ($<ttype>5, $6, $2); }
        | notype_declarator maybeasm maybe_attribute
-               { tree d = start_decl ($1, current_declspecs, 0);
-                 decl_attributes (d, $3);
+               { tree d = start_decl ($1, current_declspecs, 0,
+                                      $3, prefix_attributes);
                  finish_decl (d, NULL_TREE, $2); }
        ;
 /* the * rules are dummies to accept the Apollo extended syntax
@@ -1066,24 +1216,22 @@ attribute:
 
 attribute_list:
       attrib
-               { $$ = build_tree_list (NULL_TREE, $1); }
+               { $$ = $1; }
        | attribute_list ',' attrib
-               { $$ = chainon ($1, build_tree_list (NULL_TREE, $3)); }
+               { $$ = chainon ($1, $3); }
        ;
  
 attrib:
     /* empty */
                { $$ = NULL_TREE; }
        | any_word
-               { $$ = $1; }
+               { $$ = build_tree_list ($1, NULL_TREE); }
        | any_word '(' IDENTIFIER ')'
-               { $$ = tree_cons ($1, NULL_TREE,
-                                 build_tree_list (NULL_TREE, $3)); }
+               { $$ = build_tree_list ($1, build_tree_list (NULL_TREE, $3)); }
        | any_word '(' IDENTIFIER ',' nonnull_exprlist ')'
-               { $$ = tree_cons ($1, NULL_TREE,
-                                 tree_cons (NULL_TREE, $3, $5)); }
-       | any_word '(' nonnull_exprlist ')'
-               { $$ = tree_cons ($1, NULL_TREE, $3); }
+               { $$ = build_tree_list ($1, tree_cons (NULL_TREE, $3, $5)); }
+       | any_word '(' exprlist ')'
+               { $$ = build_tree_list ($1, $3); }
        ;
 
 /* This still leaves out most reserved keywords,
@@ -1101,18 +1249,9 @@ any_word:
 init:
        expr_no_commas
        | '{'
-               { really_start_incremental_init (NULL_TREE);
-                 /* Note that the call to clear_momentary
-                    is in process_init_element.  */
-                 push_momentary (); }
+               { really_start_incremental_init (NULL_TREE); }
          initlist_maybe_comma '}'
-               { $$ = pop_init_level (0);
-                 if ($$ == error_mark_node
-                     && ! (yychar == STRING || yychar == CONSTANT))
-                   pop_momentary ();
-                 else
-                   pop_momentary_nofree (); }
-
+               { $$ = pop_init_level (0); }
        | error
                { $$ = error_mark_node; }
        ;
@@ -1133,45 +1272,58 @@ initlist1:
 /* `initelt' is a single element of an initializer.
    It may use braces.  */
 initelt:
-       expr_no_commas
-               { process_init_element ($1); }
-       | '{' 
+         designator_list '=' initval
+       | designator initval
+       | identifier ':'
+               { set_init_label ($1); }
+         initval
+       | initval
+       ;
+
+initval:
+         '{'
                { push_init_level (0); }
          initlist_maybe_comma '}'
                { process_init_element (pop_init_level (0)); }
+       | expr_no_commas
+               { process_init_element ($1); }
        | error
+       ;
+
+designator_list:
+         designator
+       | designator_list designator
+       ;
+
+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 grammer.  */
+          so don't include these productions in the Objective-C grammar.  */
 ifc
-       | '[' expr_no_commas ELLIPSIS expr_no_commas ']' '='
+       | '[' expr_no_commas ELLIPSIS expr_no_commas ']'
                { set_init_index ($2, $4); }
-         initelt
-       | '[' expr_no_commas ']' '='
-               { set_init_index ($2, NULL_TREE); }
-         initelt
        | '[' expr_no_commas ']'
                { set_init_index ($2, NULL_TREE); }
-         initelt
 end ifc
-       | identifier ':'
-               { set_init_label ($1); }
-         initelt
-       | '.' identifier '='
-               { set_init_label ($2); }
-         initelt
        ;
 \f
 nested_function:
          declarator
-               { push_c_function_context ();
-                 if (! start_function (current_declspecs, $1, 1))
+               { if (pedantic)
+                   pedwarn ("ANSI C forbids nested functions");
+
+                 push_function_context ();
+                 if (! start_function (current_declspecs, $1,
+                                       prefix_attributes, NULL_TREE))
                    {
-                     pop_c_function_context ();
+                     pop_function_context ();
                      YYERROR1;
                    }
-                 reinit_parse_for_function ();
-                 store_parm_decls (); }
+                 reinit_parse_for_function (); }
+          old_style_parm_decls
+               { 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
@@ -1180,19 +1332,24 @@ nested_function:
    which called YYERROR1 again, and so on.  */
          compstmt
                { finish_function (1);
-                 pop_c_function_context (); }
+                 pop_function_context (); }
        ;
 
 notype_nested_function:
          notype_declarator
-               { push_c_function_context ();
-                 if (! start_function (current_declspecs, $1, 1))
+               { if (pedantic)
+                   pedwarn ("ANSI C forbids nested functions");
+
+                 push_function_context ();
+                 if (! start_function (current_declspecs, $1,
+                                       prefix_attributes, NULL_TREE))
                    {
-                     pop_c_function_context ();
+                     pop_function_context ();
                      YYERROR1;
                    }
-                 reinit_parse_for_function ();
-                 store_parm_decls (); }
+                 reinit_parse_for_function (); }
+         old_style_parm_decls
+               { 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
@@ -1201,7 +1358,7 @@ notype_nested_function:
    which called YYERROR1 again, and so on.  */
          compstmt
                { finish_function (1);
-                 pop_c_function_context (); }
+                 pop_function_context (); }
        ;
 
 /* Any kind of declarator (thus, all declarators allowed
@@ -1228,6 +1385,13 @@ after_type_declarator:
                { $$ = build_nt (ARRAY_REF, $1, NULL_TREE); }
        | '*' type_quals after_type_declarator  %prec UNARY
                { $$ = make_pointer_declarator ($2, $3); }
+       /* ??? Yuck.  setattrs is a quick hack.  We can't use
+          prefix_attributes because $1 only applies to this
+          declarator.  We assume setspecs has already been done.
+          setattrs also avoids 5 reduce/reduce conflicts (otherwise multiple
+          attributes could be recognized here or in `attributes').  */
+       | attributes setattrs after_type_declarator
+               { $$ = $3; }
        | TYPENAME
 ifobjc
        | OBJECTNAME
@@ -1245,12 +1409,26 @@ parm_declarator:
 /*     | parm_declarator '(' error ')'  %prec '.'
                { $$ = build_nt (CALL_EXPR, $1, NULL_TREE, NULL_TREE);
                  poplevel (0, 0, 0); }  */
+ifc
+       | parm_declarator '[' '*' ']'  %prec '.'
+               { $$ = build_nt (ARRAY_REF, $1, NULL_TREE);
+                 if (! flag_isoc99)
+                   error ("`[*]' in parameter declaration only allowed in ISO C 99");
+               }
+end ifc
        | parm_declarator '[' expr ']'  %prec '.'
                { $$ = build_nt (ARRAY_REF, $1, $3); }
        | parm_declarator '[' ']'  %prec '.'
                { $$ = build_nt (ARRAY_REF, $1, NULL_TREE); }
        | '*' type_quals parm_declarator  %prec UNARY
                { $$ = make_pointer_declarator ($2, $3); }
+       /* ??? Yuck.  setattrs is a quick hack.  We can't use
+          prefix_attributes because $1 only applies to this
+          declarator.  We assume setspecs has already been done.
+          setattrs also avoids 5 reduce/reduce conflicts (otherwise multiple
+          attributes could be recognized here or in `attributes').  */
+       | attributes setattrs parm_declarator
+               { $$ = $3; }
        | TYPENAME
        ;
 
@@ -1267,49 +1445,82 @@ notype_declarator:
                { $$ = $2; }
        | '*' type_quals notype_declarator  %prec UNARY
                { $$ = make_pointer_declarator ($2, $3); }
+ifc
+       | notype_declarator '[' '*' ']'  %prec '.'
+               { $$ = build_nt (ARRAY_REF, $1, NULL_TREE);
+                 if (! flag_isoc99)
+                   error ("`[*]' in parameter declaration only allowed in ISO C 99");
+               }
+end ifc
        | notype_declarator '[' expr ']'  %prec '.'
                { $$ = build_nt (ARRAY_REF, $1, $3); }
        | notype_declarator '[' ']'  %prec '.'
                { $$ = build_nt (ARRAY_REF, $1, NULL_TREE); }
+       /* ??? Yuck.  setattrs is a quick hack.  We can't use
+          prefix_attributes because $1 only applies to this
+          declarator.  We assume setspecs has already been done.
+          setattrs also avoids 5 reduce/reduce conflicts (otherwise multiple
+          attributes could be recognized here or in `attributes').  */
+       | attributes setattrs notype_declarator
+               { $$ = $3; }
        | IDENTIFIER
        ;
 
+struct_head:
+         STRUCT
+               { $$ = NULL_TREE; }
+       | STRUCT attributes
+               { $$ = $2; }
+       ;
+
+union_head:
+         UNION
+               { $$ = NULL_TREE; }
+       | UNION attributes
+               { $$ = $2; }
+       ;
+
+enum_head:
+         ENUM
+               { $$ = NULL_TREE; }
+       | ENUM attributes
+               { $$ = $2; }
+       ;
+
 structsp:
-         STRUCT identifier '{'
+         struct_head identifier '{'
                { $$ = start_struct (RECORD_TYPE, $2);
                  /* Start scope of tag before parsing components.  */
                }
-         component_decl_list '}'
-               { $$ = finish_struct ($<ttype>4, $5);
-                 /* Really define the structure.  */
-               }
-       | STRUCT '{' component_decl_list '}'
+         component_decl_list '}' maybe_attribute 
+               { $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
+       | struct_head '{' component_decl_list '}' maybe_attribute
                { $$ = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
-                                     $3); }
-       | STRUCT identifier
+                                     $3, chainon ($1, $5));
+               }
+       | struct_head identifier
                { $$ = xref_tag (RECORD_TYPE, $2); }
-       | UNION identifier '{'
+       | union_head identifier '{'
                { $$ = start_struct (UNION_TYPE, $2); }
-         component_decl_list '}'
-               { $$ = finish_struct ($<ttype>4, $5); }
-       | UNION '{' component_decl_list '}'
+         component_decl_list '}' maybe_attribute
+               { $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
+       | union_head '{' component_decl_list '}' maybe_attribute
                { $$ = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
-                                     $3); }
-       | UNION identifier
+                                     $3, chainon ($1, $5));
+               }
+       | union_head identifier
                { $$ = xref_tag (UNION_TYPE, $2); }
-       | ENUM identifier '{'
-               { $<itype>3 = suspend_momentary ();
-                 $$ = start_enum ($2); }
-         enumlist maybecomma_warn '}'
-               { $$ = finish_enum ($<ttype>4, nreverse ($5));
-                 resume_momentary ($<itype>3); }
-       | ENUM '{'
-               { $<itype>2 = suspend_momentary ();
-                 $$ = start_enum (NULL_TREE); }
-         enumlist maybecomma_warn '}'
-               { $$ = finish_enum ($<ttype>3, nreverse ($4));
-                 resume_momentary ($<itype>2); }
-       | ENUM identifier
+       | enum_head identifier '{'
+               { $$ = start_enum ($2); }
+         enumlist maybecomma_warn '}' maybe_attribute
+               { $$ = finish_enum ($<ttype>4, nreverse ($5),
+                                   chainon ($1, $8)); }
+       | enum_head '{'
+               { $$ = start_enum (NULL_TREE); }
+         enumlist maybecomma_warn '}' maybe_attribute
+               { $$ = finish_enum ($<ttype>3, nreverse ($4),
+                                   chainon ($1, $7)); }
+       | enum_head identifier
                { $$ = xref_tag (ENUMERAL_TYPE, $2); }
        ;
 
@@ -1321,7 +1532,8 @@ maybecomma:
 maybecomma_warn:
          /* empty */
        | ','
-               { if (pedantic) pedwarn ("comma at end of enumerator list"); }
+               { if (pedantic && ! flag_isoc99)
+                   pedwarn ("comma at end of enumerator list"); }
        ;
 
 component_decl_list:
@@ -1370,18 +1582,26 @@ component_decl:
          typed_typespecs setspecs components
                { $$ = $3;
                  current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | typed_typespecs setspecs save_filename save_lineno maybe_attribute
+               {
+                 /* 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 ("ANSI C doesn't support unnamed structs/unions");
+
+                 $$ = grokfield($3, $4, NULL, current_declspecs, NULL_TREE);
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
                  declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
-       | typed_typespecs
-               { if (pedantic)
-                   pedwarn ("ANSI C forbids member declarations with no members");
-                 shadow_tag($1);
-                 $$ = NULL_TREE; }
-       | nonempty_type_quals setspecs components
+               }
+    | nonempty_type_quals setspecs components
                { $$ = $3;
                  current_declspecs = TREE_VALUE (declspec_stack);
-                 declspec_stack = TREE_CHAIN (declspec_stack);
-                 resume_momentary ($2); }
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | nonempty_type_quals
                { if (pedantic)
                    pedwarn ("ANSI C forbids member declarations with no members");
@@ -1389,6 +1609,9 @@ component_decl:
                  $$ = NULL_TREE; }
        | error
                { $$ = NULL_TREE; }
+       | extension component_decl
+               { $$ = $2;
+                 RESTORE_WARN_FLAGS ($1); }
        ;
 
 components:
@@ -1400,14 +1623,14 @@ components:
 component_declarator:
          save_filename save_lineno declarator maybe_attribute
                { $$ = grokfield ($1, $2, $3, current_declspecs, NULL_TREE);
-                 decl_attributes ($$, $4); }
+                 decl_attributes ($$, $4, prefix_attributes); }
        | save_filename save_lineno
          declarator ':' expr_no_commas maybe_attribute
                { $$ = grokfield ($1, $2, $3, current_declspecs, $5);
-                 decl_attributes ($$, $6); }
+                 decl_attributes ($$, $6, prefix_attributes); }
        | save_filename save_lineno ':' expr_no_commas maybe_attribute
                { $$ = grokfield ($1, $2, NULL_TREE, current_declspecs, $4);
-                 decl_attributes ($$, $5); }
+                 decl_attributes ($$, $5, prefix_attributes); }
        ;
 
 /* We chain the enumerators in reverse order.
@@ -1418,7 +1641,10 @@ component_declarator:
 enumlist:
          enumerator
        | enumlist ',' enumerator
-               { $$ = chainon ($3, $1); }
+               { if ($1 == error_mark_node)
+                   $$ = $1;
+                 else
+                   $$ = chainon ($3, $1); }
        | error
                { $$ = error_mark_node; }
        ;
@@ -1478,6 +1704,10 @@ absdcl1:  /* a nonempty absolute declarator */
                { $$ = build_nt (ARRAY_REF, NULL_TREE, $2); }
        | '[' ']'  %prec '.'
                { $$ = build_nt (ARRAY_REF, NULL_TREE, NULL_TREE); }
+       /* ??? It appears we have to support attributes here, however
+          using prefix_attributes is wrong.  */
+       | attributes setattrs absdcl1
+               { $$ = $3; }
        ;
 
 /* at least one statement, the first of which parses without error.  */
@@ -1485,9 +1715,19 @@ absdcl1:  /* a nonempty absolute declarator */
    is actually regarded as an invalid decl and part of the decls.  */
 
 stmts:
+       lineno_stmt_or_labels
+               {
+                 if (pedantic && $1)
+                   pedwarn ("ANSI C forbids label at end of compound statement");
+               }
+       ;
+
+lineno_stmt_or_labels:
          lineno_stmt_or_label
-       | stmts lineno_stmt_or_label
-       | stmts errstmt
+       | lineno_stmt_or_labels lineno_stmt_or_label
+               { $$ = $2; }
+       | lineno_stmt_or_labels errstmt
+               { $$ = 0; }
        ;
 
 xstmts:
@@ -1502,7 +1742,6 @@ pushlevel:  /* empty */
                { emit_line_note (input_filename, lineno);
                  pushlevel (0);
                  clear_last_expr ();
-                 push_momentary ();
                  expand_start_bindings (0);
 ifobjc
                  if (objc_method_context)
@@ -1545,39 +1784,51 @@ compstmt_or_error:
        | error compstmt
        ;
 
-compstmt: '{' '}'
+compstmt_start: '{' { compstmt_count++; }
+
+compstmt_nostart: '}'
                { $$ = convert (void_type_node, integer_zero_node); }
-       | '{' pushlevel maybe_label_decls decls xstmts '}'
+       | pushlevel maybe_label_decls decls xstmts '}'
                { emit_line_note (input_filename, lineno);
                  expand_end_bindings (getdecls (), 1, 0);
-                 $$ = poplevel (1, 1, 0);
-                 if (yychar == CONSTANT || yychar == STRING)
-                   pop_momentary_nofree ();
-                 else
-                   pop_momentary (); }
-       | '{' pushlevel maybe_label_decls error '}'
+                 $$ = poplevel (1, 1, 0); }
+       | pushlevel maybe_label_decls error '}'
                { emit_line_note (input_filename, lineno);
                  expand_end_bindings (getdecls (), kept_level_p (), 0);
-                 $$ = poplevel (kept_level_p (), 0, 0);
-                 if (yychar == CONSTANT || yychar == STRING)
-                   pop_momentary_nofree ();
-                 else
-                   pop_momentary (); }
-       | '{' pushlevel maybe_label_decls stmts '}'
+                 $$ = poplevel (kept_level_p (), 0, 0); }
+       | pushlevel maybe_label_decls stmts '}'
                { emit_line_note (input_filename, lineno);
                  expand_end_bindings (getdecls (), kept_level_p (), 0);
-                 $$ = poplevel (kept_level_p (), 0, 0);
-                 if (yychar == CONSTANT || yychar == STRING)
-                   pop_momentary_nofree ();
-                 else
-                   pop_momentary (); }
+                 $$ = poplevel (kept_level_p (), 0, 0); }
+       ;
+
+compstmt_primary_start:
+       '(' '{'
+               { if (current_function_decl == 0)
+                   {
+                     error ("braced-group within expression allowed only inside a function");
+                     YYERROR;
+                   }
+                 /* We must force a BLOCK for this level
+                    so that, if it is not expanded later,
+                    there is a way to turn off the entire subtree of blocks
+                    that are contained in it.  */
+                 keep_next_level ();
+                 push_iterator_stack ();
+                 push_label_level ();
+                 $$ = expand_start_stmt_expr ();
+                 compstmt_count++;
+               }
+
+compstmt: compstmt_start compstmt_nostart
+               { $$ = $2; }
        ;
 
 /* Value is number of statements counted as of the closeparen.  */
 simple_if:
          if_prefix lineno_labeled_stmt
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* Make sure c_expand_end_cond is run once
+   for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
        | if_prefix error
        ;
@@ -1585,7 +1836,8 @@ simple_if:
 if_prefix:
          IF '(' expr ')'
                { emit_line_note ($<filename>-1, $<lineno>0);
-                 expand_start_cond (truthvalue_conversion ($3), 0);
+                 c_expand_start_cond (truthvalue_conversion ($3), 0, 
+                                      compstmt_count);
                  $<itype>$ = stmt_count;
                  if_stmt_file = $<filename>-1;
                  if_stmt_line = $<lineno>0;
@@ -1598,6 +1850,7 @@ if_prefix:
 do_stmt_start:
          DO
                { stmt_count++;
+                 compstmt_count++;
                  emit_line_note ($<filename>-1, $<lineno>0);
                  /* See comment in `while' alternative, above.  */
                  emit_nop ();
@@ -1627,19 +1880,14 @@ lineno_labeled_stmt:
 
 lineno_stmt_or_label:
          save_filename save_lineno stmt_or_label
-               { }
+               { $$ = $3; }
        ;
 
 stmt_or_label:
          stmt
+               { $$ = 0; }
        | label
-               { int next;
-                 position_after_white_space ();
-                 next = getc (finput);
-                 ungetc (next, finput);
-                 if (pedantic && next == '}')
-                   pedwarn ("ANSI C forbids label at end of compound statement");
-               }
+               { $$ = 1; }
        ;
 
 /* Parse a single real statement, not including any labels.  */
@@ -1662,18 +1910,17 @@ stmt:
                      || TREE_CODE (TREE_TYPE ($1)) == FUNCTION_TYPE)
                    $1 = default_conversion ($1);
 #endif
-                 iterator_expand ($1);
-                 clear_momentary (); }
+                 iterator_expand ($1); }
        | simple_if ELSE
-               { expand_start_else ();
+               { c_expand_start_else ();
                  $<itype>1 = stmt_count;
                  position_after_white_space (); }
          lineno_labeled_stmt
-               { expand_end_cond ();
+               { c_expand_end_cond ();
                  if (extra_warnings && stmt_count == $<itype>1)
                    warning ("empty body in an else-statement"); }
        | simple_if %prec IF
-               { expand_end_cond ();
+               { c_expand_end_cond ();
                  /* This warning is here instead of in simple_if, because we
                     do not want a warning if an empty if is followed by an
                     else statement.  Increment stmt_count so we don't
@@ -1681,11 +1928,11 @@ stmt:
                  if (extra_warnings && stmt_count++ == $<itype>1)
                    warning_with_file_and_line (if_stmt_file, if_stmt_line,
                                                "empty body in an if-statement"); }
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* 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
-               { expand_end_cond (); }
+               { c_expand_end_cond (); }
        | WHILE
                { stmt_count++;
                  emit_line_note ($<filename>-1, $<lineno>0);
@@ -1712,12 +1959,10 @@ stmt:
                { emit_line_note (input_filename, lineno);
                  expand_exit_loop_if_false (NULL_PTR,
                                             truthvalue_conversion ($3));
-                 expand_end_loop ();
-                 clear_momentary (); }
+                 expand_end_loop (); }
 /* This rule is needed to make sure we end every loop we start.  */
        | do_stmt_start error
-               { expand_end_loop ();
-                 clear_momentary (); }
+               { expand_end_loop (); }
        | FOR
          '(' xexpr ';'
                { stmt_count++;
@@ -1744,9 +1989,6 @@ stmt:
                  if ($6)
                    expand_exit_loop_if_false (NULL_PTR,
                                               truthvalue_conversion ($6));
-                 /* Don't let the tree nodes for $9 be discarded by
-                    clear_momentary during the parsing of the next stmt.  */
-                 push_momentary ();
                  $<lineno>7 = lineno;
                  $<filename>8 = input_filename;
                  position_after_white_space (); }
@@ -1756,25 +1998,14 @@ stmt:
                  expand_loop_continue_here ();
                  if ($9)
                    c_expand_expr_stmt ($9);
-                 if (yychar == CONSTANT || yychar == STRING)
-                   pop_momentary_nofree ();
-                 else
-                   pop_momentary ();
                  expand_end_loop (); }
        | SWITCH '(' expr ')'
                { stmt_count++;
                  emit_line_note ($<filename>-1, $<lineno>0);
                  c_expand_start_case ($3);
-                 /* Don't let the tree nodes for $3 be discarded by
-                    clear_momentary during the parsing of the next stmt.  */
-                 push_momentary ();
                  position_after_white_space (); }
          lineno_labeled_stmt
-               { expand_end_case ($3);
-                 if (yychar == CONSTANT || yychar == STRING)
-                   pop_momentary_nofree ();
-                 else
-                   pop_momentary (); }
+               { expand_end_case ($3); }
        | BREAK ';'
                { stmt_count++;
                  emit_line_note ($<filename>-1, $<lineno>0);
@@ -1837,7 +2068,9 @@ stmt:
                    }
                }
        | GOTO '*' expr ';'
-               { stmt_count++;
+               { if (pedantic)
+                   pedwarn ("ANSI C forbids `goto *expr;'");
+                 stmt_count++;
                  emit_line_note ($<filename>-1, $<lineno>0);
                  expand_computed_goto (convert (ptr_type_node, $3)); }
        | ';'
@@ -1894,10 +2127,6 @@ all_iter_stmt_with_decl:
            emit_line_note (input_filename, lineno);
            expand_end_bindings (getdecls (), 1, 0);
            $<ttype>$ = poplevel (1, 1, 0);
-           if (yychar == CONSTANT || yychar == STRING)
-             pop_momentary_nofree ();
-           else
-             pop_momentary ();     
          }
 */
 
@@ -1915,8 +2144,14 @@ label:     CASE expr_no_commas ':'
                  if (value != error_mark_node)
                    {
                      tree duplicate;
-                     int success = pushcase (value, convert_and_check,
-                                             label, &duplicate);
+                     int success;
+
+                     if (pedantic && ! INTEGRAL_TYPE_P (TREE_TYPE (value)))
+                       pedwarn ("label must have integral type in ANSI C");
+
+                     success = pushcase (value, convert_and_check,
+                                         label, &duplicate);
+
                      if (success == 1)
                        error ("case label not within a switch statement");
                      else if (success == 2)
@@ -1936,6 +2171,8 @@ label:      CASE expr_no_commas ':'
                  register tree label
                    = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE);
 
+                 if (pedantic)
+                   pedwarn ("ANSI C forbids case ranges");
                  stmt_count++;
 
                  if (value1 != error_mark_node && value2 != error_mark_node)
@@ -1974,12 +2211,15 @@ label:    CASE expr_no_commas ':'
                      error_with_decl (duplicate, "this is the first default label");
                    }
                  position_after_white_space (); }
-       | identifier ':'
+       | identifier ':' maybe_attribute
                { tree label = define_label (input_filename, lineno, $1);
                  stmt_count++;
                  emit_nop ();
                  if (label)
-                   expand_label (label);
+                   {
+                     expand_label (label);
+                     decl_attributes (label, $3, NULL_TREE);
+                   }
                  position_after_white_space (); }
        ;
 
@@ -2082,16 +2322,47 @@ parms:
 /* A single parameter declaration or parameter type name,
    as found in a parmlist.  */
 parm:
-         typed_declspecs parm_declarator
-               { $$ = build_tree_list ($1, $2) ; }
-       | typed_declspecs notype_declarator
-               { $$ = build_tree_list ($1, $2) ; }
-       | typed_declspecs absdcl
-               { $$ = build_tree_list ($1, $2); }
-       | declmods notype_declarator
-               { $$ = build_tree_list ($1, $2) ; }
-       | declmods absdcl
-               { $$ = build_tree_list ($1, $2); }
+         typed_declspecs setspecs parm_declarator maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $3),
+                                       build_tree_list (prefix_attributes,
+                                                        $4));
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | typed_declspecs setspecs notype_declarator maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $3),
+                                       build_tree_list (prefix_attributes,
+                                                        $4)); 
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | typed_declspecs setspecs absdcl maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $3),
+                                       build_tree_list (prefix_attributes,
+                                                        $4));
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+       | declmods setspecs notype_declarator maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $3),
+                                       build_tree_list (prefix_attributes,
+                                                        $4));
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
+
+       | declmods setspecs absdcl maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $3),
+                                       build_tree_list (prefix_attributes,
+                                                        $4));
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        ;
 
 /* This is used in a function definition
@@ -2132,6 +2403,13 @@ identifiers_or_typenames:
        | identifiers_or_typenames ',' identifier
                { $$ = chainon ($1, build_tree_list (NULL_TREE, $3)); }
        ;
+
+extension:
+       EXTENSION
+               { $$ = SAVE_WARN_FLAGS();
+                 pedantic = 0;
+                 warn_pointer_arith = 0; }
+       ;
 \f
 ifobjc
 /* Objective-C productions.  */
@@ -2318,7 +2596,11 @@ protocolrefs:
                {
                  $$ = NULL_TREE;
                }
-       | ARITHCOMPARE identifier_list ARITHCOMPARE
+       | non_empty_protocolrefs
+       ;
+
+non_empty_protocolrefs:
+         ARITHCOMPARE identifier_list ARITHCOMPARE
                {
                  if ($1 == LT_EXPR && $3 == GT_EXPR)
                    $$ = $2;
@@ -2363,15 +2645,15 @@ ivar_decls:
 
 ivar_decl:
        typed_typespecs setspecs ivars
-               {
-                  $$ = $3;
-                 resume_momentary ($2);
-                }
+               { $$ = $3;
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | nonempty_type_quals setspecs ivars
-               {
-                  $$ = $3;
-                 resume_momentary ($2);
-                }
+               { $$ = $3;
+                 current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | error
                { $$ = NULL_TREE; }
        ;
@@ -2482,20 +2764,28 @@ semi_or_error:
 methodproto:
          '+'
                {
+                 /* Remember protocol qualifiers in prototypes.  */
+                 remember_protocol_qualifiers ();
                  objc_inherit_code = CLASS_METHOD_DECL;
                }
          methoddecl
                {
+                 /* Forget protocol qualifiers here.  */
+                 forget_protocol_qualifiers ();
                  add_class_method (objc_interface_context, $3);
                }
          semi_or_error
 
        | '-'
                {
+                 /* Remember protocol qualifiers in prototypes.  */
+                 remember_protocol_qualifiers ();
                  objc_inherit_code = INSTANCE_METHOD_DECL;
                }
          methoddecl
                {
+                 /* Forget protocol qualifiers here.  */
+                 forget_protocol_qualifiers ();
                  add_instance_method (objc_interface_context, $3);
                }
          semi_or_error
@@ -2548,7 +2838,9 @@ mydecls:
 
 mydecl:
        typed_declspecs setspecs myparms ';'
-               { resume_momentary ($2); }
+               { current_declspecs = TREE_VALUE (declspec_stack);
+                 prefix_attributes = TREE_PURPOSE (declspec_stack);
+                 declspec_stack = TREE_CHAIN (declspec_stack); }
        | typed_declspecs ';'
                { shadow_tag ($1); }
        | declmods ';'
@@ -2566,12 +2858,21 @@ myparms:
    as found in a parmlist. DOES NOT ALLOW AN INITIALIZER OR ASMSPEC */
 
 myparm:
-         parm_declarator
-               { $$ = build_tree_list (current_declspecs, $1)  ; }
-       | notype_declarator
-               { $$ = build_tree_list (current_declspecs, $1)  ; }
-       | absdcl
-               { $$ = build_tree_list (current_declspecs, $1)  ; }
+         parm_declarator maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $1),
+                                       build_tree_list (prefix_attributes,
+                                                        $2)); }
+       | notype_declarator maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $1),
+                                       build_tree_list (prefix_attributes,
+                                                        $2)); }
+       | absdcl maybe_attribute
+               { $$ = build_tree_list (build_tree_list (current_declspecs,
+                                                        $1),
+                                       build_tree_list (prefix_attributes,
+                                                        $2)); }
        ;
 
 optparmlist:
@@ -2582,7 +2883,7 @@ optparmlist:
        | ',' ELLIPSIS
                {
                  /* oh what a kludge! */
-                 $$ = (tree)1;
+                 $$ = objc_ellipsis_node;
                }
        | ','
                {