From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id B95993896839 for ; Fri, 1 Jan 2021 21:48:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B95993896839 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 gateway31.websitewelcome.com (Postfix) with ESMTP id 5C14C31861 for ; Fri, 1 Jan 2021 15:48:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHekJAejuDoAvSHekcca3; Fri, 01 Jan 2021 15:48:30 -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=/ISdNQqoayLAWTsbITpYrM+oQ5VkGrVN215Ql2GZ5+g=; b=BBgYEfHdUXmsii+IRQExHgir9a ANRNeNvzF0AbNHPPSkV7EAvjC2EmZsvkL+T3+XPqfJTC1Mg7EXnde8k9Ma4y/sgu1P5aZZd5HlDtE v8solaKJ+xc72GnjtmhuJ/0+r; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60412 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 1kvSHe-0029i1-4e for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:30 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 133/203] Introduce rust_range_operation Date: Fri, 1 Jan 2021 14:46:13 -0700 Message-Id: <20210101214723.1784144-134-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: 1kvSHe-0029i1-4e X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60412 X-Source-Auth: tom+tromey.com X-Email-Count: 134 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_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: Fri, 01 Jan 2021 21:48:32 -0000 This adds class rust_range_operation, which implements OP_RANGE. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (rust_range): No longer static. * rust-exp.h (class rust_range_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/rust-exp.h | 30 ++++++++++++++++++++++++++++++ gdb/rust-lang.c | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h index 7571009ea39..263d41a79d4 100644 --- a/gdb/rust-exp.h +++ b/gdb/rust-exp.h @@ -42,6 +42,10 @@ extern struct value *rust_subscript (struct type *expect_type, struct expression *exp, enum noside noside, bool for_addr, struct value *lhs, struct value *rhs); +extern struct value *rust_range (struct type *expect_type, + struct expression *exp, + enum noside noside, enum range_flag kind, + struct value *low, struct value *high); namespace expr { @@ -124,6 +128,32 @@ class rust_unop_addr_operation { return UNOP_ADDR; } }; +/* The Rust range operators. */ +class rust_range_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 + { + auto kind = std::get<0> (m_storage); + value *low = nullptr; + if (std::get<1> (m_storage) != nullptr) + low = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + value *high = nullptr; + if (std::get<2> (m_storage) != nullptr) + high = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + return rust_range (expect_type, exp, noside, kind, low, high); + } + + enum exp_opcode opcode () const override + { return OP_RANGE; } +}; + } /* namespace expr */ #endif /* RUST_EXP_H */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 0035a58adc4..68fbaf1642a 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1041,7 +1041,7 @@ rust_evaluate_funcall (struct expression *exp, int *pos, enum noside noside) /* A helper for rust_evaluate_subexp that handles OP_RANGE. */ -static struct value * +struct value * rust_range (struct type *expect_type, struct expression *exp, enum noside noside, enum range_flag kind, struct value *low, struct value *high) -- 2.26.2