From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id gONoM82Y718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:01 -0500 Received: by simark.ca (Postfix, from userid 112) id 9AB421F0BA; Fri, 1 Jan 2021 16:49:00 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 C5CA71F0C2 for ; Fri, 1 Jan 2021 16:48:57 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C8456389683A; Fri, 1 Jan 2021 21:48:30 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id A7C4C3896821 for ; Fri, 1 Jan 2021 21:48:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A7C4C3896821 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 53BB12FC4 for ; Fri, 1 Jan 2021 15:48:28 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHckXAzHHPnUvSHckgziK; Fri, 01 Jan 2021 15:48:28 -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=QTY90RVHDN2lur966TVhMMy4dpSUALhTn0dR422Fse8=; b=ZlFmSSj8eB3bqeY5cLniWAC1Kz /JhryJXdQd2zyIlVLb8gCRVWJVh0kbNHQJ283Z91XOsbM3wQ2LiR9RSLbGEMNqUC2Sq8lBf2VhoU2 WsTRxClGBIG0NtB/8Lx7tAyhV; 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 1kvSHc-0029i1-3p for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:28 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 126/203] Introduce ada_string_operation Date: Fri, 1 Jan 2021 14:46:06 -0700 Message-Id: <20210101214723.1784144-127-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: 1kvSHc-0029i1-3p 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: 127 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 ada_string_operation, which implements string constants for Ada. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_string_operation::evaluate): New method. * ada-exp.h (class ada_string_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 13 +++++++++++++ gdb/ada-lang.c | 13 +++++++++++++ 3 files changed, 31 insertions(+) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 3f780dc9ff4..88ed0c53b46 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -42,6 +42,19 @@ class ada_wrapped_operation { return std::get<0> (m_storage)->opcode (); } }; +/* An Ada string constant. */ +class ada_string_operation + : public string_operation +{ +public: + + using string_operation::string_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7855cd32eb3..d74c11f9a36 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10570,6 +10570,19 @@ ada_wrapped_operation::evaluate (struct type *expect_type, return result; } +value * +ada_string_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *result = string_operation::evaluate (expect_type, exp, noside); + /* The result type will have code OP_STRING, bashed there from + OP_ARRAY. Bash it back. */ + if (value_type (result)->code () == TYPE_CODE_STRING) + value_type (result)->set_code (TYPE_CODE_ARRAY); + return result; +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure -- 2.26.2