From patchwork Mon Jul 10 12:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 117892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4997927vqx; Mon, 10 Jul 2023 05:47:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlFt1kORM3tFEDzOwRXT0us1xAOr5Stm59HRhyp0H+rUZrcizeJHbvo/P4qpasi+ZcUSDNr9 X-Received: by 2002:a17:907:162c:b0:988:d841:7f90 with SMTP id hb44-20020a170907162c00b00988d8417f90mr19207199ejc.27.1688993227939; Mon, 10 Jul 2023 05:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688993227; cv=none; d=google.com; s=arc-20160816; b=i8wJHzbA0SHEKG7aW8frb7axjAC1Exgl3Z8qbOy+ZWe/fPXTNz4VDOKQuhZ0qbGq2T yRAfrsY6MPcqMDh86vDESFt2B6ONgP81DnMEiXlMNJxtWTo8JI0nRkq6dNMKiQDuTFMv WCcH8Q9M7Eo7LmXAHdHPAkR3LAvrKcOiaYVZYORijfQiummgfQQASDsQ8Ik21oKAWK7T waSr1J981obHn0/kkLJSfa0vK2B0SGtItxbFiZ/PmRkduzS2QCEWWvL9sIcpMkmVdjUF GCsSfwHKrOm1bU36HpTaEw9vqAn0bXSimZXLVk86ovomyqB+5nZtqxusIi9s/EBhGxGF Es0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=tVSx+f/pHHpGSfmt+HlbK8K1QV8fv30rR4U9XIlzcA8=; fh=XugzLzSAfUMFtRI8ljBKsKm2X575N/wgCIOzZPd2BB4=; b=I4lR21rsdJXGMNxa+OKLq38KX/6PMF+bp/Sr90gCR1eXzOQQHT8db6iXhgisVMD2xU Sz94/p/u1VIQnM65y6BfS4jSUbnDtXCMdZPk/cfGhD9jIrS+n4RqUJ7R/LUa+f+WFWgo ERzEx3DzgZGAtCT0TjtuCpSbJEcNNwFynLJ7xFDGh+dsOxIuILyHWHnIcrI1qExUjhCl APFtJ2XdLbWmw8SrIK7jmqDMR245l5xqXwselPIKb4Cmp0xdzPX0mAZrA/fYYnBpiDgc 2JJl7R+TF9qCQ+XJ4FEUilI84WQIwvRaAOaDD/pFXEV/bQ4OoJ/YVUg2tNgGRCZ9zDJU 4G8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=IgxhvPvL; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qp1-20020a170907206100b00993a7ae9f37si8668717ejb.882.2023.07.10.05.47.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 05:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=IgxhvPvL; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8DA4385AF95 for ; Mon, 10 Jul 2023 12:46:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8DA4385AF95 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688993169; bh=tVSx+f/pHHpGSfmt+HlbK8K1QV8fv30rR4U9XIlzcA8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=IgxhvPvLTF9KD+dxlQSgx/FAMWI3KTVyEQtV2NlRI9rohi1Rd0jmqSpImQqh4HQqb gZwESKgnO3jzc78zH3JoGRJWtcbijD0SnFq0pUAA8xVUtmdB9Zvdplba9g6ftVQcak D1gdSBkLWvXQMAoBOc07LziyFAD24p7JMi4vFQjQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 4A8833857723 for ; Mon, 10 Jul 2023 12:44:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A8833857723 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fb4146e8fcso32661515e9.0 for ; Mon, 10 Jul 2023 05:44:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688993071; x=1691585071; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tVSx+f/pHHpGSfmt+HlbK8K1QV8fv30rR4U9XIlzcA8=; b=ahEOd/JI7GQDdfQ5gZI4esjNQisJ/HGyjFR5jCAEsvAJvKjRBUmPFLsLsNz+IM/wjs JBKHL2HbVLC+mX7/4we5BRWXd2s0fWkgH04m2O4azM/+N/FXFwUMqPFX2raBZLBkFy8w +8Rp+Nlmg3ms466rHGRsAt7W6E9mOCuDjR0RVG7nC2KzJ0ix5A0An2rZVQARJzHcnDUl i5xO3Hq+OfB7Kjvbq5Kl2e8a/rMRm+D7vS4IojCDGQBg8KbqDuOJVY0PsqbaLnZDIvI8 4k9t7yhjajgftj6WoqvIdyb2RAe7Cfwz9LKhNG/v9E9QJfvkzb7vKXXLjYauDam/vhQU YfRg== X-Gm-Message-State: ABy/qLb71fY5gOUTJg11cVu/hY+6fxlTWRy1mkhVgsvaxQW9OH4u0LBG bGoqJmO+rBXHiqmMC/VRvvwaufcSKIsu8GbXcoAzPQ== X-Received: by 2002:a05:600c:2113:b0:3fc:180:6463 with SMTP id u19-20020a05600c211300b003fc01806463mr6998783wml.7.1688993071151; Mon, 10 Jul 2023 05:44:31 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:a197:d20:e621:dddf]) by smtp.gmail.com with ESMTPSA id k5-20020adfd845000000b0031444673643sm11676290wrl.57.2023.07.10.05.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 05:44:30 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Tom Tromey Subject: [COMMITTED] ada: Add typedefs to snames.h-tmpl Date: Mon, 10 Jul 2023 14:44:29 +0200 Message-Id: <20230710124429.2263694-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771037763234171944 X-GMAIL-MSGID: 1771037763234171944 From: Tom Tromey A future patch will change sname.h-tmpl to use enums rather than preprocessor defines. In order to do this, first introduce some typedefs that can be used in gcc-interface. gcc/ada/ * snames.h-tmpl (Name_Id, Attribute_Id, Convention_Id) (Pragma_Id): New typedefs. (Get_Attribute_Id, Get_Pragma_Id): Use typedef. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/snames.h-tmpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/snames.h-tmpl b/gcc/ada/snames.h-tmpl index b15792a5724..95b3c776197 100644 --- a/gcc/ada/snames.h-tmpl +++ b/gcc/ada/snames.h-tmpl @@ -28,6 +28,7 @@ /* Name_Id values */ +typedef Int Name_Id; #define Name_ !! TEMPLATE INSERTION POINT /* Define the function to return one of the numeric values below. Note @@ -35,8 +36,9 @@ than 256 entries is represented that way in Ada. The operand is a Chars field value. */ +typedef Byte Attribute_Id; #define Get_Attribute_Id snames__get_attribute_id -extern unsigned char Get_Attribute_Id (int); +extern Attribute_Id Get_Attribute_Id (int); /* Define the numeric values for attributes. */ @@ -44,6 +46,7 @@ extern unsigned char Get_Attribute_Id (int); /* Define the numeric values for the conventions. */ +typedef Byte Convention_Id; #define Convention_ !! TEMPLATE INSERTION POINT /* Define the function to check if a Name_Id value is a valid pragma */ @@ -56,8 +59,9 @@ extern Boolean Is_Pragma_Name (Name_Id); than 256 entries is represented that way in Ada. The operand is a Chars field value. */ +typedef Byte Pragma_Id; #define Get_Pragma_Id snames__get_pragma_id -extern unsigned char Get_Pragma_Id (int); +extern Pragma_Id Get_Pragma_Id (int); /* Define the numeric values for the pragmas. */