From bd69fc683f383772bb8fab43c5d4af8d0cd4a8b4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 12 Nov 2012 17:37:38 +0000 Subject: * c-typeprint.c (find_typedef_for_canonicalize, print_name_maybe_canonical): New functions. (c_print_type): Look up type name. (cp_type_print_derivation_info): Add flags argument. Use print_name_maybe_canonical. (cp_type_print_method_args): Add wrapping. (c_type_print_varspec_prefix): Use print_name_maybe_canonical. (c_type_print_template_args): New function. (c_type_print_base): Change wrapping. Use print_name_maybe_canonical. : Possibly create a typedef hash, and do type name lookups. * gdbtypes.c (types_equal): No longer static. * gdbtypes.h (types_equal): Declare. * typeprint.c (type_print_raw_options, default_ptype_flags): Update. (struct typedef_hash_table): New. (hash_typedef_field, eq_typedef_field, recursively_update_typedef_hash, add_template_parameters, create_typedef_hash, free_typedef_hash, do_free_typedef_hash, make_cleanup_free_typedef_hash, copy_typedef_hash_element, copy_typedef_hash, find_typedef_in_hash): New functions. * typeprint.h (struct type_print_options) : New field. (recursively_update_typedef_hash, add_template_parameters, create_typedef_hash, free_typedef_hash, make_cleanup_free_typedef_hash, copy_typedef_hash, find_typedef_in_hash): Declare. testsuite * gdb.base/call-sc.exp: Use "ptype/r". * gdb.base/volatile.exp: Don't expect "int". * gdb.cp/ptype-flags.cc: New file. * gdb.cp/ptype-flags.exp: New file. * gdb.cp/templates.exp: Use ptype/r. (test_ptype_of_templates, test_template_typedef): Likewise. * lib/cp-support.exp (cp_test_ptype_class): Add in_ptype_arg argument. Handle template names and template parameters. * gdb.mi/mi-var-cmd.exp: Accept "long". * gdb.mi/mi-var-child.exp: Accept "long". * gdb.mi/mi-var-display.exp: Accept "long". * gdb.mi/mi2-var-child.exp: Accept "long". --- gdb/testsuite/gdb.mi/mi-var-cmd.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/testsuite/gdb.mi/mi-var-cmd.exp') diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp index 4c560a7ebc9..345e94b8361 100644 --- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp +++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp @@ -83,9 +83,9 @@ mi_create_varobj_checked lcharacter lcharacter\[0\] char "create local variable mi_create_varobj_checked lpcharacter lpcharacter {char \*} "create local variable lpcharacter" -mi_create_varobj_checked llong llong "long int" "create local variable llong" +mi_create_varobj_checked llong llong "long" "create local variable llong" -mi_create_varobj_checked lplong lplong {long int \*} "create local variable lplong" +mi_create_varobj_checked lplong lplong {long \*} "create local variable lplong" mi_create_varobj_checked lfloat lfloat float "create local variable lfloat" @@ -408,7 +408,7 @@ mi_continue_to subroutine1 # Desc: create variable for locals i,l in subroutine1 mi_create_varobj_checked i i int "create i" -mi_create_varobj_checked l l {long int \*} "create l" +mi_create_varobj_checked l l {long \*} "create l" # Test: c_variable-2.11 # Desc: create do_locals_tests local in subroutine1 -- cgit v1.2.1