From 2bd3ecadd83939fd4bc531d4f6ab11e2326892b4 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Wed, 19 Mar 2003 20:34:10 +0000 Subject: [PATCH] c-common.h (c_dump_tree), [...]): Change return type from 'int' to 'bool'. (gcc) * c-common.h (c_dump_tree), c-dump.c (c_dump_tree), langhooks-def.h (lhd_tree_dump_dump_tree), langhooks.c (lhd_tree_dump_dump_tree), langhooks.h (*dump_tree): Change return type from 'int' to 'bool'. Replace 0 and 1 with true and false in return statements. (cp) * dump.c (cp_dump_tree), cp-tree.h (cp_dump_tree): Change return type from 'int' to 'bool'. Replace 0 and 1 with true and false in return statements. (java) * lang.c (java_dump_tree): Change return type from 'int' to 'bool'. Replace 0 and 1 with true and false in return statements. From-SVN: r64596 --- gcc/ChangeLog | 8 ++++++++ gcc/c-common.h | 2 +- gcc/c-dump.c | 4 ++-- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/cp-tree.h | 2 +- gcc/cp/dump.c | 14 +++++++------- gcc/java/ChangeLog | 5 +++++ gcc/java/lang.c | 24 ++++++++++++------------ gcc/langhooks-def.h | 2 +- gcc/langhooks.c | 4 ++-- gcc/langhooks.h | 2 +- 11 files changed, 46 insertions(+), 27 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index afe3065afcb..7a8272c86e6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-03-19 Nathanael Nerode + + * c-common.h (c_dump_tree), c-dump.c (c_dump_tree), + langhooks-def.h (lhd_tree_dump_dump_tree), + langhooks.c (lhd_tree_dump_dump_tree), langhooks.h (*dump_tree): + Change return type from 'int' to 'bool'. Replace 0 and 1 with + true and false in return statements. + 2003-03-19 Kevin Buettner * dwarf2out.c (DWARF_INITIAL_LENGTH_SIZE): Define. diff --git a/gcc/c-common.h b/gcc/c-common.h index b4a14a39b1c..b174f58e44b 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -1281,7 +1281,7 @@ struct c_fileinfo struct c_fileinfo *get_fileinfo PARAMS ((const char *)); extern void dump_time_statistics PARAMS ((void)); -extern int c_dump_tree PARAMS ((void *, tree)); +extern bool c_dump_tree PARAMS ((void *, tree)); extern void pch_init PARAMS ((void)); extern int c_common_valid_pch PARAMS ((cpp_reader *pfile, diff --git a/gcc/c-dump.c b/gcc/c-dump.c index 541910b6b9d..7f3464b38a0 100644 --- a/gcc/c-dump.c +++ b/gcc/c-dump.c @@ -49,7 +49,7 @@ dump_next_stmt (di, t) /* Dump any C-specific tree codes and attributes of common codes. */ -int +bool c_dump_tree (dump_info, t) void *dump_info; tree t; @@ -194,5 +194,5 @@ c_dump_tree (dump_info, t) break; } - return 0; + return false; } diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index de07dfe5122..d5864cd7dea 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-03-19 Nathanael Nerode + + * dump.c (cp_dump_tree), cp-tree.h (cp_dump_tree): Change return + type from 'int' to 'bool'. Replace 0 and 1 with true and false in + return statements. + 2003-03-19 Jason Merrill PR c++/8316, c++/9315, c++/10136 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 587acbcdad5..f8ded19f7c7 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4407,7 +4407,7 @@ extern tree mangle_guard_variable (tree); extern tree mangle_ref_init_variable (tree); /* in dump.c */ -extern int cp_dump_tree (void *, tree); +extern bool cp_dump_tree (void *, tree); /* -- end of C++ */ diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c index fcd2b4f30df..7f73a3085e3 100644 --- a/gcc/cp/dump.c +++ b/gcc/cp/dump.c @@ -202,7 +202,7 @@ dump_op (dump_info_p di, tree t) } } -int +bool cp_dump_tree (void* dump_info, tree t) { enum tree_code code; @@ -223,17 +223,17 @@ cp_dump_tree (void* dump_info, tree t) if (IDENTIFIER_OPNAME_P (t)) { dump_string (di, "operator"); - return 1; + return true; } else if (IDENTIFIER_TYPENAME_P (t)) { dump_child ("tynm", TREE_TYPE (t)); - return 1; + return true; } else if (t == anonymous_namespace_name) { dump_string (di, "unnamed"); - return 1; + return true; } break; @@ -243,7 +243,7 @@ cp_dump_tree (void* dump_info, tree t) dump_string (di, "ptrmem"); dump_child ("ptd", TYPE_PTRMEM_POINTED_TO_TYPE (t)); dump_child ("cls", TYPE_PTRMEM_CLASS_TYPE (t)); - return 1; + return true; } break; @@ -254,7 +254,7 @@ cp_dump_tree (void* dump_info, tree t) dump_string (di, "ptrmem"); dump_child ("ptd", TYPE_PTRMEM_POINTED_TO_TYPE (t)); dump_child ("cls", TYPE_PTRMEM_CLASS_TYPE (t)); - return 1; + return true; } /* Is it a type used as a base? */ @@ -262,7 +262,7 @@ cp_dump_tree (void* dump_info, tree t) && CLASSTYPE_AS_BASE (TYPE_CONTEXT (t)) == t) { dump_child ("bfld", TYPE_CONTEXT (t)); - return 1; + return true; } if (! IS_AGGR_TYPE (t)) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8f0c3be7261..db5651b37e2 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2003-03-19 Nathanael Nerode + + * lang.c (java_dump_tree): Change return type from 'int' to 'bool'. + Replace 0 and 1 with true and false in return statements. + 2003-03-19 Tom Tromey * lex.c (do_java_lex): Renamed from java_lex. diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 41441bf128f..031ddcc38b8 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -69,7 +69,7 @@ static int java_unsafe_for_reeval (tree); static int merge_init_test_initialization (void * *, void *); static int inline_init_test_initialization (void * *, void *); static bool java_can_use_bit_fields_p (void); -static int java_dump_tree (void *, tree); +static bool java_dump_tree (void *, tree); static void dump_compound_expr (dump_info_p, tree); #ifndef TARGET_OBJECT_SUFFIX @@ -1050,7 +1050,7 @@ dump_compound_expr (dump_info_p di, tree t) } } -static int +static bool java_dump_tree (void *dump_info, tree t) { enum tree_code code; @@ -1073,29 +1073,29 @@ java_dump_tree (void *dump_info, tree t) dump_child ("body", DECL_FUNCTION_BODY (t)); if (DECL_LANG_SPECIFIC (t) && !dump_flag (di, TDF_SLIM, t)) dump_child ("inline body", DECL_SAVED_TREE (t)); - return 1; + return true; case RETURN_EXPR: dump_child ("expr", TREE_OPERAND (t, 0)); - return 1; + return true; case GOTO_EXPR: dump_child ("goto", TREE_OPERAND (t, 0)); - return 1; + return true; case LABEL_EXPR: dump_child ("label", TREE_OPERAND (t, 0)); - return 1; + return true; case LABELED_BLOCK_EXPR: dump_child ("label", TREE_OPERAND (t, 0)); dump_child ("block", TREE_OPERAND (t, 1)); - return 1; + return true; case EXIT_BLOCK_EXPR: dump_child ("block", TREE_OPERAND (t, 0)); dump_child ("val", TREE_OPERAND (t, 1)); - return 1; + return true; case BLOCK: if (BLOCK_EXPR_BODY (t)) @@ -1114,17 +1114,17 @@ java_dump_tree (void *dump_info, tree t) block = TREE_CHAIN (block); } } - return 1; + return true; case COMPOUND_EXPR: if (!dump_flag (di, TDF_SLIM, t)) - return 0; + return false; dump_compound_expr (di, t); - return 1; + return true; default: break; } - return 0; + return false; } #include "gt-java-lang.h" diff --git a/gcc/langhooks-def.h b/gcc/langhooks-def.h index afec80614e0..4315eab91e7 100644 --- a/gcc/langhooks-def.h +++ b/gcc/langhooks-def.h @@ -183,7 +183,7 @@ void write_global_declarations PARAMS ((void)); } /* Tree dump hooks. */ -int lhd_tree_dump_dump_tree PARAMS ((void *, tree)); +bool lhd_tree_dump_dump_tree PARAMS ((void *, tree)); int lhd_tree_dump_type_quals PARAMS ((tree)); #define LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN lhd_tree_dump_dump_tree diff --git a/gcc/langhooks.c b/gcc/langhooks.c index cf343ebbbcb..16592a9b3f7 100644 --- a/gcc/langhooks.c +++ b/gcc/langhooks.c @@ -426,12 +426,12 @@ lhd_tree_inlining_convert_parm_for_inlining (parm, value, fndecl) nodes. Returns nonzero if it does not want the usual dumping of the second argument. */ -int +bool lhd_tree_dump_dump_tree (di, t) void *di ATTRIBUTE_UNUSED; tree t ATTRIBUTE_UNUSED; { - return 0; + return false; } /* lang_hooks.tree_dump.type_qual: Determine type qualifiers in a diff --git a/gcc/langhooks.h b/gcc/langhooks.h index 4696c6f07ce..82454952397 100644 --- a/gcc/langhooks.h +++ b/gcc/langhooks.h @@ -90,7 +90,7 @@ struct lang_hooks_for_tree_dump { /* Dump language-specific parts of tree nodes. Returns nonzero if it does not want the usual dumping of the second argument. */ - int (*dump_tree) PARAMS ((void *, tree)); + bool (*dump_tree) PARAMS ((void *, tree)); /* Determine type qualifiers in a language-specific way. */ int (*type_quals) PARAMS ((tree)); -- 2.30.2