From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6667 invoked by alias); 10 Aug 2012 09:13:15 -0000 Received: (qmail 6652 invoked by uid 22791); 10 Aug 2012 09:13:13 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 10 Aug 2012 09:12:56 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1SzlH6-0007eu-EO from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 10 Aug 2012 02:12:56 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 10 Aug 2012 02:12:56 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Fri, 10 Aug 2012 02:12:55 -0700 From: Yao Qi To: Subject: [PATCH 2/3] Remove TERNOP_SLICE_COUNT. Date: Fri, 10 Aug 2012 09:13:00 -0000 Message-ID: <1344589936-2006-3-git-send-email-yao@codesourcery.com> In-Reply-To: <1344589936-2006-1-git-send-email-yao@codesourcery.com> References: <1344589936-2006-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-08/txt/msg00308.txt.bz2 gdb: 2012-08-10 Yao Qi * 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. --- gdb/breakpoint.c | 1 - gdb/eval.c | 11 ----------- gdb/expprint.c | 2 -- gdb/parse.c | 1 - gdb/std-operator.def | 5 ----- 5 files changed, 0 insertions(+), 20 deletions(-) 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: diff --git a/gdb/eval.c b/gdb/eval.c index 9bf5401..c0d9354 100644 --- 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 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. . -- 1.7.7.6