c-tree.h (grokfield): Remove unused filename and line parameters.

	* c-tree.h (grokfield): Remove unused filename and line parameters.
	* c-decl.c (grokfield): Remove unused filename and line	parameters.
	* c-parse.in (component_decl): Adjust field grokking rules, adjust
	grokfield calls.
	(component_declarator): Likewise.
	(component_notype_declarator): Likewise.
	* objc/objc-act.c (build_module_descriptor): Adjust grokfield
	calls.
	(build_protocol_template, build_method_prototype_list_template,
	build_method_prototype_template, build_category_template,
	build_selector_template, build_class_template,
	build_super_template, build_ivar_template,
	build_ivar_list_template, build_method_list_template,
	build_method_template, add_instance_variable): Likewise.

From-SVN: r68560

gcc/ChangeLog

+2003-06-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* c-tree.h (grokfield): Remove unused filename and line parameters.
+	* c-decl.c (grokfield): Remove unused filename and line	parameters.
+	* c-parse.in (component_decl): Adjust field grokking rules, adjust
+	grokfield calls.
+	(component_declarator): Likewise.
+	(component_notype_declarator): Likewise.
+	* objc/objc-act.c (build_module_descriptor): Adjust grokfield
+	calls.
+	(build_protocol_template, build_method_prototype_list_template,
+	build_method_prototype_template, build_category_template,
+	build_selector_template, build_class_template,
+	build_super_template, build_ivar_template,
+	build_ivar_list_template, build_method_list_template,
+	build_method_template, add_instance_variable): Likewise.
+
 2003-06-27  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* stmt.c (do_jump_if_equal): Return 0 earlier if OP1 and

gcc/c-decl.c

@@ -4811,8 +4811,7 @@ start_struct (enum tree_code code, tree name)
    are ultimately passed to `build_struct' to make the RECORD_TYPE node.  */
 
 tree
-grokfield (const char *filename ATTRIBUTE_UNUSED, int line ATTRIBUTE_UNUSED,
-	   tree declarator, tree declspecs, tree width)
+grokfield (tree declarator, tree declspecs, tree width)
 {
   tree value;
 

gcc/c-parse.in

@@ -1862,7 +1862,7 @@ component_decl:
 	  declspecs_nosc_ts setspecs components
 		{ $$ = $3;
 		  POP_DECLSPEC_STACK; }
-	| declspecs_nosc_ts setspecs save_filename save_lineno
+	| declspecs_nosc_ts setspecs
 		{
 		  /* Support for unnamed structs or unions as members of
 		     structs or unions (which is [a] useful and [b] supports
@@ -1870,7 +1870,7 @@ component_decl:
 		  if (pedantic)
 		    pedwarn ("ISO C doesn't support unnamed structs/unions");
 
-		  $$ = grokfield($3, $4, NULL, current_declspecs, NULL_TREE);
+		  $$ = grokfield(NULL, current_declspecs, NULL_TREE);
 		  POP_DECLSPEC_STACK; }
 	| declspecs_nosc_nots setspecs components_notype
 		{ $$ = $3;
@@ -1900,29 +1900,33 @@ components_notype:
 	;
 
 component_declarator:
-	  save_filename save_lineno declarator maybe_attribute
-		{ $$ = grokfield ($1, $2, $3, current_declspecs, NULL_TREE);
-		  decl_attributes (&$$, chainon ($4, all_prefix_attributes), 0); }
-	| save_filename save_lineno
-	  declarator ':' expr_no_commas maybe_attribute
-		{ $$ = grokfield ($1, $2, $3, current_declspecs, $5);
-		  decl_attributes (&$$, chainon ($6, all_prefix_attributes), 0); }
-	| save_filename save_lineno ':' expr_no_commas maybe_attribute
-		{ $$ = grokfield ($1, $2, NULL_TREE, current_declspecs, $4);
-		  decl_attributes (&$$, chainon ($5, all_prefix_attributes), 0); }
+	  declarator maybe_attribute
+		{ $$ = grokfield ($1, current_declspecs, NULL_TREE);
+		  decl_attributes (&$$,
+				   chainon ($2, all_prefix_attributes), 0); }
+	| declarator ':' expr_no_commas maybe_attribute
+		{ $$ = grokfield ($1, current_declspecs, $3);
+		  decl_attributes (&$$,
+				   chainon ($4, all_prefix_attributes), 0); }
+	| ':' expr_no_commas maybe_attribute
+		{ $$ = grokfield (NULL_TREE, current_declspecs, $2);
+		  decl_attributes (&$$,
+				   chainon ($3, all_prefix_attributes), 0); }
 	;
 
 component_notype_declarator:
-	  save_filename save_lineno notype_declarator maybe_attribute
-		{ $$ = grokfield ($1, $2, $3, current_declspecs, NULL_TREE);
-		  decl_attributes (&$$, chainon ($4, all_prefix_attributes), 0); }
-	| save_filename save_lineno
-	  notype_declarator ':' expr_no_commas maybe_attribute
-		{ $$ = grokfield ($1, $2, $3, current_declspecs, $5);
-		  decl_attributes (&$$, chainon ($6, all_prefix_attributes), 0); }
-	| save_filename save_lineno ':' expr_no_commas maybe_attribute
-		{ $$ = grokfield ($1, $2, NULL_TREE, current_declspecs, $4);
-		  decl_attributes (&$$, chainon ($5, all_prefix_attributes), 0); }
+	  notype_declarator maybe_attribute
+		{ $$ = grokfield ($1, current_declspecs, NULL_TREE);
+		  decl_attributes (&$$,
+				   chainon ($2, all_prefix_attributes), 0); }
+	| notype_declarator ':' expr_no_commas maybe_attribute
+		{ $$ = grokfield ($1, current_declspecs, $3);
+		  decl_attributes (&$$,
+				   chainon ($4, all_prefix_attributes), 0); }
+	| ':' expr_no_commas maybe_attribute
+		{ $$ = grokfield (NULL_TREE, current_declspecs, $2);
+		  decl_attributes (&$$,
+				   chainon ($3, all_prefix_attributes), 0); }
 	;
 
 /* We chain the enumerators in reverse order.

gcc/c-tree.h

@@ -195,7 +195,7 @@ extern tree finish_enum (tree, tree, tree);
 extern void finish_function (int, int);
 extern tree finish_struct (tree, tree, tree);
 extern tree get_parm_info (int);
-extern tree grokfield (const char *, int, tree, tree, tree);
+extern tree grokfield (tree, tree, tree);
 extern tree groktypename (tree);
 extern tree groktypename_in_parm_context (tree);
 extern tree implicitly_declare (tree);