/* Support for printing Pascal types for GDB, the GNU debugger.
- Copyright (C) 2000, 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2006, 2007, 2008, 2009
+ Free Software Foundation, Inc.
This file is part of GDB.
if (show > 0)
CHECK_TYPEDEF (type);
- if ((code == TYPE_CODE_FUNC ||
- code == TYPE_CODE_METHOD))
+ if ((code == TYPE_CODE_FUNC
+ || code == TYPE_CODE_METHOD))
{
pascal_type_print_varspec_prefix (type, stream, show, 0);
}
/* first the name */
fputs_filtered (varstring, stream);
- if ((varstring != NULL && *varstring != '\0') &&
- !(code == TYPE_CODE_FUNC ||
- code == TYPE_CODE_METHOD))
+ if ((varstring != NULL && *varstring != '\0')
+ && !(code == TYPE_CODE_FUNC
+ || code == TYPE_CODE_METHOD))
{
fputs_filtered (" : ", stream);
}
- if (!(code == TYPE_CODE_FUNC ||
- code == TYPE_CODE_METHOD))
+ if (!(code == TYPE_CODE_FUNC
+ || code == TYPE_CODE_METHOD))
{
pascal_type_print_varspec_prefix (type, stream, show, 0);
}
}
+/* Print a typedef using Pascal syntax. TYPE is the underlying type.
+ NEW_SYMBOL is the symbol naming the type. STREAM is the stream on
+ which to print. */
+
+void
+pascal_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ CHECK_TYPEDEF (type);
+ fprintf_filtered (stream, "type ");
+ fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+ type_print (type, "", stream, 0);
+ fprintf_filtered (stream, ";\n");
+}
+
/* 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:
pascal_type_print_method_args (char *physname, char *methodname,
struct ui_file *stream)
{
- int is_constructor = DEPRECATED_STREQN (physname, "__ct__", 6);
- int is_destructor = DEPRECATED_STREQN (physname, "__dt__", 6);
+ int is_constructor = (strncmp (physname, "__ct__", 6) == 0);
+ int is_destructor = (strncmp (physname, "__dt__", 6) == 0);
if (is_constructor || is_destructor)
{
fprintf_filtered (stream, "(");
fprintf_filtered (stream, "array ");
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
- && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
+ && !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
fprintf_filtered (stream, "[%d..%d] ",
TYPE_ARRAY_LOWER_BOUND_VALUE (type),
TYPE_ARRAY_UPPER_BOUND_VALUE (type)
{
QUIT;
/* Don't print out virtual function table. */
- if (DEPRECATED_STREQN (TYPE_FIELD_NAME (type, i), "_vptr", 5)
+ if ((strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0)
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
continue;
}
print_spaces_filtered (level + 4, stream);
- if (TYPE_FIELD_STATIC (type, i))
- {
- fprintf_filtered (stream, "static ");
- }
+ if (field_is_static (&TYPE_FIELD (type, i)))
+ fprintf_filtered (stream, "static ");
pascal_print_type (TYPE_FIELD_TYPE (type, i),
TYPE_FIELD_NAME (type, i),
stream, show - 1, level + 4);
- if (!TYPE_FIELD_STATIC (type, i)
+ if (!field_is_static (&TYPE_FIELD (type, i))
&& TYPE_FIELD_PACKED (type, i))
{
/* It is a bitfield. This code does not attempt
{
char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
- int is_constructor = DEPRECATED_STREQN (physname, "__ct__", 6);
- int is_destructor = DEPRECATED_STREQN (physname, "__dt__", 6);
+ int is_constructor = (strncmp (physname, "__ct__", 6) == 0);
+ int is_destructor = (strncmp (physname, "__dt__", 6) == 0);
QUIT;
if (TYPE_FN_FIELD_PROTECTED (f, j))
{
fprintf_filtered (stream, "destructor ");
}
- else if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 &&
- TYPE_CODE (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID)
+ else if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0
+ && TYPE_CODE (TYPE_TARGET_TYPE (
+ TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID)
{
fprintf_filtered (stream, "function ");
}
method_name,
stream);
- if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 &&
- TYPE_CODE (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID)
+ if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0
+ && TYPE_CODE (TYPE_TARGET_TYPE (
+ TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID)
{
fputs_filtered (" : ", stream);
type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
case TYPE_CODE_RANGE:
{
struct type *target = TYPE_TARGET_TYPE (type);
- if (target == NULL)
- target = builtin_type_long;
print_type_scalar (target, TYPE_LOW_BOUND (type), stream);
fputs_filtered ("..", stream);
print_type_scalar (target, TYPE_HIGH_BOUND (type), stream);