From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UHKdMcmY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:57 -0500 Received: by simark.ca (Postfix, from userid 112) id B19C91F0AA; Fri, 1 Jan 2021 16:48:55 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 922CA1F0BA for ; Fri, 1 Jan 2021 16:48:54 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4AAA63896827; Fri, 1 Jan 2021 21:48:29 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id 79A683844047 for ; Fri, 1 Jan 2021 21:48:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 79A683844047 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 1C5D73F58 for ; Fri, 1 Jan 2021 15:48:25 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHZkXAxXHPnUvSHZkgzga; Fri, 01 Jan 2021 15:48:25 -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=wvFmMn52kfvlyKjgpq/QTyEGlBWLFnTqvDA87J3p3s8=; b=H0Z7h4F/Pzed2Ikh9C4Sw+e7+z 18LFYzdM9i5h1K5+GjiLgNh7yS19rlLc6LLdXiR3C8fY1rDqubNiOP0X9EbxNLH2LVfzBZj4QJeym 2Tn3I7Rp6y9sc+nLKgqDf18xf; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60410 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 1kvSHY-0029f3-U4 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:24 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 124/203] Introduce multi_subscript_operation Date: Fri, 1 Jan 2021 14:46:04 -0700 Message-Id: <20210101214723.1784144-125-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-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.81.39 X-Source-L: No X-Exim-ID: 1kvSHY-0029f3-U4 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60410 X-Source-Auth: tom+tromey.com X-Email-Count: 125 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This adds class multi_subscript_operation, which implements MULTI_SUBSCRIPT. gdb/ChangeLog 2021-01-01 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 05fc1972a0e..b1087d1329d 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2447,8 +2447,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 0c489c77450..21c7b9e25da 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -1963,6 +1963,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