diff options
author | Paolo Carlini <pcarlini@suse.de> | 2008-03-21 18:56:51 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-03-21 18:56:51 +0000 |
commit | 9e1e64ec2b978e81924000db7d4009b92bb5a638 (patch) | |
tree | 28e5155485b87e7675ad708f94b5a26a8e4ea948 /gcc/cp/pt.c | |
parent | fc34570cc14662c34807b275ea7dd5c8ac310e9f (diff) | |
download | gcc-9e1e64ec2b978e81924000db7d4009b92bb5a638.zip gcc-9e1e64ec2b978e81924000db7d4009b92bb5a638.tar.gz gcc-9e1e64ec2b978e81924000db7d4009b92bb5a638.tar.bz2 |
cp-tree.h (IS_AGGR_TYPE): Rename to MAYBE_CLASS_TYPE_P.
2008-03-21 Paolo Carlini <pcarlini@suse.de>
* cp-tree.h (IS_AGGR_TYPE): Rename to MAYBE_CLASS_TYPE_P.
(SET_IS_AGGR_TYPE): Rename to SET_CLASS_TYPE_P.
(IS_AGGR_TYPE_CODE): Rename to RECORD_OR_UNION_CODE_P.
(PROMOTES_TO_AGGR_TYPE): Remove.
(CLASS_TYPE_P, TYPE_NON_AGGREGATE_CLASS): Adjust.
* typeck.c (unary_complex_lvalue, build_modify_expr,
convert_for_initialization): Adjust.
* init.c (is_aggr_type): Remove.
(is_class_type): Add.
(build_offset_ref, build_new_1, build_vec_delete_1, build_vec_init,
build_delete): Adjust.
* lex.c (make_aggr_type): Remove.
(make_class_type): Add.
(cxx_make_type): Adjust.
* class.c (finish_struct_1, fixed_type_or_null, is_empty_class):
Adjust.
* decl.c (build_typename_type, make_typename_type,
make_unbound_class_template, cxx_init_decl_processing,
check_tag_decl, groktypename, start_decl_1, layout_var_decl,
check_initializer, cp_finish_decl, build_ptrmemfunc_type, grokparms,
grok_op_properties, xref_tag, check_function_type): Adjust.
* call.c (check_dtor_name, standard_conversion, implicit_conversion,
add_builtin_candidate, add_builtin_candidates,
build_user_type_conversion_1, convert_like_real, build_cxx_call,
is_subseq, compare_ics): Adjust.
* method.c (use_thunk): Adjust.
* rtti.c (build_dynamic_cast_1, create_pseudo_type_info,
create_tinfo_types): Adjust.
* cvt.c (cp_convert_to_pointer, convert_to_pointer_force,
build_up_reference, convert_to_reference, convert_from_reference,
ocp_convert, build_expr_type_conversion): Adjust.
* tree.c (bind_template_template_parm, error_type): Adjust.
* dump.c (cp_dump_tree): Adjust.
* search.c (lookup_member): Adjust.
* friend.c (make_friend_class, do_friend): Adjust.
* typeck2.c (store_init_value, process_init_constructor_array,
process_init_constructor_record, build_x_arrow, build_m_component_ref,
build_functional_cast): Adjust.
* pt.c (finish_member_template_decl, process_template_parm,
lookup_template_class, tsubst_function_type, tsubst,
tsubst_copy_and_build, get_template_base, bt_instantiate_type_proc):
Adjust.
* semantics.c (begin_class_definition, finish_base_specifier,
finish_typeof, cxx_omp_predetermined_sharing, finish_decltype_type):
Adjust.
* name-lookup.c (constructor_name_p, push_overloaded_decl,
do_class_using_decl, lookup_qualified_name,
maybe_process_template_type_declaration): Adjust.
* decl2.c (grok_array_decl, check_member_template,
constrain_class_visibility): Adjust.
* parser.c (cp_parser_class_name): Adjust.
From-SVN: r133434
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r-- | gcc/cp/pt.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d03ea9f..628a445 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -238,7 +238,7 @@ finish_member_template_decl (tree decl) type = TREE_TYPE (decl); if (type == error_mark_node) return error_mark_node; - if (IS_AGGR_TYPE (type) + if (MAYBE_CLASS_TYPE_P (type) && CLASSTYPE_TEMPLATE_INFO (type) && !CLASSTYPE_TEMPLATE_SPECIALIZATION (type)) { @@ -3041,7 +3041,7 @@ process_template_parm (tree list, tree parm, bool is_non_type, if (parm && TREE_CODE (parm) == TEMPLATE_DECL) { - t = make_aggr_type (TEMPLATE_TEMPLATE_PARM); + t = cxx_make_type (TEMPLATE_TEMPLATE_PARM); /* This is for distinguishing between real templates and template template parameters */ TREE_TYPE (parm) = t; @@ -3050,7 +3050,7 @@ process_template_parm (tree list, tree parm, bool is_non_type, } else { - t = make_aggr_type (TEMPLATE_TYPE_PARM); + t = cxx_make_type (TEMPLATE_TYPE_PARM); /* parm is either IDENTIFIER_NODE or NULL_TREE. */ decl = build_decl (TYPE_DECL, parm, t); } @@ -5473,7 +5473,7 @@ lookup_template_class (tree d1, if (template) context = DECL_CONTEXT (template); } - else if (TREE_CODE (d1) == TYPE_DECL && IS_AGGR_TYPE (TREE_TYPE (d1))) + else if (TREE_CODE (d1) == TYPE_DECL && MAYBE_CLASS_TYPE_P (TREE_TYPE (d1))) { tree type = TREE_TYPE (d1); @@ -5489,7 +5489,7 @@ lookup_template_class (tree d1, } } else if (TREE_CODE (d1) == ENUMERAL_TYPE - || (TYPE_P (d1) && IS_AGGR_TYPE (d1))) + || (TYPE_P (d1) && MAYBE_CLASS_TYPE_P (d1))) { template = TYPE_TI_TEMPLATE (d1); d1 = DECL_NAME (template); @@ -5762,7 +5762,7 @@ lookup_template_class (tree d1, } else { - t = make_aggr_type (TREE_CODE (template_type)); + t = make_class_type (TREE_CODE (template_type)); CLASSTYPE_DECLARED_CLASS (t) = CLASSTYPE_DECLARED_CLASS (template_type); SET_CLASSTYPE_IMPLICIT_INSTANTIATION (t); @@ -8673,7 +8673,7 @@ tsubst_function_type (tree t, else { tree r = TREE_TYPE (TREE_VALUE (arg_types)); - if (! IS_AGGR_TYPE (r)) + if (! MAYBE_CLASS_TYPE_P (r)) { /* [temp.deduct] @@ -9202,7 +9202,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) case OFFSET_TYPE: { r = tsubst (TYPE_OFFSET_BASETYPE (t), args, complain, in_decl); - if (r == error_mark_node || !IS_AGGR_TYPE (r)) + if (r == error_mark_node || !MAYBE_CLASS_TYPE_P (r)) { /* [temp.deduct] @@ -9345,7 +9345,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) if (ctx == error_mark_node || f == error_mark_node) return error_mark_node; - if (!IS_AGGR_TYPE (ctx)) + if (!MAYBE_CLASS_TYPE_P (ctx)) { if (complain & tf_error) error ("%qT is not a class, struct, or union type", ctx); @@ -11211,7 +11211,7 @@ tsubst_copy_and_build (tree t, /* We do not want to process the index of aggregate initializers as they are identifier nodes which will be looked up by digest_init. */ - process_index_p = !(type && IS_AGGR_TYPE (type)); + process_index_p = !(type && MAYBE_CLASS_TYPE_P (type)); n = VEC_copy (constructor_elt, gc, CONSTRUCTOR_ELTS (t)); newlen = VEC_length (constructor_elt, n); @@ -12325,7 +12325,7 @@ get_template_base (tree tparms, tree targs, tree parm, tree arg) tree rval = NULL_TREE; tree binfo; - gcc_assert (IS_AGGR_TYPE_CODE (TREE_CODE (arg))); + gcc_assert (RECORD_OR_UNION_CODE_P (TREE_CODE (arg))); binfo = TYPE_BINFO (complete_type (arg)); if (!binfo) @@ -14317,7 +14317,7 @@ bt_instantiate_type_proc (binding_entry entry, void *data) { tree storage = *(tree *) data; - if (IS_AGGR_TYPE (entry->type) + if (MAYBE_CLASS_TYPE_P (entry->type) && !uses_template_parms (CLASSTYPE_TI_ARGS (entry->type))) do_type_instantiation (TYPE_MAIN_DECL (entry->type), storage, 0); } |