From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway21.websitewelcome.com (gateway21.websitewelcome.com [192.185.45.163]) by sourceware.org (Postfix) with ESMTPS id 6A24F3953C01 for ; Sat, 20 Feb 2021 20:16:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6A24F3953C01 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 16323400C63D4 for ; Sat, 20 Feb 2021 14:16:40 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgClIhbsuDoADYgClBftE; Sat, 20 Feb 2021 14:16:40 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=M0j499ma4I4OTcRJrl1FgpgAbym3w+z9nYIuJQttmbU=; b=S/vqup5Z2OgnpL9wMyt4orlxpm h8ori7TTQxcYOCU26FuMY8r1O1WTKlGuj/dTpZ4XF/bsQz4VVHjoUo5XoVVwn+YgUYoxyqPFASSEp tA0TA3oRVF6Xmt0DZ/BtqszYm; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52696 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lDYgB-000GeR-Rx for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:39 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 125/206] Introduce multi_subscript_operation Date: Sat, 20 Feb 2021 13:14:48 -0700 Message-Id: <20210220201609.838264-126-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.70.152 X-Source-L: No X-Exim-ID: 1lDYgB-000GeR-Rx X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52696 X-Source-Auth: tom+tromey.com X-Email-Count: 126 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L3, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2021 20:16:50 -0000 This adds class multi_subscript_operation, which implements MULTI_SUBSCRIPT. gdb/ChangeLog 2021-02-20 Tom Tromey * expop.h (class multi_subscript_operation): New. * eval.c (multi_subscript_operation::evaluate): New method. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 13 +++++++++++++ gdb/expop.h | 16 ++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/gdb/eval.c b/gdb/eval.c index 8e003e4f33b..83b1550059a 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2462,8 +2462,21 @@ objc_msgcall_operation::evaluate (struct type *expect_type, args.size () + 3)); } +value * +multi_subscript_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg1 = std::get<0> (m_storage)->evaluate_with_coercion (exp, noside); + std::vector &values = std::get<1> (m_storage); + value **argvec = XALLOCAVEC (struct value *, values.size ()); + for (int ix = 0; ix < values.size (); ++ix) + argvec[ix] = values[ix]->evaluate_with_coercion (exp, noside); + return eval_multi_subscript (expect_type, exp, noside, arg1, + gdb::make_array_view (argvec, values.size ())); } +} struct value * evaluate_subexp_standard (struct type *expect_type, diff --git a/gdb/expop.h b/gdb/expop.h index ef5b9bb197d..6b1a8753b97 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -1966,6 +1966,22 @@ using dynamic_cast_operation = cxx_cast_operation; +/* Multi-dimensional subscripting. */ +class multi_subscript_operation + : public tuple_holding_operation> +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return MULTI_SUBSCRIPT; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2