OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-ada-spec.c (separate_class_package): New function. 

* c-ada-spec.c (separate_class_package): New function.
	(pp_ada_tree_identifier): Prefix references to C++ classes with the
	name of their enclosing package.
	(print_ada_declaration): Use separate_class_package.

Co-Authored-By: Matthew Gingell <gingell@adacore.com>

From-SVN: r166059
This commit is contained in:
Arnaud Charlet 2010-10-29 10:03:43 +00:00 committed by Arnaud Charlet
parent f3f637378c
commit 1e4bf85b80
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/ChangeLog
View File

@ -1,3 +1,11 @@
2010-10-29 Arnaud Charlet <charlet@adacore.com>
Matthew Gingell <gingell@adacore.com>
* c-ada-spec.c (separate_class_package): New function.
(pp_ada_tree_identifier): Prefix references to C++ classes with the
name of their enclosing package.
(print_ada_declaration): Use separate_class_package.
2010-10-27 Jason Merrill <jason@redhat.com> 2010-10-27 Jason Merrill <jason@redhat.com>
* c-common.c (c_common_reswords): Add __is_literal_type. * c-common.c (c_common_reswords): Add __is_literal_type.

31
gcc/c-family/c-ada-spec.c
View File

@ -51,6 +51,7 @@ static void dump_ada_withs (FILE *);
static void dump_ads (const char *, void (*)(const char *), static void dump_ads (const char *, void (*)(const char *),
int (*)(tree, cpp_operation)); int (*)(tree, cpp_operation));
static char *to_ada_name (const char *, int *); static char *to_ada_name (const char *, int *);
static bool separate_class_package (tree);
#define LOCATION_COL(LOC) ((expand_location (LOC)).column) #define LOCATION_COL(LOC) ((expand_location (LOC)).column)
@ -1152,6 +1153,23 @@ to_ada_name (const char *name, int *space_found)
return s; return s;
} }
/* Return true if DECL refers to a C++ class type for which a
separate enclosing package has been or should be generated. */
static bool
separate_class_package (tree decl)
{
if (decl)
{
tree type = TREE_TYPE (decl);
return type
&& TREE_CODE (type) == RECORD_TYPE
&& (TYPE_METHODS (type) || has_static_fields (type));
}
else
return false;
}
static bool package_prefix = true; static bool package_prefix = true;
/* Dump in BUFFER the name of an identifier NODE of type TYPE, following Ada /* Dump in BUFFER the name of an identifier NODE of type TYPE, following Ada
@ -1209,7 +1227,15 @@ pp_ada_tree_identifier (pretty_printer *buffer, tree node, tree type,
default: default:
break; break;
} }
}
if (separate_class_package (decl))
{
pp_string (buffer, "Class_");
pp_string (buffer, s);
pp_string (buffer, ".");
}
}
} }
} }
@ -2607,8 +2633,7 @@ print_ada_declaration (pretty_printer *buffer, tree t, tree type,
{ {
dump_nested_types (buffer, t, t, false, cpp_check, spc); dump_nested_types (buffer, t, t, false, cpp_check, spc);
if (TYPE_METHODS (TREE_TYPE (t)) if (separate_class_package (t))
|| has_static_fields (TREE_TYPE (t)))
{ {
is_class = true; is_class = true;
pp_string (buffer, "package Class_"); pp_string (buffer, "package Class_");