diff options
author | kan <kan@FreeBSD.org> | 2003-07-11 04:32:20 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2003-07-11 04:32:20 +0000 |
commit | a26ec1cc0c867f9b4843d94adbd1c0d3183827a6 (patch) | |
tree | 21671d3d904a5b3e53e6291caf5a891d6dff6e59 | |
parent | 9d744067fcd19aa5552f59fead72fdb656646da7 (diff) | |
download | FreeBSD-src-a26ec1cc0c867f9b4843d94adbd1c0d3183827a6.zip FreeBSD-src-a26ec1cc0c867f9b4843d94adbd1c0d3183827a6.tar.gz |
Merge FreeBSD changes into GCC 3.3.1-prerelease:
1.2 Printf format errors fixes.
-rw-r--r-- | contrib/gcc/cp/ptree.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/contrib/gcc/cp/ptree.c b/contrib/gcc/cp/ptree.c index f6a7f1c..37ec3136 100644 --- a/contrib/gcc/cp/ptree.c +++ b/contrib/gcc/cp/ptree.c @@ -166,15 +166,23 @@ cxx_print_type (file, node, indent) } } +static void +cxx_print_binding (FILE *stream, cxx_binding *binding, const char *prefix) +{ + fprintf (stream, "%s <", prefix); + fprintf (stream, HOST_PTR_PRINTF_FORMAT, HOST_PTR_PRINTF_TYPE binding); + fprintf (stream, ">"); +} + void cxx_print_identifier (file, node, indent) FILE *file; tree node; int indent; { - print_node (file, "bindings", IDENTIFIER_NAMESPACE_BINDINGS (node), indent + 4); + cxx_print_binding (file, IDENTIFIER_NAMESPACE_BINDINGS (node), "bindings"); print_node (file, "class", IDENTIFIER_CLASS_VALUE (node), indent + 4); - print_node (file, "local bindings", IDENTIFIER_BINDING (node), indent + 4); + cxx_print_binding (file, IDENTIFIER_BINDING (node), "local bindings"); print_node (file, "label", IDENTIFIER_LABEL_VALUE (node), indent + 4); print_node (file, "template", IDENTIFIER_TEMPLATE (node), indent + 4); print_node (file, "implicit", IDENTIFIER_IMPLICIT_DECL (node), indent + 4); @@ -189,12 +197,6 @@ cxx_print_xnode (file, node, indent) { switch (TREE_CODE (node)) { - case CPLUS_BINDING: - fprintf (file, " scope "); - fprintf (file, HOST_PTR_PRINTF_FORMAT, HOST_PTR_PRINTF_TYPE BINDING_SCOPE (node)); - print_node (file, "value", BINDING_VALUE (node), indent+4); - print_node (file, "chain", TREE_CHAIN (node), indent+4); - break; case OVERLOAD: print_node (file, "function", OVL_FUNCTION (node), indent+4); print_node (file, "chain", TREE_CHAIN (node), indent+4); |