Revert most of last change.

From-SVN: r9946
This commit is contained in:
Richard Kenner 1995-06-14 13:23:47 -04:00
parent 0763f3ab57
commit 9fe9dd86e6

View File

@ -27,10 +27,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
written by AT&T, but I have never seen it. */ written by AT&T, but I have never seen it. */
ifobjc ifobjc
%expect 53 %expect 48
end ifobjc end ifobjc
ifc ifc
%expect 39 %expect 34
/* These are the 23 conflicts you should get in parse.output; /* These are the 23 conflicts you should get in parse.output;
the state numbers may vary if minor changes in the grammar are made. the state numbers may vary if minor changes in the grammar are made.
@ -338,8 +338,9 @@ datadef:
; ;
fndef: fndef:
typed_declspecs setspecs declarator maybe_attribute typed_declspecs setspecs declarator
{ if (! start_function ($1, $3, prefix_attributes, $4, 0)) { if (! start_function ($1, $3, prefix_attributes,
NULL_TREE, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
@ -355,8 +356,9 @@ fndef:
prefix_attributes = TREE_PURPOSE (declspec_stack); prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| declmods setspecs notype_declarator maybe_attribute | declmods setspecs notype_declarator
{ if (! start_function ($1, $3, prefix_attributes, $4, 0)) { if (! start_function ($1, $3, prefix_attributes,
NULL_TREE, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
@ -372,9 +374,9 @@ fndef:
prefix_attributes = TREE_PURPOSE (declspec_stack); prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| setspecs notype_declarator maybe_attribute | setspecs notype_declarator
{ if (! start_function (NULL_TREE, $2, { if (! start_function (NULL_TREE, $2,
prefix_attributes, $3, 0)) prefix_attributes, NULL_TREE, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
@ -1218,10 +1220,10 @@ end ifc
; ;
nested_function: nested_function:
declarator maybe_attribute declarator
{ push_c_function_context (); { push_c_function_context ();
if (! start_function (current_declspecs, $1, if (! start_function (current_declspecs, $1,
prefix_attributes, $2, 1)) prefix_attributes, NULL_TREE, 1))
{ {
pop_c_function_context (); pop_c_function_context ();
YYERROR1; YYERROR1;
@ -1241,10 +1243,10 @@ nested_function:
; ;
notype_nested_function: notype_nested_function:
notype_declarator maybe_attribute notype_declarator
{ push_c_function_context (); { push_c_function_context ();
if (! start_function (current_declspecs, $1, if (! start_function (current_declspecs, $1,
prefix_attributes, $2, 1)) prefix_attributes, NULL_TREE, 1))
{ {
pop_c_function_context (); pop_c_function_context ();
YYERROR1; YYERROR1;