OSDN Git Service

* Makefile.in (local-distclean): Also remove fastjar.
[pf3gnuchains/gcc-fork.git] / gcc / c-parse.in
index 74bef88..cf010e6 100644 (file)
@@ -41,8 +41,12 @@ end ifc
 #include <setjmp.h>
 #include "tree.h"
 #include "input.h"
+#include "cpplib.h"
+#include "intl.h"
+#include "timevar.h"
 #include "c-lex.h"
 #include "c-tree.h"
+#include "c-pragma.h"
 #include "flags.h"
 #include "output.h"
 #include "toplev.h"
@@ -68,14 +72,17 @@ end ifc
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
-/* Cause the `yydebug' variable to be defined.  */
+/* Cause the "yydebug" variable to be defined.  */
 #define YYDEBUG 1
+
+/* Rename the "yyparse" function so that we can override it elsewhere.  */
+#define yyparse yyparse_1
 %}
 
 %start program
 
 %union {long itype; tree ttype; enum tree_code code;
-       const char *filename; int lineno; int ends_in_label; }
+       const char *filename; int lineno; }
 
 /* All identifiers that are not reserved words
    and are not declared typedefs in the current block */
@@ -117,9 +124,6 @@ end ifc
 %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
 %nonassoc ELSE
@@ -155,6 +159,8 @@ end ifc
 
 
 %type <code> unop
+%type <ttype> ENUM STRUCT UNION IF ELSE WHILE DO FOR SWITCH CASE DEFAULT
+%type <ttype> BREAK CONTINUE RETURN GOTO ASM_KEYWORD SIZEOF TYPEOF ALIGNOF
 
 %type <ttype> identifier IDENTIFIER TYPENAME CONSTANT expr nonnull_exprlist exprlist
 %type <ttype> expr_no_commas cast_expr unary_expr primary string STRING
@@ -170,8 +176,10 @@ end ifc
 %type <ttype> maybe_attribute attributes attribute attribute_list attrib
 %type <ttype> any_word extension
 
-%type <ttype> compstmt compstmt_nostart compstmt_primary_start
+%type <ttype> compstmt compstmt_start compstmt_nostart compstmt_primary_start
+%type <ttype> do_stmt_start poplevel
 
+%type <ttype> c99_block_start c99_block_end
 %type <ttype> declarator
 %type <ttype> notype_declarator after_type_declarator
 %type <ttype> parm_declarator
@@ -189,8 +197,6 @@ end ifc
 
 %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
@@ -254,7 +260,12 @@ 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                    PARAMS ((FILE *, int, YYSTYPE));
+
+static void yyprint      PARAMS ((FILE *, int, YYSTYPE));
+static void yyerror      PARAMS ((const char *));
+static inline int _yylex  PARAMS ((void));
+static int  yylex        PARAMS ((void));
+static void init_reswords PARAMS ((void));
 
 /* Add GC roots for variables local to this file.  */
 void
@@ -351,7 +362,7 @@ fndef:
                { if (! start_function (current_declspecs, $3,
                                        prefix_attributes, NULL_TREE))
                    YYERROR1;
-                 reinit_parse_for_function (); }
+               }
          old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
@@ -367,7 +378,7 @@ fndef:
                { if (! start_function (current_declspecs, $3,
                                        prefix_attributes, NULL_TREE))
                    YYERROR1;
-                 reinit_parse_for_function (); }
+               }
          old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
@@ -383,7 +394,7 @@ fndef:
                { if (! start_function (NULL_TREE, $2,
                                        prefix_attributes, NULL_TREE))
                    YYERROR1;
-                 reinit_parse_for_function (); }
+               }
          old_style_parm_decls
                { store_parm_decls (); }
          compstmt_or_error
@@ -503,8 +514,6 @@ unary_expr:
                { $$ = 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:
@@ -653,39 +662,32 @@ primary:
        | '(' error ')'
                { $$ = error_mark_node; }
        | compstmt_primary_start compstmt_nostart ')'
-               { tree rtl_exp;
-                 if (pedantic)
-                   pedwarn ("ISO C forbids braced-groups within expressions");
-                 pop_iterator_stack ();
+                 { tree saved_last_tree;
+
+                  if (pedantic)
+                    pedwarn ("ISO C forbids braced-groups within expressions");
                  pop_label_level ();
-                 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 ($2) == BLOCK)
-                   {
-                     /* Make a BIND_EXPR for the BLOCK already made.  */
-                     $$ = build (BIND_EXPR, TREE_TYPE (rtl_exp),
-                                 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 ($2);
-                   }
-                 else
-                   $$ = $2;
+                 saved_last_tree = COMPOUND_BODY ($1);
+                 RECHAIN_STMTS ($1, COMPOUND_BODY ($1));
+                 last_tree = saved_last_tree;
+                 TREE_CHAIN (last_tree) = NULL_TREE;
+                 if (!last_expr_type)
+                   last_expr_type = void_type_node;
+                 $$ = build1 (STMT_EXPR, last_expr_type, $1);
+                 TREE_SIDE_EFFECTS ($$) = 1;
                }
        | 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);
+                 last_tree = COMPOUND_BODY ($1);
+                 TREE_CHAIN (last_tree) = NULL_TREE;
                  $$ = error_mark_node;
                }
        | primary '(' exprlist ')'   %prec '.'
                { $$ = build_function_call ($1, $3); }
+       | VA_ARG '(' expr_no_commas ',' typename ')'
+               { $$ = build_va_arg ($3, groktypename ($5)); }
        | primary '[' expr ']'   %prec '.'
                { $$ = build_array_ref ($1, $3); }
        | primary '.' identifier
@@ -823,13 +825,6 @@ lineno_decl:
                { }
        ;
 
-decls:
-       lineno_decl
-       | errstmt
-       | decls lineno_decl
-       | lineno_decl errstmt
-       ;
-
 /* records the type and storage class specs to use for processing
    the declarators that follow.
    Maintains a stack of outer-level values of current_declspecs,
@@ -1132,9 +1127,15 @@ initlist1:
    It may use braces.  */
 initelt:
          designator_list '=' initval
+               { if (pedantic && ! flag_isoc99)
+                   pedwarn ("ISO C89 forbids specifying subobject to initialize"); }
        | designator initval
+               { if (pedantic)
+                   pedwarn ("obsolete use of designated initializer without `='"); }
        | identifier ':'
-               { set_init_label ($1); }
+               { set_init_label ($1);
+                 if (pedantic)
+                   pedwarn ("obsolete use of designated initializer with `:'"); }
          initval
        | initval
        ;
@@ -1162,7 +1163,9 @@ designator:
           so don't include these productions in the Objective-C grammar.  */
 ifc
        | '[' expr_no_commas ELLIPSIS expr_no_commas ']'
-               { set_init_index ($2, $4); }
+               { set_init_index ($2, $4);
+                 if (pedantic)
+                   pedwarn ("ISO C forbids specifying range of elements to initialize"); }
        | '[' expr_no_commas ']'
                { set_init_index ($2, NULL_TREE); }
 end ifc
@@ -1180,7 +1183,7 @@ nested_function:
                      pop_function_context ();
                      YYERROR1;
                    }
-                 reinit_parse_for_function (); }
+               }
           old_style_parm_decls
                { store_parm_decls (); }
 /* This used to use compstmt_or_error.
@@ -1190,8 +1193,10 @@ nested_function:
    There followed a repeated execution of that same rule,
    which called YYERROR1 again, and so on.  */
          compstmt
-               { finish_function (1);
-                 pop_function_context (); }
+               { tree decl = current_function_decl;
+                 finish_function (1);
+                 pop_function_context (); 
+                 add_decl_stmt (decl); }
        ;
 
 notype_nested_function:
@@ -1206,7 +1211,7 @@ notype_nested_function:
                      pop_function_context ();
                      YYERROR1;
                    }
-                 reinit_parse_for_function (); }
+               }
          old_style_parm_decls
                { store_parm_decls (); }
 /* This used to use compstmt_or_error.
@@ -1216,8 +1221,10 @@ notype_nested_function:
    There followed a repeated execution of that same rule,
    which called YYERROR1 again, and so on.  */
          compstmt
-               { finish_function (1);
-                 pop_function_context (); }
+               { tree decl = current_function_decl;
+                 finish_function (1);
+                 pop_function_context (); 
+                 add_decl_stmt (decl); }
        ;
 
 /* Any kind of declarator (thus, all declarators allowed
@@ -1569,39 +1576,66 @@ absdcl1:  /* a nonempty absolute declarator */
                { $$ = $3; }
        ;
 
-/* at least one statement, the first of which parses without error.  */
-/* stmts is used only after decls, so an invalid first statement
-   is actually regarded as an invalid decl and part of the decls.  */
+/* A nonempty series of declarations and statements (possibly followed by
+   some labels) that can form the body of a compound statement.
+   NOTE: we don't allow labels on declarations; this might seem like a
+   natural extension, but there would be a conflict between attributes
+   on the label and prefix attributes on the declaration.  */
 
-stmts:
-       lineno_stmt_or_labels
+stmts_and_decls:
+         lineno_stmt_decl_or_labels_ending_stmt
+       | lineno_stmt_decl_or_labels_ending_decl
+       | lineno_stmt_decl_or_labels_ending_label
                {
-                 if (pedantic && $1)
-                   pedwarn ("ISO C forbids label at end of compound statement");
+                 pedwarn ("deprecated use of label at end of compound statement");
                }
+       | lineno_stmt_decl_or_labels_ending_error
        ;
 
-lineno_stmt_or_labels:
-         lineno_stmt_or_label
-       | lineno_stmt_or_labels lineno_stmt_or_label
-               { $$ = $2; }
-       | lineno_stmt_or_labels errstmt
-               { $$ = 0; }
+lineno_stmt_decl_or_labels_ending_stmt:
+         lineno_stmt
+       | lineno_stmt_decl_or_labels_ending_stmt lineno_stmt
+       | lineno_stmt_decl_or_labels_ending_decl lineno_stmt
+       | lineno_stmt_decl_or_labels_ending_label lineno_stmt
+       | lineno_stmt_decl_or_labels_ending_error lineno_stmt
        ;
 
-xstmts:
-       /* empty */
-       | stmts
+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"); }
+       | lineno_stmt_decl_or_labels_ending_decl lineno_decl
+       | lineno_stmt_decl_or_labels_ending_error lineno_decl
+       ;
+
+lineno_stmt_decl_or_labels_ending_label:
+         lineno_label
+       | lineno_stmt_decl_or_labels_ending_stmt lineno_label
+       | lineno_stmt_decl_or_labels_ending_decl lineno_label
+       | lineno_stmt_decl_or_labels_ending_label lineno_label
+       | lineno_stmt_decl_or_labels_ending_error lineno_label
+       ;
+
+lineno_stmt_decl_or_labels_ending_error:
+       errstmt
+       | lineno_stmt_decl_or_labels errstmt
+       ;
+
+lineno_stmt_decl_or_labels:
+         lineno_stmt_decl_or_labels_ending_stmt
+       | lineno_stmt_decl_or_labels_ending_decl
+       | lineno_stmt_decl_or_labels_ending_label
+       | lineno_stmt_decl_or_labels_ending_error
        ;
 
 errstmt:  error ';'
        ;
 
 pushlevel:  /* empty */
-               { emit_line_note (input_filename, lineno);
-                 pushlevel (0);
+               { pushlevel (0);
                  clear_last_expr ();
-                 expand_start_bindings (0);
+                 add_scope_stmt (/*begin_p=*/1, /*partial_p=*/0);
 ifobjc
                  if (objc_method_context)
                    add_objc_decls ();
@@ -1609,6 +1643,43 @@ end ifobjc
                }
        ;
 
+poplevel:  /* empty */
+                { $$ = add_scope_stmt (/*begin_p=*/0, /*partial_p=*/0); }
+
+/* Start and end blocks created for the new scopes of C99.  */
+c99_block_start: /* empty */
+               { if (flag_isoc99)
+                   {
+                     $$ = c_begin_compound_stmt ();
+                     pushlevel (0);
+                     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;
+               }
+       ;
+
+/* Productions using c99_block_start and c99_block_end will need to do what's
+   in compstmt: RECHAIN_STMTS ($1, COMPOUND_BODY ($1)); $$ = $2; where
+   $1 is the value of c99_block_start and $2 of c99_block_end.  */
+c99_block_end: /* empty */
+                { if (flag_isoc99)
+                   {
+                     tree scope_stmt = add_scope_stmt (/*begin_p=*/0, /*partial_p=*/0);
+                     $$ = poplevel (kept_level_p (), 0, 0); 
+                     SCOPE_STMT_BLOCK (TREE_PURPOSE (scope_stmt)) 
+                       = SCOPE_STMT_BLOCK (TREE_VALUE (scope_stmt))
+                       = $$;
+                   }
+                 else
+                   $$ = NULL_TREE; }
+       ;
+
 /* Read zero or more forward-declarations for labels
    that nested functions can jump to.  */
 maybe_label_decls:
@@ -1630,7 +1701,7 @@ label_decl:
                    {
                      tree label = shadow_label (TREE_VALUE (link));
                      C_DECLARED_LABEL_FLAG (label) = 1;
-                     declare_nonlocal_label (label);
+                     add_decl_stmt (label);
                    }
                }
        ;
@@ -1643,22 +1714,21 @@ compstmt_or_error:
        | error compstmt
        ;
 
-compstmt_start: '{' { compstmt_count++; }
+compstmt_start: '{' { compstmt_count++;
+                      $$ = c_begin_compound_stmt (); } 
 
 compstmt_nostart: '}'
                { $$ = convert (void_type_node, integer_zero_node); }
-       | pushlevel maybe_label_decls decls xstmts '}'
-               { emit_line_note (input_filename, lineno);
-                 expand_end_bindings (getdecls (), 1, 0);
-                 $$ = 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); }
-       | 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); }
+       | pushlevel maybe_label_decls compstmt_contents_nonempty '}' poplevel
+               { $$ = poplevel (kept_level_p (), 1, 0); 
+                 SCOPE_STMT_BLOCK (TREE_PURPOSE ($5)) 
+                   = SCOPE_STMT_BLOCK (TREE_VALUE ($5))
+                   = $$; }
+       ;
+
+compstmt_contents_nonempty:
+         stmts_and_decls
+       | error
        ;
 
 compstmt_primary_start:
@@ -1673,19 +1743,20 @@ compstmt_primary_start:
                     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++;
+                 $$ = add_stmt (build_stmt (COMPOUND_STMT, last_tree));
                }
 
 compstmt: compstmt_start compstmt_nostart
-               { $$ = $2; }
+               { RECHAIN_STMTS ($1, COMPOUND_BODY ($1)); 
+                  $$ = $2; }
        ;
 
 /* Value is number of statements counted as of the closeparen.  */
 simple_if:
-         if_prefix lineno_labeled_stmt
+         if_prefix c99_block_lineno_labeled_stmt
+                { c_finish_then (); }
 /* Make sure c_expand_end_cond is run once
    for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
@@ -1694,13 +1765,11 @@ simple_if:
 
 if_prefix:
          IF '(' expr ')'
-               { emit_line_note ($<filename>-1, $<lineno>0);
-                 c_expand_start_cond (truthvalue_conversion ($3), 0, 
+               { c_expand_start_cond (truthvalue_conversion ($3), 
                                       compstmt_count);
                  $<itype>$ = stmt_count;
-                 if_stmt_file = $<filename>-1;
-                 if_stmt_line = $<lineno>0;
-                 position_after_white_space (); }
+                 if_stmt_file = $<filename>-2;
+                 if_stmt_line = $<lineno>-1; }
        ;
 
 /* This is a subroutine of stmt.
@@ -1710,21 +1779,32 @@ do_stmt_start:
          DO
                { stmt_count++;
                  compstmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-                 /* See comment in `while' alternative, above.  */
-                 emit_nop ();
-                 expand_start_loop_continue_elsewhere (1);
-                 position_after_white_space (); }
-         lineno_labeled_stmt WHILE
-               { expand_loop_continue_here (); }
-       ;
-
+                 $<ttype>$ 
+                   = add_stmt (build_stmt (DO_STMT, NULL_TREE,
+                                           NULL_TREE));
+                 /* In the event that a parse error prevents
+                    parsing the complete do-statement, set the
+                    condition now.  Otherwise, we can get crashes at
+                    RTL-generation time.  */
+                 DO_COND ($<ttype>$) = error_mark_node; }
+         c99_block_lineno_labeled_stmt WHILE
+               { $$ = $<ttype>2;
+                 RECHAIN_STMTS ($$, DO_BODY ($$)); }
+       ;
+
+/* 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:
-               { $$ = input_filename; }
+               { if (yychar == YYEMPTY)
+                   yychar = YYLEX;
+                 $$ = input_filename; }
        ;
 
 save_lineno:
-               { $$ = lineno; }
+               { if (yychar == YYEMPTY)
+                   yychar = YYLEX;
+                 $$ = lineno; }
        ;
 
 lineno_labeled_stmt:
@@ -1737,45 +1817,30 @@ lineno_labeled_stmt:
                { }
        ;
 
-lineno_stmt_or_label:
-         save_filename save_lineno stmt_or_label
-               { $$ = $3; }
+/* Like lineno_labeled_stmt, but a block in C99.  */
+c99_block_lineno_labeled_stmt:
+         c99_block_start lineno_labeled_stmt c99_block_end
+               { if (flag_isoc99)
+                   RECHAIN_STMTS ($1, COMPOUND_BODY ($1)); }
        ;
 
-stmt_or_label:
-         stmt
-               { $$ = 0; }
-       | label
-               { $$ = 1; }
+lineno_stmt:
+         save_filename save_lineno stmt
+               { }
        ;
 
-/* Parse a single real statement, not including any labels.  */
-stmt:
-         compstmt
-               { stmt_count++; }
-        | all_iter_stmt 
-       | expr ';'
-               { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-/* It appears that this should not be done--that a non-lvalue array
-   shouldn't get an error if the value isn't used.
-   Section 3.2.2.1 says that an array lvalue gets converted to a pointer
-   if it appears as a top-level expression,
-   but says nothing about non-lvalue arrays.  */
-#if 0
-                 /* Call default_conversion to get an error
-                    on referring to a register array if pedantic.  */
-                 if (TREE_CODE (TREE_TYPE ($1)) == ARRAY_TYPE
-                     || TREE_CODE (TREE_TYPE ($1)) == FUNCTION_TYPE)
-                   $1 = default_conversion ($1);
-#endif
-                 iterator_expand ($1); }
-       | simple_if ELSE
+lineno_label:
+         save_filename save_lineno label
+               { }
+       ;
+
+select_or_iter_stmt:
+         simple_if ELSE
                { c_expand_start_else ();
-                 $<itype>1 = stmt_count;
-                 position_after_white_space (); }
-         lineno_labeled_stmt
-               { c_expand_end_cond ();
+                 $<itype>1 = stmt_count; }
+         c99_block_lineno_labeled_stmt
+                { c_finish_else ();
+                 c_expand_end_cond ();
                  if (extra_warnings && stmt_count == $<itype>1)
                    warning ("empty body in an else-statement"); }
        | simple_if %prec IF
@@ -1793,115 +1858,92 @@ stmt:
        | simple_if ELSE error
                { c_expand_end_cond (); }
        | WHILE
-               { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-                 /* The emit_nop used to come before emit_line_note,
-                    but that made the nop seem like part of the preceding line.
-                    And that was confusing when the preceding line was
-                    inside of an if statement and was not really executed.
-                    I think it ought to work to put the nop after the line number.
-                    We will see.  --rms, July 15, 1991.  */
-                 emit_nop (); }
+                { stmt_count++; }
          '(' expr ')'
-               { /* Don't start the loop till we have succeeded
-                    in parsing the end test.  This is to make sure
-                    that we end every loop we start.  */
-                 expand_start_loop (1);
-                 emit_line_note (input_filename, lineno);
-                 expand_exit_loop_if_false (NULL_PTR,
-                                            truthvalue_conversion ($4));
-                 position_after_white_space (); }
-         lineno_labeled_stmt
-               { expand_end_loop (); }
+                { $4 = truthvalue_conversion ($4);
+                 $<ttype>$ 
+                   = add_stmt (build_stmt (WHILE_STMT, $4, NULL_TREE)); }
+         c99_block_lineno_labeled_stmt
+               { RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
        | do_stmt_start
          '(' expr ')' ';'
-               { emit_line_note (input_filename, lineno);
-                 expand_exit_loop_if_false (NULL_PTR,
-                                            truthvalue_conversion ($3));
-                 expand_end_loop (); }
-/* This rule is needed to make sure we end every loop we start.  */
+                { DO_COND ($1) = truthvalue_conversion ($3); }
        | do_stmt_start error
-               { expand_end_loop (); }
+               { }
        | FOR
-         '(' xexpr ';'
+               { $<ttype>$ = build_stmt (FOR_STMT, NULL_TREE, NULL_TREE,
+                                         NULL_TREE, NULL_TREE);
+                 add_stmt ($<ttype>$); } 
+         '(' for_init_stmt
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-                 /* See comment in `while' alternative, above.  */
-                 emit_nop ();
-                 if ($3) c_expand_expr_stmt ($3);
-                 /* Next step is to call expand_start_loop_continue_elsewhere,
-                    but wait till after we parse the entire for (...).
-                    Otherwise, invalid input might cause us to call that
-                    fn without calling expand_end_loop.  */
-               }
+                 RECHAIN_STMTS ($<ttype>2, FOR_INIT_STMT ($<ttype>2)); }
          xexpr ';'
-               /* Can't emit now; wait till after expand_start_loop...  */
-               { $<lineno>7 = lineno;
-                 $<filename>$ = input_filename; }
+                { FOR_COND ($<ttype>2) = $6; }
          xexpr ')'
-               { 
-                 /* Start the loop.  Doing this after parsing
-                    all the expressions ensures we will end the loop.  */
-                 expand_start_loop_continue_elsewhere (1);
-                 /* Emit the end-test, with a line number.  */
-                 emit_line_note ($<filename>8, $<lineno>7);
-                 if ($6)
-                   expand_exit_loop_if_false (NULL_PTR,
-                                              truthvalue_conversion ($6));
-                 $<lineno>7 = lineno;
-                 $<filename>8 = input_filename;
-                 position_after_white_space (); }
-         lineno_labeled_stmt
-               { /* Emit the increment expression, with a line number.  */
-                 emit_line_note ($<filename>8, $<lineno>7);
-                 expand_loop_continue_here ();
-                 if ($9)
-                   c_expand_expr_stmt ($9);
-                 expand_end_loop (); }
+               { FOR_EXPR ($<ttype>2) = $9; }
+         c99_block_lineno_labeled_stmt
+                { RECHAIN_STMTS ($<ttype>2, FOR_BODY ($<ttype>2)); }
        | SWITCH '(' expr ')'
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-                 c_expand_start_case ($3);
-                 position_after_white_space (); }
-         lineno_labeled_stmt
-               { expand_end_case ($3); }
+                 $<ttype>$ = c_start_case ($3); }
+         c99_block_lineno_labeled_stmt
+                { c_finish_case (); }
+       ;
+
+for_init_stmt:
+         xexpr ';'
+               { add_stmt (build_stmt (EXPR_STMT, $1)); } 
+       | decl
+               { check_for_loop_decls (); }
+       ;
+
+/* Parse a single real statement, not including any labels.  */
+stmt:
+         compstmt
+               { stmt_count++; }
+       | expr ';'
+               { stmt_count++;
+                 c_expand_expr_stmt ($1); }
+       | c99_block_start select_or_iter_stmt c99_block_end
+               { if (flag_isoc99)
+                   RECHAIN_STMTS ($1, COMPOUND_BODY ($1)); }
        | BREAK ';'
-               { build_break_stmt ();
-                 stmt_count++;
-                 genrtl_break_stmt (); }
+               { stmt_count++;
+                 add_stmt (build_break_stmt ()); }
        | CONTINUE ';'
-                { build_continue_stmt ();
-                  stmt_count++;
-                 genrtl_continue_stmt (); }
+                { stmt_count++;
+                 add_stmt (build_continue_stmt ()); }
        | RETURN ';'
-                { tree return_stmt = build_return_stmt (NULL_TREE);
-                  stmt_count++;
-                 genrtl_return_stmt (RETURN_EXPR(return_stmt)); }
+                { stmt_count++;
+                 c_expand_return (NULL_TREE); }
        | RETURN expr ';'
-                { tree return_stmt = build_return_stmt ($2);
-                  stmt_count++;
-                 genrtl_return_stmt (RETURN_EXPR(return_stmt)); }
+                { stmt_count++;
+                 c_expand_return ($2); }
        | ASM_KEYWORD maybe_type_qual '(' expr ')' ';'
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
                  STRIP_NOPS ($4);
                  if ((TREE_CODE ($4) == ADDR_EXPR
                       && TREE_CODE (TREE_OPERAND ($4, 0)) == STRING_CST)
                      || TREE_CODE ($4) == STRING_CST)
-                   expand_asm ($4);
+                   {
+                     if (TREE_CODE ($4) == ADDR_EXPR)
+                       $4 = TREE_OPERAND ($4, 0);
+                     if (TREE_CHAIN ($4))
+                       $4 = combine_strings ($4);
+                     add_stmt (build_stmt (ASM_STMT, NULL_TREE, $4,
+                                           NULL_TREE, NULL_TREE, NULL_TREE));
+                   }
                  else
                    error ("argument of `asm' is not a constant string"); }
        /* This is the case with just output operands.  */
        | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ')' ';'
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
                  c_expand_asm_operands ($4, $6, NULL_TREE, NULL_TREE,
                                         $2 == ridpointers[(int)RID_VOLATILE],
                                         input_filename, lineno); }
        /* This is the case with input operands as well.  */
        | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':' asm_operands ')' ';'
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
                  c_expand_asm_operands ($4, $6, $8, NULL_TREE,
                                         $2 == ridpointers[(int)RID_VOLATILE],
                                         input_filename, lineno); }
@@ -1909,116 +1951,50 @@ stmt:
        | ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':'
          asm_operands ':' asm_clobbers ')' ';'
                { stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
                  c_expand_asm_operands ($4, $6, $8, $10,
                                         $2 == ridpointers[(int)RID_VOLATILE],
                                         input_filename, lineno); }
        | GOTO identifier ';'
                { tree decl;
                  stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
                  decl = lookup_label ($2);
                  if (decl != 0)
                    {
                      TREE_USED (decl) = 1;
-                     expand_goto (decl);
+                     add_stmt (build_stmt (GOTO_STMT, decl));
                    }
                }
        | GOTO '*' expr ';'
                { if (pedantic)
                    pedwarn ("ISO C forbids `goto *expr;'");
                  stmt_count++;
-                 emit_line_note ($<filename>-1, $<lineno>0);
-                 expand_computed_goto (convert (ptr_type_node, $3)); }
+                 $3 = convert (ptr_type_node, $3);
+                 add_stmt (build_stmt (GOTO_STMT, $3)); }
        | ';'
        ;
 
-all_iter_stmt:
-         all_iter_stmt_simple
-/*     | all_iter_stmt_with_decl */
-       ;
-
-all_iter_stmt_simple:
-         FOR '(' primary ')' 
-         {
-           /* The value returned by this action is  */
-           /*      1 if everything is OK */ 
-           /*      0 in case of error or already bound iterator */
-
-           $<itype>$ = 0;
-           if (TREE_CODE ($3) != VAR_DECL)
-             error ("invalid `for (ITERATOR)' syntax");
-           else if (! ITERATOR_P ($3))
-             error ("`%s' is not an iterator",
-                    IDENTIFIER_POINTER (DECL_NAME ($3)));
-           else if (ITERATOR_BOUND_P ($3))
-             error ("`for (%s)' inside expansion of same iterator",
-                    IDENTIFIER_POINTER (DECL_NAME ($3)));
-           else
-             {
-               $<itype>$ = 1;
-               iterator_for_loop_start ($3);
-             }
-         }
-         lineno_labeled_stmt
-         {
-           if ($<itype>5)
-             iterator_for_loop_end ($3);
-         }
-
-/*  This really should allow any kind of declaration,
-    for generality.  Fix it before turning it back on.
-
-all_iter_stmt_with_decl:
-         FOR '(' ITERATOR pushlevel setspecs iterator_spec ')' 
-         {
-*/         /* The value returned by this action is  */
-           /*      1 if everything is OK */ 
-           /*      0 in case of error or already bound iterator */
-/*
-           iterator_for_loop_start ($6);
-         }
-         lineno_labeled_stmt
-         {
-           iterator_for_loop_end ($6);
-           emit_line_note (input_filename, lineno);
-           expand_end_bindings (getdecls (), 1, 0);
-           $<ttype>$ = poplevel (1, 1, 0);
-         }
-*/
-
 /* Any kind of label, including jump labels and case labels.
    ANSI C accepts labels only before statements, but we allow them
    also at the end of a compound statement.  */
 
 label:   CASE expr_no_commas ':'
-                { tree case_label_tree = build_case_label ($2, NULL_TREE);
-                 stmt_count++;
-                 genrtl_case_label(CASE_LOW(case_label_tree), CASE_HIGH(case_label_tree));
-                 position_after_white_space ();
-               }
+                { stmt_count++;
+                 do_case ($2, NULL_TREE); }
        | CASE expr_no_commas ELLIPSIS expr_no_commas ':'
-                { tree case_label_tree = build_case_label ($2, $4);
-                 stmt_count++;
-                 genrtl_case_label(CASE_LOW(case_label_tree), CASE_HIGH(case_label_tree));
-                 position_after_white_space ();
-               }
+                { stmt_count++;
+                 do_case ($2, $4); }
        | DEFAULT ':'
-                { tree case_label_tree = build_case_label (NULL_TREE, NULL_TREE);
+                { stmt_count++;
+                 do_case (NULL_TREE, NULL_TREE); }
+       | identifier save_filename save_lineno ':' maybe_attribute
+               { tree label = define_label ($2, $3, $1);
                  stmt_count++;
-                 genrtl_case_label(CASE_LOW(case_label_tree), CASE_HIGH(case_label_tree));
-                 position_after_white_space ();
-               }
-       | identifier ':' maybe_attribute
-               { tree label = define_label (input_filename, lineno, $1);
-                 stmt_count++;
-                 emit_nop ();
                  if (label)
                    {
-                     expand_label (label);
-                     decl_attributes (label, $3, NULL_TREE);
+                     decl_attributes (label, $5, NULL_TREE);
+                     add_stmt (build_stmt (LABEL_STMT, label));
                    }
-                 position_after_white_space (); }
+               }
        ;
 
 /* Either a type-qualifier or nothing.  First thing in an `asm' statement.  */
@@ -2716,25 +2692,9 @@ selector:
        ;
 
 reservedwords:
-         ENUM { $$ = get_identifier (token_buffer); }
-       | STRUCT { $$ = get_identifier (token_buffer); }
-       | UNION { $$ = get_identifier (token_buffer); }
-       | IF { $$ = get_identifier (token_buffer); }
-       | ELSE { $$ = get_identifier (token_buffer); }
-       | WHILE { $$ = get_identifier (token_buffer); }
-       | DO { $$ = get_identifier (token_buffer); }
-       | FOR { $$ = get_identifier (token_buffer); }
-       | SWITCH { $$ = get_identifier (token_buffer); }
-       | CASE { $$ = get_identifier (token_buffer); }
-       | DEFAULT { $$ = get_identifier (token_buffer); }
-       | BREAK { $$ = get_identifier (token_buffer); }
-       | CONTINUE { $$ = get_identifier (token_buffer); }
-       | RETURN  { $$ = get_identifier (token_buffer); }
-       | GOTO { $$ = get_identifier (token_buffer); }
-       | ASM_KEYWORD { $$ = get_identifier (token_buffer); }
-        | SIZEOF { $$ = get_identifier (token_buffer); }
-       | TYPEOF { $$ = get_identifier (token_buffer); }
-       | ALIGNOF { $$ = get_identifier (token_buffer); }
+         ENUM | STRUCT | UNION | IF | ELSE | WHILE | DO | FOR
+       | SWITCH | CASE | DEFAULT | BREAK | CONTINUE | RETURN
+       | GOTO | ASM_KEYWORD | SIZEOF | TYPEOF | ALIGNOF
        | TYPESPEC | TYPE_QUAL
        ;
 
@@ -2865,3 +2825,598 @@ objcencodeexpr:
 
 end ifobjc
 %%
+
+/* yylex() is a thin wrapper around c_lex(), all it does is translate
+   cpplib.h's token codes into yacc's token codes.  */
+
+static enum cpp_ttype last_token;
+
+/* The reserved keyword table.  */
+struct resword
+{
+  const char *word;
+  ENUM_BITFIELD(rid) rid : 16;
+  unsigned int disable   : 16;
+};
+
+/* Disable mask.  Keywords are disabled if (reswords[i].disable & mask) is
+   _true_.  */
+#define D_TRAD 0x01    /* not in traditional C */
+#define D_C89  0x02    /* not in C89 */
+#define D_EXT  0x04    /* GCC extension */
+#define D_EXT89        0x08    /* GCC extension incorporated in C99 */
+#define D_OBJC 0x10    /* Objective C only */
+#define D_YES  0x20    /* always starts disabled */
+
+static const struct resword reswords[] =
+{
+  { "_Bool",           RID_BOOL,       0 },
+  { "_Complex",                RID_COMPLEX,    0 },
+  { "__alignof",       RID_ALIGNOF,    0 },
+  { "__alignof__",     RID_ALIGNOF,    0 },
+  { "__asm",           RID_ASM,        0 },
+  { "__asm__",         RID_ASM,        0 },
+  { "__attribute",     RID_ATTRIBUTE,  0 },
+  { "__attribute__",   RID_ATTRIBUTE,  0 },
+  { "__bounded",       RID_BOUNDED,    0 },
+  { "__bounded__",     RID_BOUNDED,    0 },
+  { "__builtin_va_arg",        RID_VA_ARG,     0 },
+  { "__complex",       RID_COMPLEX,    0 },
+  { "__complex__",     RID_COMPLEX,    0 },
+  { "__const",         RID_CONST,      0 },
+  { "__const__",       RID_CONST,      0 },
+  { "__extension__",   RID_EXTENSION,  0 },
+  { "__imag",          RID_IMAGPART,   0 },
+  { "__imag__",                RID_IMAGPART,   0 },
+  { "__inline",                RID_INLINE,     0 },
+  { "__inline__",      RID_INLINE,     0 },
+  { "__label__",       RID_LABEL,      0 },
+  { "__ptrbase",       RID_PTRBASE,    0 },
+  { "__ptrbase__",     RID_PTRBASE,    0 },
+  { "__ptrextent",     RID_PTREXTENT,  0 },
+  { "__ptrextent__",   RID_PTREXTENT,  0 },
+  { "__ptrvalue",      RID_PTRVALUE,   0 },
+  { "__ptrvalue__",    RID_PTRVALUE,   0 },
+  { "__real",          RID_REALPART,   0 },
+  { "__real__",                RID_REALPART,   0 },
+  { "__restrict",      RID_RESTRICT,   0 },
+  { "__restrict__",    RID_RESTRICT,   0 },
+  { "__signed",                RID_SIGNED,     0 },
+  { "__signed__",      RID_SIGNED,     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 },
+  { "auto",            RID_AUTO,       0 },
+  { "break",           RID_BREAK,      0 },
+  { "case",            RID_CASE,       0 },
+  { "char",            RID_CHAR,       0 },
+  { "const",           RID_CONST,      D_TRAD },
+  { "continue",                RID_CONTINUE,   0 },
+  { "default",         RID_DEFAULT,    0 },
+  { "do",              RID_DO,         0 },
+  { "double",          RID_DOUBLE,     0 },
+  { "else",            RID_ELSE,       0 },
+  { "enum",            RID_ENUM,       0 },
+  { "extern",          RID_EXTERN,     0 },
+  { "float",           RID_FLOAT,      0 },
+  { "for",             RID_FOR,        0 },
+  { "goto",            RID_GOTO,       0 },
+  { "if",              RID_IF,         0 },
+  { "inline",          RID_INLINE,     D_TRAD|D_EXT89 },
+  { "int",             RID_INT,        0 },
+  { "long",            RID_LONG,       0 },
+  { "register",                RID_REGISTER,   0 },
+  { "restrict",                RID_RESTRICT,   D_TRAD|D_C89 },
+  { "return",          RID_RETURN,     0 },
+  { "short",           RID_SHORT,      0 },
+  { "signed",          RID_SIGNED,     D_TRAD },
+  { "sizeof",          RID_SIZEOF,     0 },
+  { "static",          RID_STATIC,     0 },
+  { "struct",          RID_STRUCT,     0 },
+  { "switch",          RID_SWITCH,     0 },
+  { "typedef",         RID_TYPEDEF,    0 },
+  { "typeof",          RID_TYPEOF,     D_TRAD|D_EXT },
+  { "union",           RID_UNION,      0 },
+  { "unsigned",                RID_UNSIGNED,   0 },
+  { "void",            RID_VOID,       0 },
+  { "volatile",                RID_VOLATILE,   D_TRAD },
+  { "while",           RID_WHILE,      0 },
+ifobjc
+  { "@class",          RID_AT_CLASS,           D_OBJC },
+  { "@compatibility_alias", RID_AT_ALIAS,      D_OBJC },
+  { "@defs",           RID_AT_DEFS,            D_OBJC },
+  { "@encode",         RID_AT_ENCODE,          D_OBJC },
+  { "@end",            RID_AT_END,             D_OBJC },
+  { "@implementation", RID_AT_IMPLEMENTATION,  D_OBJC },
+  { "@interface",      RID_AT_INTERFACE,       D_OBJC },
+  { "@private",                RID_AT_PRIVATE,         D_OBJC },
+  { "@protected",      RID_AT_PROTECTED,       D_OBJC },
+  { "@protocol",       RID_AT_PROTOCOL,        D_OBJC },
+  { "@public",         RID_AT_PUBLIC,          D_OBJC },
+  { "@selector",       RID_AT_SELECTOR,        D_OBJC },
+  { "id",              RID_ID,                 D_OBJC },
+  { "bycopy",          RID_BYCOPY,             D_OBJC|D_YES },
+  { "byref",           RID_BYREF,              D_OBJC|D_YES },
+  { "in",              RID_IN,                 D_OBJC|D_YES },
+  { "inout",           RID_INOUT,              D_OBJC|D_YES },
+  { "oneway",          RID_ONEWAY,             D_OBJC|D_YES },
+  { "out",             RID_OUT,                D_OBJC|D_YES },
+end ifobjc
+};
+#define N_reswords (sizeof reswords / sizeof (struct resword))
+
+/* Table mapping from RID_* constants to yacc token numbers.
+   Unfortunately we have to have entries for all the keywords in all
+   three languages.  */
+static const short rid_to_yy[RID_MAX] =
+{
+  /* RID_STATIC */     SCSPEC,
+  /* RID_UNSIGNED */   TYPESPEC,
+  /* RID_LONG */       TYPESPEC,
+  /* RID_CONST */      TYPE_QUAL,
+  /* RID_EXTERN */     SCSPEC,
+  /* RID_REGISTER */   SCSPEC,
+  /* RID_TYPEDEF */    SCSPEC,
+  /* RID_SHORT */      TYPESPEC,
+  /* RID_INLINE */     SCSPEC,
+  /* RID_VOLATILE */   TYPE_QUAL,
+  /* RID_SIGNED */     TYPESPEC,
+  /* RID_AUTO */       SCSPEC,
+  /* RID_RESTRICT */   TYPE_QUAL,
+
+  /* C extensions */
+  /* RID_BOUNDED */    TYPE_QUAL,
+  /* RID_UNBOUNDED */  TYPE_QUAL,
+  /* RID_COMPLEX */    TYPESPEC,
+
+  /* C++ */
+  /* RID_FRIEND */     0,
+  /* RID_VIRTUAL */    0,
+  /* RID_EXPLICIT */   0,
+  /* RID_EXPORT */     0,
+  /* RID_MUTABLE */    0,
+
+  /* ObjC */
+  /* RID_IN */         TYPE_QUAL,
+  /* RID_OUT */                TYPE_QUAL,
+  /* RID_INOUT */      TYPE_QUAL,
+  /* RID_BYCOPY */     TYPE_QUAL,
+  /* RID_BYREF */      TYPE_QUAL,
+  /* RID_ONEWAY */     TYPE_QUAL,
+  
+  /* C */
+  /* RID_INT */                TYPESPEC,
+  /* RID_CHAR */       TYPESPEC,
+  /* RID_FLOAT */      TYPESPEC,
+  /* RID_DOUBLE */     TYPESPEC,
+  /* RID_VOID */       TYPESPEC,
+  /* RID_ENUM */       ENUM,
+  /* RID_STRUCT */     STRUCT,
+  /* RID_UNION */      UNION,
+  /* RID_IF */         IF,
+  /* RID_ELSE */       ELSE,
+  /* RID_WHILE */      WHILE,
+  /* RID_DO */         DO,
+  /* RID_FOR */                FOR,
+  /* RID_SWITCH */     SWITCH,
+  /* RID_CASE */       CASE,
+  /* RID_DEFAULT */    DEFAULT,
+  /* RID_BREAK */      BREAK,
+  /* RID_CONTINUE */   CONTINUE,
+  /* RID_RETURN */     RETURN,
+  /* RID_GOTO */       GOTO,
+  /* RID_SIZEOF */     SIZEOF,
+
+  /* C extensions */
+  /* RID_ASM */                ASM_KEYWORD,
+  /* RID_TYPEOF */     TYPEOF,
+  /* RID_ALIGNOF */    ALIGNOF,
+  /* RID_ATTRIBUTE */  ATTRIBUTE,
+  /* RID_VA_ARG */     VA_ARG,
+  /* RID_EXTENSION */  EXTENSION,
+  /* RID_IMAGPART */   IMAGPART,
+  /* RID_REALPART */   REALPART,
+  /* RID_LABEL */      LABEL,
+  /* RID_PTRBASE */    PTR_BASE,
+  /* RID_PTREXTENT */  PTR_EXTENT,
+  /* RID_PTRVALUE */   PTR_VALUE,
+
+  /* C++ */
+  /* RID_BOOL */       TYPESPEC,
+  /* RID_WCHAR */      0,
+  /* RID_CLASS */      0,
+  /* RID_PUBLIC */     0,
+  /* RID_PRIVATE */    0,
+  /* RID_PROTECTED */  0,
+  /* RID_TEMPLATE */   0,
+  /* RID_NULL */       0,
+  /* RID_CATCH */      0,
+  /* RID_DELETE */     0,
+  /* RID_FALSE */      0,
+  /* RID_NAMESPACE */  0,
+  /* RID_NEW */                0,
+  /* RID_OPERATOR */   0,
+  /* RID_THIS */       0,
+  /* RID_THROW */      0,
+  /* RID_TRUE */       0,
+  /* RID_TRY */                0,
+  /* RID_TYPENAME */   0,
+  /* RID_TYPEID */     0,
+  /* RID_USING */      0,
+
+  /* casts */
+  /* RID_CONSTCAST */  0,
+  /* RID_DYNCAST */    0,
+  /* 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,
+  /* RID_AT_END */             END,
+  /* RID_AT_CLASS */           CLASS,
+  /* RID_AT_ALIAS */           ALIAS,
+  /* RID_AT_DEFS */            DEFS,
+  /* RID_AT_PRIVATE */         PRIVATE,
+  /* RID_AT_PROTECTED */       PROTECTED,
+  /* RID_AT_PUBLIC */          PUBLIC,
+  /* RID_AT_PROTOCOL */                PROTOCOL,
+  /* RID_AT_SELECTOR */                SELECTOR,
+  /* RID_AT_INTERFACE */       INTERFACE,
+  /* RID_AT_IMPLEMENTATION */  IMPLEMENTATION
+};
+
+static void
+init_reswords ()
+{
+  unsigned int i;
+  tree id;
+  int mask = ((doing_objc_thang ? 0 : D_OBJC)
+             | (flag_isoc99 ? 0 : D_C89)
+             | (flag_traditional ? D_TRAD : 0)
+             | (flag_no_asm ? (flag_isoc99 ? D_EXT : D_EXT|D_EXT89) : 0));
+
+  /* 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));
+  for (i = 0; i < N_reswords; i++)
+    {
+      /* If a keyword is disabled, do not enter it into the table
+        and so create a canonical spelling that isn't a keyword.  */
+      if (reswords[i].disable & mask)
+       continue;
+
+      id = get_identifier (reswords[i].word);
+      C_RID_CODE (id) = reswords[i].rid;
+      ridpointers [(int) reswords[i].rid] = id;
+
+      /* Objective C does tricky things with enabling and disabling 
+        keywords.  So these we must not elide in the test above, but
+        wait and not mark them reserved now.  */
+      if (! (reswords[i].disable & D_YES))
+       C_IS_RESERVED_WORD (id) = 1;
+    }
+}
+
+const char *
+init_parse (filename)
+     const char *filename;
+{
+  add_c_tree_codes ();
+
+  /* Make identifier nodes long enough for the language-specific slots.  */
+  set_identifier_size (sizeof (struct lang_identifier));
+
+  init_reswords ();
+  init_pragma ();
+
+  return init_c_lex (filename);
+}
+
+void
+finish_parse ()
+{
+  cpp_finish (parse_in);
+  errorcount += parse_in->errors;
+}
+
+#define NAME(type) cpp_type2name (type)
+
+static void
+yyerror (msgid)
+     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 *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
+          || last_token == CPP_OSTRING)
+    error ("%s before string constant", string);
+  else if (last_token == CPP_NUMBER
+          || last_token == CPP_INT
+          || last_token == CPP_FLOAT)
+    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));
+}
+
+static inline int
+_yylex ()
+{
+ retry:
+  last_token = c_lex (&yylval.ttype);
+
+  switch (last_token)
+    {
+    case CPP_EQ:                                       return '=';
+    case CPP_NOT:                                      return '!';
+    case CPP_GREATER:  yylval.code = GT_EXPR;          return ARITHCOMPARE;
+    case CPP_LESS:     yylval.code = LT_EXPR;          return ARITHCOMPARE;
+    case CPP_PLUS:     yylval.code = PLUS_EXPR;        return '+';
+    case CPP_MINUS:    yylval.code = MINUS_EXPR;       return '-';
+    case CPP_MULT:     yylval.code = MULT_EXPR;        return '*';
+    case CPP_DIV:      yylval.code = TRUNC_DIV_EXPR;   return '/';
+    case CPP_MOD:      yylval.code = TRUNC_MOD_EXPR;   return '%';
+    case CPP_AND:      yylval.code = BIT_AND_EXPR;     return '&';
+    case CPP_OR:       yylval.code = BIT_IOR_EXPR;     return '|';
+    case CPP_XOR:      yylval.code = BIT_XOR_EXPR;     return '^';
+    case CPP_RSHIFT:   yylval.code = RSHIFT_EXPR;      return RSHIFT;
+    case CPP_LSHIFT:   yylval.code = LSHIFT_EXPR;      return LSHIFT;
+
+    case CPP_COMPL:                                    return '~';
+    case CPP_AND_AND:                                  return ANDAND;
+    case CPP_OR_OR:                                    return OROR;
+    case CPP_QUERY:                                    return '?';
+    case CPP_COLON:                                    return ':';
+    case CPP_COMMA:                                    return ',';
+    case CPP_OPEN_PAREN:                               return '(';
+    case CPP_CLOSE_PAREN:                              return ')';
+    case CPP_EQ_EQ:    yylval.code = EQ_EXPR;          return EQCOMPARE;
+    case CPP_NOT_EQ:   yylval.code = NE_EXPR;          return EQCOMPARE;
+    case CPP_GREATER_EQ:yylval.code = GE_EXPR;         return ARITHCOMPARE;
+    case CPP_LESS_EQ:  yylval.code = LE_EXPR;          return ARITHCOMPARE;
+
+    case CPP_PLUS_EQ:  yylval.code = PLUS_EXPR;        return ASSIGN;
+    case CPP_MINUS_EQ: yylval.code = MINUS_EXPR;       return ASSIGN;
+    case CPP_MULT_EQ:  yylval.code = MULT_EXPR;        return ASSIGN;
+    case CPP_DIV_EQ:   yylval.code = TRUNC_DIV_EXPR;   return ASSIGN;
+    case CPP_MOD_EQ:   yylval.code = TRUNC_MOD_EXPR;   return ASSIGN;
+    case CPP_AND_EQ:   yylval.code = BIT_AND_EXPR;     return ASSIGN;
+    case CPP_OR_EQ:    yylval.code = BIT_IOR_EXPR;     return ASSIGN;
+    case CPP_XOR_EQ:   yylval.code = BIT_XOR_EXPR;     return ASSIGN;
+    case CPP_RSHIFT_EQ:        yylval.code = RSHIFT_EXPR;      return ASSIGN;
+    case CPP_LSHIFT_EQ:        yylval.code = LSHIFT_EXPR;      return ASSIGN;
+
+    case CPP_OPEN_SQUARE:                              return '[';
+    case CPP_CLOSE_SQUARE:                             return ']';
+    case CPP_OPEN_BRACE:                               return '{';
+    case CPP_CLOSE_BRACE:                              return '}';
+    case CPP_SEMICOLON:                                        return ';';
+    case CPP_ELLIPSIS:                                 return ELLIPSIS;
+
+    case CPP_PLUS_PLUS:                                        return PLUSPLUS;
+    case CPP_MINUS_MINUS:                              return MINUSMINUS;
+    case CPP_DEREF:                                    return POINTSAT;
+    case CPP_DOT:                                      return '.';
+
+    case CPP_EOF:
+      cpp_pop_buffer (parse_in);
+      if (! CPP_BUFFER (parse_in))
+       return 0;
+      goto retry;
+
+    case CPP_NAME:
+      if (C_IS_RESERVED_WORD (yylval.ttype))
+       {
+         enum rid rid_code = C_RID_CODE (yylval.ttype);
+         /* Return the canonical spelling for this keyword.  */
+         yylval.ttype = ridpointers[(int) rid_code];
+         return rid_to_yy[(int) rid_code];
+       }
+
+      if (IDENTIFIER_POINTER (yylval.ttype)[0] == '@')
+       {
+         error ("invalid identifier `%s'", IDENTIFIER_POINTER (yylval.ttype));
+         return IDENTIFIER;
+       }
+
+      {
+       tree decl;
+
+       decl = lookup_name (yylval.ttype);
+
+       if (decl)
+         {
+           if (TREE_CODE (decl) == TYPE_DECL)
+             return TYPENAME;
+           /* A user-invisible read-only initialized variable
+              should be replaced by its value.
+              We handle only strings since that's the only case used in C.  */
+           else if (TREE_CODE (decl) == VAR_DECL
+                    && DECL_IGNORED_P (decl)
+                    && TREE_READONLY (decl)
+                    && DECL_INITIAL (decl) != 0
+                    && TREE_CODE (DECL_INITIAL (decl)) == STRING_CST)
+             {
+               tree stringval = DECL_INITIAL (decl);
+
+               /* Copy the string value so that we won't clobber anything
+                  if we put something in the TREE_CHAIN of this one.  */
+               yylval.ttype = build_string (TREE_STRING_LENGTH (stringval),
+                                            TREE_STRING_POINTER (stringval));
+               return STRING;
+             }
+         }
+       else if (doing_objc_thang)
+         {
+           tree objc_interface_decl = is_class_name (yylval.ttype);
+
+           if (objc_interface_decl)
+             {
+               yylval.ttype = objc_interface_decl;
+               return CLASSNAME;
+             }
+         }
+
+       return IDENTIFIER;
+      }
+
+    case CPP_INT:
+    case CPP_FLOAT:
+    case CPP_NUMBER:
+    case CPP_CHAR:
+    case CPP_WCHAR:
+      return CONSTANT;
+
+    case CPP_STRING:
+    case CPP_WSTRING:
+      return STRING;
+      
+    case CPP_OSTRING:
+      return OBJC_STRING;
+
+      /* These tokens are C++ specific (and will not be generated
+         in C mode, but let's be cautious).  */
+    case CPP_SCOPE:
+    case CPP_DEREF_STAR:
+    case CPP_DOT_STAR:
+    case CPP_MIN_EQ:
+    case CPP_MAX_EQ:
+    case CPP_MIN:
+    case CPP_MAX:
+      /* These tokens should not survive translation phase 4.  */
+    case CPP_HASH:
+    case CPP_PASTE:
+      error ("syntax error before '%s' token", NAME(last_token));
+      goto retry;
+
+    default:
+      abort ();
+    }
+
+  /* NOTREACHED */
+}
+
+static int
+yylex()
+{
+  int r;
+  timevar_push (TV_LEX);
+  r = _yylex();
+  timevar_pop (TV_LEX);
+  return r;
+}
+
+/* Sets the value of the 'yydebug' variable to VALUE.
+   This is a function so we don't have to have YYDEBUG defined
+   in order to build the compiler.  */
+
+void
+set_yydebug (value)
+     int value;
+{
+#if YYDEBUG != 0
+  yydebug = value;
+#else
+  warning ("YYDEBUG not defined.");
+#endif
+}
+
+/* Function used when yydebug is set, to print a token in more detail.  */
+
+static void
+yyprint (file, yychar, yyl)
+     FILE *file;
+     int yychar;
+     YYSTYPE yyl;
+{
+  tree t = yyl.ttype;
+
+  fprintf (file, " [%s]", NAME(last_token));
+  
+  switch (yychar)
+    {
+    case IDENTIFIER:
+    case TYPENAME:
+    case OBJECTNAME:
+    case TYPESPEC:
+    case TYPE_QUAL:
+    case SCSPEC:
+      if (IDENTIFIER_POINTER (t))
+       fprintf (file, " `%s'", IDENTIFIER_POINTER (t));
+      break;
+
+    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));
+      break;
+    }
+}
+\f
+/* This is not the ideal place to put these, but we have to get them out
+   of c-lex.c because cp/lex.c has its own versions.  */
+
+/* Return something to represent absolute declarators containing a *.
+   TARGET is the absolute declarator that the * contains.
+   TYPE_QUALS is a list of modifiers such as const or volatile
+   to apply to the pointer type, represented as identifiers.
+
+   We return an INDIRECT_REF whose "contents" are TARGET
+   and whose type is the modifier list.  */
+
+tree
+make_pointer_declarator (type_quals, target)
+     tree type_quals, target;
+{
+  return build1 (INDIRECT_REF, type_quals, target);
+}