gdb/

	* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 662642aa09a6ab34ca43de2009f93c7cabb5e9d0..5efe533bb76fde55e8e03fafdef53fc1f6d356a5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+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.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 1ba923febe5696cb57871494b2a4ed38b46a10e9..7ea5ba6feff533d2bf428536c6e9b43c26a132f0 100644 (file)
--- 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:

diff --git a/gdb/eval.c b/gdb/eval.c
index 9bf5401d6783a74a237e68a295d990748c425392..c0d935454c935398ae3c426730012ea903f70a29 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -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 c74c5641325d6d6d8def73a572032b13620bcf3e..baaa08ad14aaaae7522d2298c39548cf7609f075 100644 (file)
--- 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 d418aef16ff5a8aff4d91129d0c42c2239ffccb3..3ec1e25ee854abb1461a97d417611037f07814fd 100644 (file)
--- 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 173dc1dcb90545b59e65abea625797b27eb55087..dcba39f15f96e42e2c6f068c942a20c528065975 100644 (file)
--- 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>.