diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 1 | ||||
| -rw-r--r-- | gdb/eval.c | 11 | ||||
| -rw-r--r-- | gdb/expprint.c | 2 | ||||
| -rw-r--r-- | gdb/parse.c | 1 | ||||
| -rw-r--r-- | gdb/std-operator.def | 5 |
6 files changed, 10 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 662642a..5efe533 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2012-08-13 Yao Qi <yao@codesourcery.com> + * std-operator.def: Remove TERNOP_SLICE_COUNT. + * breakpoint.c (watchpoint_exp_is_const): Remove handling to + TERNOP_SLICE_COUNT. + * eval.c (evaluate_subexp_standard): Likewise. + * expprint.c (print_subexp_standard): Likewise. + (dump_subexp_body_standard): Likewise. + * parse.c (operator_length_standard): Likewise. + +2012-08-13 Yao Qi <yao@codesourcery.com> + * std-operator.def: Remove OP_BITSTRING. * breakpoint.c (watchpoint_exp_is_const): Update. * eval.c (evaluate_subexp_standard): Remove handling to diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1ba923f..7ea5ba6 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10160,7 +10160,6 @@ watchpoint_exp_is_const (const struct expression *exp) case BINOP_RANGE: case TERNOP_COND: case TERNOP_SLICE: - case TERNOP_SLICE_COUNT: case OP_LONG: case OP_DOUBLE: @@ -1140,17 +1140,6 @@ evaluate_subexp_standard (struct type *expect_type, return value_slice (array, lowbound, upper - lowbound + 1); } - case TERNOP_SLICE_COUNT: - { - struct value *array = evaluate_subexp (NULL_TYPE, exp, pos, noside); - int lowbound - = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); - int length - = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); - - return value_slice (array, lowbound, length); - } - case TERNOP_COND: /* Skip third and second args to evaluate the first one. */ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); diff --git a/gdb/expprint.c b/gdb/expprint.c index c74c564..baaa08a 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -360,7 +360,6 @@ print_subexp_standard (struct expression *exp, int *pos, return; case TERNOP_SLICE: - case TERNOP_SLICE_COUNT: print_subexp (exp, pos, stream, PREC_SUFFIX); fputs_filtered ("(", stream); print_subexp (exp, pos, stream, PREC_ABOVE_COMMA); @@ -787,7 +786,6 @@ dump_subexp_body_standard (struct expression *exp, { case TERNOP_COND: case TERNOP_SLICE: - case TERNOP_SLICE_COUNT: elt = dump_subexp (exp, stream, elt); /* FALL THROUGH */ case BINOP_ADD: diff --git a/gdb/parse.c b/gdb/parse.c index d418aef..3ec1e25 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -976,7 +976,6 @@ operator_length_standard (const struct expression *expr, int endpos, case TERNOP_COND: case TERNOP_SLICE: - case TERNOP_SLICE_COUNT: args = 3; break; diff --git a/gdb/std-operator.def b/gdb/std-operator.def index 173dc1d..dcba39f 100644 --- a/gdb/std-operator.def +++ b/gdb/std-operator.def @@ -105,11 +105,6 @@ OP (TERNOP_COND) /* ?: */ OP1(OP2:OP3). Return elements OP2 through OP3 of OP1. */ OP (TERNOP_SLICE) -/* A sub-string/sub-array. (The deleted) Chill syntax: OP1(OP2 UP - OP3). Return OP3 elements of OP1, starting with element - OP2. */ -OP (TERNOP_SLICE_COUNT) - /* Multidimensional subscript operator, such as Modula-2 x[a,b,...]. The dimensionality is encoded in the operator, like the number of function arguments in OP_FUNCALL, I.E. <OP><dimension><OP>. |