Commit d01a8ee0 by Bryce McKinlay Committed by Bryce McKinlay

parse.y (set_nested_class_simple_name_value): Removed.

	* parse.y (set_nested_class_simple_name_value): Removed.
	(java_complete_expand_class): Remove calls to
	set_nested_class_simple_name_value.

From-SVN: r83596
parent 5a1f3953
2004-06-23 Bryce McKinlay <mckinlay@redhat.com>
* parse.y (set_nested_class_simple_name_value): Removed.
(java_complete_expand_class): Remove calls to
set_nested_class_simple_name_value.
2004-06-22 Andrew Haley <aph@redhat.com> 2004-06-22 Andrew Haley <aph@redhat.com>
Ranjit Mathew <rmathew@hotmail.com> Ranjit Mathew <rmathew@hotmail.com>
......
...@@ -296,7 +296,6 @@ static int pop_current_osb (struct parser_ctxt *); ...@@ -296,7 +296,6 @@ static int pop_current_osb (struct parser_ctxt *);
static tree maybe_make_nested_class_name (tree); static tree maybe_make_nested_class_name (tree);
static int make_nested_class_name (tree); static int make_nested_class_name (tree);
static void set_nested_class_simple_name_value (tree, int);
static void link_nested_class_to_enclosing (void); static void link_nested_class_to_enclosing (void);
static tree resolve_inner_class (htab_t, tree, tree *, tree *, tree); static tree resolve_inner_class (htab_t, tree, tree *, tree *, tree);
static tree find_as_inner_class (tree, tree, tree); static tree find_as_inner_class (tree, tree, tree);
...@@ -3694,19 +3693,6 @@ find_as_inner_class_do (tree qual, tree enclosing) ...@@ -3694,19 +3693,6 @@ find_as_inner_class_do (tree qual, tree enclosing)
return (!qual && enclosing ? enclosing : NULL_TREE); return (!qual && enclosing ? enclosing : NULL_TREE);
} }
/* Reach all inner classes and tie their unqualified name to a
DECL. */
static void
set_nested_class_simple_name_value (tree outer, int set)
{
tree l;
for (l = DECL_INNER_CLASS_LIST (outer); l; l = TREE_CHAIN (l))
IDENTIFIER_GLOBAL_VALUE (TREE_VALUE (l)) = (set ?
TREE_PURPOSE (l) : NULL_TREE);
}
static void static void
link_nested_class_to_enclosing (void) link_nested_class_to_enclosing (void)
{ {
...@@ -7712,8 +7698,6 @@ java_complete_expand_class (tree outer) ...@@ -7712,8 +7698,6 @@ java_complete_expand_class (tree outer)
{ {
tree inner_list; tree inner_list;
set_nested_class_simple_name_value (outer, 1); /* Set */
/* We need to go after all inner classes and start expanding them, /* We need to go after all inner classes and start expanding them,
starting with most nested ones. We have to do that because nested starting with most nested ones. We have to do that because nested
classes might add functions to outer classes */ classes might add functions to outer classes */
...@@ -7723,7 +7707,6 @@ java_complete_expand_class (tree outer) ...@@ -7723,7 +7707,6 @@ java_complete_expand_class (tree outer)
java_complete_expand_class (TREE_PURPOSE (inner_list)); java_complete_expand_class (TREE_PURPOSE (inner_list));
java_complete_expand_methods (outer); java_complete_expand_methods (outer);
set_nested_class_simple_name_value (outer, 0); /* Reset */
} }
/* Expand methods registered in CLASS_DECL. The general idea is that /* Expand methods registered in CLASS_DECL. The general idea is that
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment