a6bac58e84
2009-05-27 Tom Tromey <tromey@redhat.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Phil Muldoon <pmuldoon@redhat.com> Paul Pluzhnikov <ppluzhnikov@google.com> Vladimir Prus <vladimir@codesourcery.com> * python/python-value.c (value_object_to_value): New function. * python/python-internal.h: Include frameobject.h. (gdbpy_children_cst, gdbpy_to_string_cst, gdbpy_display_hint_cst): Declare. (value_object_to_value): Declare. * printcmd.c (struct format_data) <raw>: New field. (last_format): Default to 0. (decode_format): Initialize val.raw. Handle /r flag. (print_command_1): Initialize fmt.raw and opts.raw. (output_command): Likewise. (x_command): Fix initialization of fmt.format. Initialize fmt.raw. (display_command): Initialize fmt.raw. (do_one_display): Set opts.raw. * python/python.c (gdbpy_to_string_cst, gdbpy_children_cst, gdbpy_display_hint_cst): New globals. (_initialize_python): Initialize them. Set gdb.pretty_printers. * cp-valprint.c: Include python.h. (cp_print_value): Call apply_val_pretty_printer. * python/python.h (apply_val_pretty_printer): Declare. * stack.c (print_this_frame_argument_p): Remove. (print_frame_args): Compute summary flag. Don't use print_this_frame_argument_p. * valprint.c: Include python.h. (user_print_options): Initialize new fields. (scalar_type_p): New function. (val_print): Handle 'raw' and 'summary' modes. Call apply_val_pretty_printer. (value_print): Handle 'raw' mode. * valprint.h (struct value_print_options) <raw, summary>: New fields. * Makefile.in (SUBDIR_PYTHON_OBS): Add python-prettyprint.o (SUBDIR_PYTHON_SRCS): Add python-prettyprint.c. (python-prettyprint.o): New target. * python/python-prettyprint.c: New file. gdb/doc 2009-05-27 Tom Tromey <tromey@redhat.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Phil Muldoon <pmuldoon@redhat.com> * gdb.texinfo (Objfiles In Python): Reference pretty printing. (Pretty Printing): New node. (Selecting Pretty-Printers): Likewise. (Python API): Update. (Output Formats): Document /r format. gdb/testsuite 2009-05-27 Tom Tromey <tromey@redhat.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Phil Muldoon <pmuldoon@redhat.com> Paul Pluzhnikov <ppluzhnikov@google.com> * gdb.python/python-prettyprint.exp: New file. * gdb.python/python-prettyprint.c: New file. * gdb.python/python-prettyprint.py: New file. * gdb.base/display.exp: print/r is now valid.
191 lines
3 KiB
C
191 lines
3 KiB
C
/* This testcase is part of GDB, the GNU debugger.
|
|
|
|
Copyright 2008, 2009 Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
struct s
|
|
{
|
|
int a;
|
|
int *b;
|
|
};
|
|
|
|
struct ss
|
|
{
|
|
struct s a;
|
|
struct s b;
|
|
};
|
|
|
|
#ifdef __cplusplus
|
|
struct S : public s {
|
|
int zs;
|
|
};
|
|
|
|
struct SS {
|
|
int zss;
|
|
S s;
|
|
};
|
|
|
|
struct SSS
|
|
{
|
|
SSS (int x, const S& r);
|
|
int a;
|
|
const S &b;
|
|
};
|
|
SSS::SSS (int x, const S& r) : a(x), b(r) { }
|
|
|
|
class VirtualTest
|
|
{
|
|
private:
|
|
int value;
|
|
|
|
public:
|
|
VirtualTest ()
|
|
{
|
|
value = 1;
|
|
}
|
|
};
|
|
|
|
class Vbase1 : public virtual VirtualTest { };
|
|
class Vbase2 : public virtual VirtualTest { };
|
|
class Vbase3 : public virtual VirtualTest { };
|
|
|
|
class Derived : public Vbase1, public Vbase2, public Vbase3
|
|
{
|
|
private:
|
|
int value;
|
|
|
|
public:
|
|
Derived ()
|
|
{
|
|
value = 2;
|
|
}
|
|
};
|
|
|
|
#endif
|
|
|
|
typedef struct string_repr
|
|
{
|
|
struct whybother
|
|
{
|
|
const char *contents;
|
|
} whybother;
|
|
} string;
|
|
|
|
/* This lets us avoid malloc. */
|
|
int array[100];
|
|
|
|
struct container
|
|
{
|
|
string name;
|
|
int len;
|
|
int *elements;
|
|
};
|
|
|
|
typedef struct container zzz_type;
|
|
|
|
string
|
|
make_string (const char *s)
|
|
{
|
|
string result;
|
|
result.whybother.contents = s;
|
|
return result;
|
|
}
|
|
|
|
zzz_type
|
|
make_container (const char *s)
|
|
{
|
|
zzz_type result;
|
|
|
|
result.name = make_string (s);
|
|
result.len = 0;
|
|
result.elements = 0;
|
|
|
|
return result;
|
|
}
|
|
|
|
void
|
|
add_item (zzz_type *c, int val)
|
|
{
|
|
if (c->len == 0)
|
|
c->elements = array;
|
|
c->elements[c->len] = val;
|
|
++c->len;
|
|
}
|
|
|
|
void init_s(struct s *s, int a)
|
|
{
|
|
s->a = a;
|
|
s->b = &s->a;
|
|
}
|
|
|
|
void init_ss(struct ss *s, int a, int b)
|
|
{
|
|
init_s(&s->a, a);
|
|
init_s(&s->b, b);
|
|
}
|
|
|
|
void do_nothing(void)
|
|
{
|
|
int c;
|
|
|
|
c = 23; /* Another MI breakpoint */
|
|
}
|
|
|
|
int
|
|
main ()
|
|
{
|
|
struct ss ss;
|
|
struct ss ssa[2];
|
|
string x = make_string ("this is x");
|
|
zzz_type c = make_container ("container");
|
|
const struct string_repr cstring = { { "const string" } };
|
|
|
|
init_ss(&ss, 1, 2);
|
|
init_ss(ssa+0, 3, 4);
|
|
init_ss(ssa+1, 5, 6);
|
|
|
|
#ifdef __cplusplus
|
|
S cps;
|
|
|
|
cps.zs = 7;
|
|
init_s(&cps, 8);
|
|
|
|
SS cpss;
|
|
cpss.zss = 9;
|
|
init_s(&cpss.s, 10);
|
|
|
|
SS cpssa[2];
|
|
cpssa[0].zss = 11;
|
|
init_s(&cpssa[0].s, 12);
|
|
cpssa[1].zss = 13;
|
|
init_s(&cpssa[1].s, 14);
|
|
|
|
SSS sss(15, cps);
|
|
|
|
SSS& ref (sss);
|
|
|
|
Derived derived;
|
|
|
|
#endif
|
|
|
|
add_item (&c, 23); /* MI breakpoint here */
|
|
add_item (&c, 72);
|
|
|
|
#ifdef MI
|
|
do_nothing ();
|
|
#endif
|
|
|
|
return 0; /* break to inspect struct and union */
|
|
}
|