diff options
| author | Doug Evans <dje@google.com> | 2012-08-08 21:17:03 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2012-08-08 21:17:03 +0000 |
| commit | 765eef0ea9c7b0e6648086b3d5a6c354ff312977 (patch) | |
| tree | 8eaebc08551e46f0d4932aaf1ad702dc3ec6dff2 /gdb/expprint.c | |
| parent | 6351e1f17146b297a928f87db5f3f5af851dd56a (diff) | |
| download | gdb-765eef0ea9c7b0e6648086b3d5a6c354ff312977.tar.gz | |
* eval.c (evaluate_subexp_standard): Fix thinko in handling
UNOP_MEMVAL_TYPE.
* expprint.c (print_subexp_standard, case OP_TYPE): New.
(print_subexp_standard, case UNOP_CAST_TYPE): Don't increment pos.
(print_subexp_standard, case UNOP_DYNAMIC_CAST): Ditto.
(print_subexp_standard, case UNOP_REINTERPRET_CAST): Ditto.
(print_subexp_standard, case UNOP_MEMVAL_TYPE): Ditto.
(dump_subexp_body_standard, case UNOP_DYNAMIC_CAST): Don't increment
elt.
(dump_subexp_body_standard, case UNOP_REINTERPRET_CAST): Ditto.
(dump_subexp_body_standard, case UNOP_CAST_TYPE): Ditto.
(dump_subexp_body_standard, case UNOP_MEMVAL_TYPE): Ditto.
(dump_prefix_expression): Handle OP_TYPE.
testsuite/
* gdb.base/debug-expr.c: New file.
* gdb.base/debug-expr.exp: New file.
* gdb.base/exprs.exp: Test {type} casts.
* gdb.cp/debug-expr.exp: New file.
Diffstat (limited to 'gdb/expprint.c')
| -rw-r--r-- | gdb/expprint.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gdb/expprint.c b/gdb/expprint.c index 945389c437d..779368b4eb9 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -83,6 +83,11 @@ print_subexp_standard (struct expression *exp, int *pos, { /* Common ops */ + case OP_TYPE: + (*pos) += 2; + type_print (exp->elts[pc + 1].type, "", stream, 0); + return; + case OP_SCOPE: myprec = PREC_PREFIX; assoc = 0; @@ -430,7 +435,6 @@ print_subexp_standard (struct expression *exp, int *pos, return; case UNOP_CAST_TYPE: - (*pos) += 1; if ((int) prec > (int) PREC_PREFIX) fputs_filtered ("(", stream); fputs_filtered ("(", stream); @@ -446,7 +450,6 @@ print_subexp_standard (struct expression *exp, int *pos, fputs_filtered (opcode == UNOP_DYNAMIC_CAST ? "dynamic_cast" : "reinterpret_cast", stream); fputs_filtered ("<", stream); - (*pos) += 1; print_subexp (exp, pos, stream, PREC_PREFIX); fputs_filtered ("> (", stream); print_subexp (exp, pos, stream, PREC_PREFIX); @@ -484,7 +487,6 @@ print_subexp_standard (struct expression *exp, int *pos, return; case UNOP_MEMVAL_TYPE: - (*pos) += 1; if ((int) prec > (int) PREC_PREFIX) fputs_filtered ("(", stream); fputs_filtered ("{", stream); @@ -938,7 +940,6 @@ dump_subexp_body_standard (struct expression *exp, case UNOP_REINTERPRET_CAST: case UNOP_CAST_TYPE: case UNOP_MEMVAL_TYPE: - ++elt; fprintf_filtered (stream, " ("); elt = dump_subexp (exp, stream, elt); fprintf_filtered (stream, ")"); @@ -1056,10 +1057,7 @@ dump_prefix_expression (struct expression *exp, struct ui_file *stream) fprintf_filtered (stream, "Dump of expression @ "); gdb_print_host_address (exp, stream); fputs_filtered (", after conversion to prefix form:\nExpression: `", stream); - if (exp->elts[0].opcode != OP_TYPE) - print_expression (exp, stream); - else - fputs_filtered ("Type printing not yet supported....", stream); + print_expression (exp, stream); fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n", exp->language_defn->la_name, exp->nelts, (long) sizeof (union exp_element)); |