X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fp-typeprint.c;h=a00f5b32d9f41da617a54aec63e6abc618141d38;hb=02277eae005e94859bd208e7814f1ac66c8b2433;hp=bf983d539a457f271a69eafc5163e1c9e250234e;hpb=43bbcdc2bc4ce5748662bceeb206481a6ef63951;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c index bf983d539a..a00f5b32d9 100644 --- a/gdb/p-typeprint.c +++ b/gdb/p-typeprint.c @@ -1,6 +1,5 @@ /* Support for printing Pascal types for GDB, the GNU debugger. - Copyright (C) 2000, 2001, 2002, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2006-2012 Free Software Foundation, Inc. This file is part of GDB. @@ -31,23 +30,26 @@ #include "language.h" #include "p-lang.h" #include "typeprint.h" - +#include "gdb-demangle.h" #include "gdb_string.h" #include #include -static void pascal_type_print_varspec_suffix (struct type *, struct ui_file *, int, int, int); +static void pascal_type_print_varspec_suffix (struct type *, struct ui_file *, + int, int, int); -static void pascal_type_print_derivation_info (struct ui_file *, struct type *); +static void pascal_type_print_derivation_info (struct ui_file *, + struct type *); -void pascal_type_print_varspec_prefix (struct type *, struct ui_file *, int, int); +void pascal_type_print_varspec_prefix (struct type *, struct ui_file *, + int, int); /* LEVEL is the depth to indent lines by. */ void -pascal_print_type (struct type *type, char *varstring, struct ui_file *stream, - int show, int level) +pascal_print_type (struct type *type, const char *varstring, + struct ui_file *stream, int show, int level) { enum type_code code; int demangled_args; @@ -80,7 +82,7 @@ pascal_print_type (struct type *type, char *varstring, struct ui_file *stream, pascal_type_print_base (type, stream, show, level); /* For demangled function names, we have the arglist as part of the name, - so don't print an additional pair of ()'s */ + so don't print an additional pair of ()'s. */ demangled_args = varstring ? strchr (varstring, '(') != NULL : 0; pascal_type_print_varspec_suffix (type, stream, show, 0, demangled_args); @@ -104,7 +106,7 @@ pascal_print_typedef (struct type *type, struct symbol *new_symbol, /* If TYPE is a derived type, then print out derivation information. Print only the actual base classes of this type, not the base classes - of the base classes. I.E. for the derivation hierarchy: + of the base classes. I.e. for the derivation hierarchy: class A { int a; }; class B : public A {int b; }; @@ -124,12 +126,12 @@ pascal_print_typedef (struct type *type, struct symbol *new_symbol, } In general, gdb should try to print the types as closely as possible to - the form that they appear in the source code. */ + the form that they appear in the source code. */ static void pascal_type_print_derivation_info (struct ui_file *stream, struct type *type) { - char *name; + const char *name; int i; for (i = 0; i < TYPE_N_BASECLASSES (type); i++) @@ -150,7 +152,7 @@ pascal_type_print_derivation_info (struct ui_file *stream, struct type *type) /* Print the Pascal method arguments ARGS to the file STREAM. */ void -pascal_type_print_method_args (char *physname, char *methodname, +pascal_type_print_method_args (const char *physname, const char *methodname, struct ui_file *stream) { int is_constructor = (strncmp (physname, "__ct__", 6) == 0); @@ -165,24 +167,24 @@ pascal_type_print_method_args (char *physname, char *methodname, if (physname && (*physname != 0)) { - int i = 0; - int len = 0; - char storec; - char *argname; fputs_filtered (" (", stream); - /* we must demangle this */ + /* We must demangle this. */ while (isdigit (physname[0])) { + int len = 0; + int i, j; + char *argname; + while (isdigit (physname[len])) { len++; } i = strtol (physname, &argname, 0); physname += len; - storec = physname[i]; - physname[i] = 0; - fputs_filtered (physname, stream); - physname[i] = storec; + + for (j = 0; j < i; ++j) + fputc_filtered (physname[j], stream); + physname += i; if (physname[0] != 0) { @@ -205,7 +207,6 @@ void pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream, int show, int passed_a_ptr) { - char *name; if (type == 0) return; @@ -219,7 +220,8 @@ pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream, case TYPE_CODE_PTR: fprintf_filtered (stream, "^"); pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 1); - break; /* pointer should be handled normally in pascal */ + break; /* Pointer should be handled normally + in pascal. */ case TYPE_CODE_METHOD: if (passed_a_ptr) @@ -236,7 +238,8 @@ pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream, if (passed_a_ptr) { fprintf_filtered (stream, " "); - pascal_type_print_base (TYPE_DOMAIN_TYPE (type), stream, 0, passed_a_ptr); + pascal_type_print_base (TYPE_DOMAIN_TYPE (type), + stream, 0, passed_a_ptr); fprintf_filtered (stream, "::"); } break; @@ -289,7 +292,6 @@ pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream, case TYPE_CODE_BITSTRING: case TYPE_CODE_COMPLEX: case TYPE_CODE_TYPEDEF: - case TYPE_CODE_TEMPLATE: /* These types need no prefix. They are listed here so that gcc -Wall will reveal any types that haven't been handled. */ break; @@ -303,6 +305,7 @@ static void pascal_print_func_args (struct type *type, struct ui_file *stream) { int i, len = TYPE_NFIELDS (type); + if (len) { fprintf_filtered (stream, "("); @@ -314,12 +317,13 @@ pascal_print_func_args (struct type *type, struct ui_file *stream) fputs_filtered (", ", stream); wrap_here (" "); } - /* can we find if it is a var parameter ?? + /* Can we find if it is a var parameter ?? if ( TYPE_FIELD(type, i) == ) { fprintf_filtered (stream, "var "); } */ - pascal_print_type (TYPE_FIELD_TYPE (type, i), "" /* TYPE_FIELD_NAME seems invalid ! */ + pascal_print_type (TYPE_FIELD_TYPE (type, i), "" /* TYPE_FIELD_NAME + seems invalid! */ ,stream, -1, 0); } if (len) @@ -361,7 +365,8 @@ pascal_type_print_varspec_suffix (struct type *type, struct ui_file *stream, if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) { fprintf_filtered (stream, " : "); - pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 0); + pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), + stream, 0, 0); pascal_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0); pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, passed_a_ptr, 0); @@ -370,7 +375,8 @@ pascal_type_print_varspec_suffix (struct type *type, struct ui_file *stream, case TYPE_CODE_PTR: case TYPE_CODE_REF: - pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0); + pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), + stream, 0, 1, 0); break; case TYPE_CODE_FUNC: @@ -381,7 +387,8 @@ pascal_type_print_varspec_suffix (struct type *type, struct ui_file *stream, if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) { fprintf_filtered (stream, " : "); - pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 0); + pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), + stream, 0, 0); pascal_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0); pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, passed_a_ptr, 0); @@ -404,7 +411,6 @@ pascal_type_print_varspec_suffix (struct type *type, struct ui_file *stream, case TYPE_CODE_BITSTRING: case TYPE_CODE_COMPLEX: case TYPE_CODE_TYPEDEF: - case TYPE_CODE_TEMPLATE: /* These types do not need a suffix. They are listed so that gcc -Wall will report types that may not have been considered. */ break; @@ -442,8 +448,8 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, s_none, s_public, s_private, s_protected } section_type; - QUIT; + QUIT; wrap_here (" "); if (type == NULL) { @@ -452,7 +458,8 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, } /* void pointer */ - if ((TYPE_CODE (type) == TYPE_CODE_PTR) && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_VOID)) + if ((TYPE_CODE (type) == TYPE_CODE_PTR) + && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_VOID)) { fputs_filtered (TYPE_NAME (type) ? TYPE_NAME (type) : "pointer", stream); @@ -481,9 +488,12 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, break; case TYPE_CODE_ARRAY: - /* pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 0); - pascal_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); - pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0); */ + /* pascal_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), + stream, 0, 0); + pascal_type_print_base (TYPE_TARGET_TYPE (type), + stream, show, level); + pascal_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), + stream, 0, 0, 0); */ pascal_print_type (TYPE_TARGET_TYPE (type), NULL, stream, 0, 0); break; @@ -491,7 +501,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, case TYPE_CODE_METHOD: /* pascal_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); - only after args !! */ + only after args !! */ break; case TYPE_CODE_STRUCT: if (TYPE_TAG_NAME (type) != NULL) @@ -540,7 +550,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, /* Start off with no specific section type, so we can print one for the first field we find, and use that section type - thereafter until we find another type. */ + thereafter until we find another type. */ section_type = s_none; @@ -557,7 +567,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, continue; /* If this is a pascal object or class we can print the - various section labels. */ + various section labels. */ if (HAVE_CPLUS_STRUCT (type)) { @@ -608,25 +618,25 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, fprintf_filtered (stream, ";\n"); } - /* If there are both fields and methods, put a space between. */ + /* If there are both fields and methods, put a space between. */ len = TYPE_NFN_FIELDS (type); if (len && section_type != s_none) fprintf_filtered (stream, "\n"); - /* Pbject pascal: print out the methods */ + /* Object pascal: print out the methods. */ for (i = 0; i < len; i++) { struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i); int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i); - char *method_name = TYPE_FN_FIELDLIST_NAME (type, i); - char *name = type_name_no_tag (type); + const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i); + /* this is GNU C++ specific how can we know constructor/destructor? - It might work for GNU pascal */ + It might work for GNU pascal. */ for (j = 0; j < len2; j++) { - char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); + const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); int is_constructor = (strncmp (physname, "__ct__", 6) == 0); int is_destructor = (strncmp (physname, "__dt__", 6) == 0); @@ -687,7 +697,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, { fprintf_filtered (stream, "procedure "); } - /* this does not work, no idea why !! */ + /* This does not work, no idea why !! */ pascal_type_print_method_args (physname, method_name, @@ -719,7 +729,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, fputs_filtered (" ", stream); } /* enum is just defined by - type enume_name = (enum_member1,enum_member2,...) */ + type enume_name = (enum_member1,enum_member2,...) */ fprintf_filtered (stream, " = "); wrap_here (" "); if (show < 0) @@ -740,10 +750,12 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); - if (lastval != TYPE_FIELD_BITPOS (type, i)) + if (lastval != TYPE_FIELD_ENUMVAL (type, i)) { - fprintf_filtered (stream, " := %d", TYPE_FIELD_BITPOS (type, i)); - lastval = TYPE_FIELD_BITPOS (type, i); + fprintf_filtered (stream, + " := %s", + plongest (TYPE_FIELD_ENUMVAL (type, i))); + lastval = TYPE_FIELD_ENUMVAL (type, i); } lastval++; } @@ -760,13 +772,14 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, break; case TYPE_CODE_ERROR: - fprintf_filtered (stream, ""); + fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type)); break; - /* this probably does not work for enums */ + /* this probably does not work for enums. */ case TYPE_CODE_RANGE: { struct type *target = TYPE_TARGET_TYPE (type); + print_type_scalar (target, TYPE_LOW_BOUND (type), stream); fputs_filtered ("..", stream); print_type_scalar (target, TYPE_HIGH_BOUND (type), stream); @@ -791,7 +804,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, /* Handle types not explicitly handled by the other cases, such as fundamental types. For these, just print whatever the type name is, as recorded in the type itself. If there - is no type name, then complain. */ + is no type name, then complain. */ if (TYPE_NAME (type) != NULL) { fputs_filtered (TYPE_NAME (type), stream);