From patchwork Tue Nov 7 20:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 162704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp479923vqo; Tue, 7 Nov 2023 12:04:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0zph8lVqZLnJo2tl2Y0qeGa5AxrxC5It3i+/ENvRHlUGYLGQKv/p99ynt40UOZQ8ngqTT X-Received: by 2002:a05:620a:400b:b0:77a:3f9:ee22 with SMTP id h11-20020a05620a400b00b0077a03f9ee22mr36227297qko.4.1699387497620; Tue, 07 Nov 2023 12:04:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699387497; cv=pass; d=google.com; s=arc-20160816; b=QYLGak8h+POogB2g3sq40NKFpNjafvr3uWIwpgwFZiJ4Lvw6/PZ80OTwm6YjuvwP+v dUz7CNLq2msWz+PgjzacO37p91B6Z1UzyOWJAefxdkHcVHWn+38fdOqwPGxHnS6ZfvLq 8C+oqBZPpER6z2qleztYHN6Rlu37d3tLJUfe7znfzvY0y9pHyIM2E5xHNPHUuQlWTIIb 12Zp+CW9vHfyUKFsa6a5ESEDIprLV/9gwqTMcl9/sPPfslvkGvE3yt4dNxTVl+kfAKPe MONJZA/ITQhuacUuAl6vnNz830RN0RpGPlYEPlgit4MOXCyfQM8ZZOEVne0rTPmg+7Tz kauw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:subject :to:from:date:ironport-sdr:arc-filter:dmarc-filter:delivered-to; bh=J7bCavLW7AbpeH/ulhnpBtqsGEQ/NQSGyhXxTI8gimk=; fh=gk9A5O7Gbglvz1MjrRQ4hZ2i3c68kYkpOZJg1emXh+g=; b=UsoNti7wauddi0c+u70AHH2WzYKheFnvnv7neiVV0pBArxzgVb26pCiqDkuN+3A5vO Q3wZNQTr3sry8L4mzAr/nNkVcnAyBZMdT1OEJUEPIW2YgrBAXGd6zTHwEOaCa6tc3d+3 KFbF1hyFLOFoyqBCUhyCLaWDn43yzbFXaMXV5DUUQbKsdMRKKpT3CEy/7Hj3urKdyLkd OW0AxeJ6mW7QGtYIia0+wjeqBZUiRMxaUHRwUnLPHFz6Oult2rNmqrtbo8JWQhMr0N5L i5OxpGZHq1VkCmbHciZbqGemPz2fFYwUIfpy6ugEtjxrQJj1chgk3xlqCrWmRAOg35XT gpaA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a28-20020a05620a439c00b0076db1b23b27si312816qkp.715.2023.11.07.12.04.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:04:57 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 59DB13858D3C for ; Tue, 7 Nov 2023 20:04:57 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 1E8353858D33 for ; Tue, 7 Nov 2023 20:04:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E8353858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1E8353858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.137.180 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699387471; cv=none; b=CdW3mYdYWHW2bDe+hTKAKfxlbXoz6IRJnGRrD9TPqqu8T0rV1PKZuMOWeAj2LJqRReBBuqNOww6ks83ALZ9ZPNOMTNebmB60JvBW66vxc+8g21XM4T2LZOHyc8R5WL6zyf754Ym60DSm/VmDWCVG6eYe52sRSXrQab4Cy5YyswE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699387471; c=relaxed/simple; bh=SJCb9RY/vDLTxyzanxhQ6Tk/g1UKzvJBRqYar2Ae16w=; h=Date:From:To:Subject:Message-ID:MIME-Version; b=WpZaFoc030rl0f8Upr2SlDeLE7CycJFeeS6WnSRuKqshBov/lQoT6G2gI6OVfnt8/56vd3wSYcJGiFBD6sUyXU+fi4dEHONo8Dn2kJLU+ggPdBIecuQPOZhBcBNS0C1f4/hN+4fFDFy8+QjFsSYaA4nooEhePva/Nn8ws65h5O4= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: Og8G//hNTQ+KA6924fLzng== X-CSE-MsgGUID: OUQAhWT0S+CWZg0kmBXXUw== X-IronPort-AV: E=Sophos;i="6.03,284,1694764800"; d="scan'208";a="22185673" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 07 Nov 2023 12:04:26 -0800 IronPort-SDR: QqdBzsUd1ky/SbeuC2Su/FcRokyb10AAb2MKaCvA7xoSAfx7BDqsG4zC3lEaplng6hAg4OfuYn 2PKGCnAPgUdKdqq9Mt8pTf/Sqoa9sRcpJKnynQmh/4EhqoIYqWSW+wPbFDHEBxZtdpCDBW2M7o 0MJnhxbcK78f7wtZaY3sPB+bRFmbQqXYafCyoEOZENJff8h4QssGaIcxisnAMrkHOISYYyIfpe vkQnORRsOOdc2CsoC5Kl8iZjFSVhIXTh1OeQLDPPJcq6GR6GFERyjadvR93mJEdsLPfoK4BDLD hB0= Date: Tue, 7 Nov 2023 20:04:21 +0000 From: Joseph Myers To: Subject: [committed] c: Change T2X_* format checking macros to T23_* Message-ID: <958be09c-a334-cc4c-a6ae-2f84a2dedb85@codesourcery.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-3109.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UPPERCASE_50_75 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781936944642668566 X-GMAIL-MSGID: 1781936944642668566 Analogous to previous changes to code that matched "c2x" (case-insensitive), also update T2X_* macros used in format checking tables to be named T23_*. Bootstrapped with no regressions for x86_64-pc-linux-gnu. gcc/c-family/ * c-format.h (T2X_UI): Rename to T23_UI. (T2X_UL): Rename to T23_UL. (T2X_ULL): Rename to T23_ULL. (T2X_US): Rename to T23_US. (T2X_UC): Rename to T23_UC. (T2X_ST): Rename to T23_ST. (T2X_UPD): Rename to T23_UPD. (T2X_UIM): Rename to T23_UIM. (T2X_D32): Rename to T23_D32. (T2X_D64): Rename to T23_D64. (T2X_D128): Rename to T23_D128. (T2X_I8): Rename to T23_I8. (T2X_I16): Rename to T23_I16. (T2X_I32): Rename to T23_I32. (T2X_I64): Rename to T23_I64. (T2X_U8): Rename to T23_U8. (T2X_U16): Rename to T23_U16. (T2X_U32): Rename to T23_U32. (T2X_U64): Rename to T23_U64. (T2X_IF8): Rename to T23_IF8. (T2X_IF16): Rename to T23_IF16. (T2X_IF32): Rename to T23_IF32. (T2X_IF64): Rename to T23_IF64. (T2X_UF8): Rename to T23_UF8. (T2X_UF16): Rename to T23_UF16. (T2X_UF32): Rename to T23_UF32. (T2X_UF64): Rename to T23_UF64. * c-format.cc: Update all uses of T2X_* macros to use T23_*. diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc index 06c84d019fa..1a25141071f 100644 --- a/gcc/c-family/c-format.cc +++ b/gcc/c-family/c-format.cc @@ -709,20 +709,20 @@ static const format_flag_pair strfmon_flag_pairs[] = static const format_char_info print_char_table[] = { /* C89 conversion specifiers. */ - { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T2X_I8, T2X_I16, T2X_I32, T2X_I64, T2X_IF8, T2X_IF16, T2X_IF32, T2X_IF64 }, "-wp0 +'I", "i", NULL }, - { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "-wp0#", "i", NULL }, - { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "-wp0'I", "i", NULL }, - { "fgG", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#'I", "", NULL }, - { "eE", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#I", "", NULL }, + { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T23_I8, T23_I16, T23_I32, T23_I64, T23_IF8, T23_IF16, T23_IF32, T23_IF64 }, "-wp0 +'I", "i", NULL }, + { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "-wp0#", "i", NULL }, + { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "-wp0'I", "i", NULL }, + { "fgG", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#'I", "", NULL }, + { "eE", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#I", "", NULL }, { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL }, { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL }, { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c", NULL }, - { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T2X_I8, T2X_I16, T2X_I32, T2X_I64, T2X_IF8, T2X_IF16, T2X_IF32, T2X_IF64 }, "", "W", NULL }, + { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T23_I8, T23_I16, T23_I32, T23_I64, T23_IF8, T23_IF16, T23_IF32, T23_IF64 }, "", "W", NULL }, /* C99 conversion specifiers. */ - { "F", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#'I", "", NULL }, - { "aA", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL }, + { "F", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#'I", "", NULL }, + { "aA", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL }, /* C23 conversion specifiers. */ - { "bB", 0, STD_C23, { T2X_UI, T2X_UC, T2X_US, T2X_UL, T2X_ULL, TEX_ULL, T2X_ST, T2X_UPD, T2X_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "-wp0#", "i", NULL }, + { "bB", 0, STD_C23, { T23_UI, T23_UC, T23_US, T23_UL, T23_ULL, TEX_ULL, T23_ST, T23_UPD, T23_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "-wp0#", "i", NULL }, /* X/Open conversion specifiers. */ { "C", 0, STD_EXT, { TEX_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL }, { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R", NULL }, @@ -875,20 +875,20 @@ static const format_char_info gcc_dump_printf_char_table[] = static const format_char_info scan_char_table[] = { /* C89 conversion specifiers. */ - { "di", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T2X_I8, T2X_I16, T2X_I32, T2X_I64, T2X_IF8, T2X_IF16, T2X_IF32, T2X_IF64 }, "*w'I", "W", NULL }, - { "u", 1, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "*w'I", "W", NULL }, - { "oxX", 1, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "*w", "W", NULL }, - { "efgEG", 1, STD_C89, { T89_F, BADLEN, BADLEN, T89_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, + { "di", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T23_I8, T23_I16, T23_I32, T23_I64, T23_IF8, T23_IF16, T23_IF32, T23_IF64 }, "*w'I", "W", NULL }, + { "u", 1, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "*w'I", "W", NULL }, + { "oxX", 1, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "*w", "W", NULL }, + { "efgEG", 1, STD_C89, { T89_F, BADLEN, BADLEN, T89_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, { "c", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*mw", "cW", NULL }, { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*amw", "cW", NULL }, { "[", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*amw", "cW[", NULL }, { "p", 2, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w", "W", NULL }, - { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T2X_I8, T2X_I16, T2X_I32, T2X_I64, T2X_IF8, T2X_IF16, T2X_IF32, T2X_IF64 }, "", "W", NULL }, + { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM, BADLEN, BADLEN, BADLEN, T23_I8, T23_I16, T23_I32, T23_I64, T23_IF8, T23_IF16, T23_IF32, T23_IF64 }, "", "W", NULL }, /* C99 conversion specifiers. */ - { "F", 1, STD_C99, { T99_F, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, - { "aA", 1, STD_C99, { T99_F, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T2X_D32, T2X_D64, T2X_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, + { "F", 1, STD_C99, { T99_F, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, + { "aA", 1, STD_C99, { T99_F, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN, T23_D32, T23_D64, T23_D128, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w'", "W", NULL }, /* C23 conversion specifiers. */ - { "b", 1, STD_C23, { T2X_UI, T2X_UC, T2X_US, T2X_UL, T2X_ULL, TEX_ULL, T2X_ST, T2X_UPD, T2X_UIM, BADLEN, BADLEN, BADLEN, T2X_U8, T2X_U16, T2X_U32, T2X_U64, T2X_UF8, T2X_UF16, T2X_UF32, T2X_UF64 }, "*w", "W", NULL }, + { "b", 1, STD_C23, { T23_UI, T23_UC, T23_US, T23_UL, T23_ULL, TEX_ULL, T23_ST, T23_UPD, T23_UIM, BADLEN, BADLEN, BADLEN, T23_U8, T23_U16, T23_U32, T23_U64, T23_UF8, T23_UF16, T23_UF32, T23_UF64 }, "*w", "W", NULL }, /* X/Open conversion specifiers. */ { "C", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*mw", "W", NULL }, { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*amw", "W", NULL }, diff --git a/gcc/c-family/c-format.h b/gcc/c-family/c-format.h index 37bcbf88afb..f8a9d3691ce 100644 --- a/gcc/c-family/c-format.h +++ b/gcc/c-family/c-format.h @@ -286,17 +286,17 @@ struct format_kind_info #define T89_S { STD_C89, NULL, T_S } #define T_UI &unsigned_type_node #define T89_UI { STD_C89, NULL, T_UI } -#define T2X_UI { STD_C23, NULL, T_UI } +#define T23_UI { STD_C23, NULL, T_UI } #define T_UL &long_unsigned_type_node #define T89_UL { STD_C89, NULL, T_UL } -#define T2X_UL { STD_C23, NULL, T_UL } +#define T23_UL { STD_C23, NULL, T_UL } #define T_ULL &long_long_unsigned_type_node #define T9L_ULL { STD_C9L, NULL, T_ULL } -#define T2X_ULL { STD_C23, NULL, T_ULL } +#define T23_ULL { STD_C23, NULL, T_ULL } #define TEX_ULL { STD_EXT, NULL, T_ULL } #define T_US &short_unsigned_type_node #define T89_US { STD_C89, NULL, T_US } -#define T2X_US { STD_C23, NULL, T_US } +#define T23_US { STD_C23, NULL, T_US } #define T_F &float_type_node #define T89_F { STD_C89, NULL, T_F } #define T99_F { STD_C99, NULL, T_F } @@ -312,7 +312,7 @@ struct format_kind_info #define T99_SC { STD_C99, NULL, T_SC } #define T_UC &unsigned_char_type_node #define T99_UC { STD_C99, NULL, T_UC } -#define T2X_UC { STD_C23, NULL, T_UC } +#define T23_UC { STD_C23, NULL, T_UC } #define T_V &void_type_node #define T89_G { STD_C89, NULL, &local_gimple_ptr_node } #define T_CGRAPH_NODE { STD_C89, NULL, &local_cgraph_node_ptr_node } @@ -327,57 +327,57 @@ struct format_kind_info #define TEX_WI { STD_EXT, "wint_t", T_WI } #define T_ST &size_type_node #define T99_ST { STD_C99, "size_t", T_ST } -#define T2X_ST { STD_C23, "size_t", T_ST } +#define T23_ST { STD_C23, "size_t", T_ST } #define T_SST &signed_size_type_node #define T99_SST { STD_C99, "signed size_t", T_SST } #define T_PD &ptrdiff_type_node #define T99_PD { STD_C99, "ptrdiff_t", T_PD } #define T_UPD &unsigned_ptrdiff_type_node #define T99_UPD { STD_C99, "unsigned ptrdiff_t", T_UPD } -#define T2X_UPD { STD_C23, "unsigned ptrdiff_t", T_UPD } +#define T23_UPD { STD_C23, "unsigned ptrdiff_t", T_UPD } #define T_IM &intmax_type_node #define T99_IM { STD_C99, "intmax_t", T_IM } #define T_UIM &uintmax_type_node #define T99_UIM { STD_C99, "uintmax_t", T_UIM } -#define T2X_UIM { STD_C23, "uintmax_t", T_UIM } +#define T23_UIM { STD_C23, "uintmax_t", T_UIM } #define T_D32 &dfloat32_type_node -#define T2X_D32 { STD_C23, "_Decimal32", T_D32 } +#define T23_D32 { STD_C23, "_Decimal32", T_D32 } #define T_D64 &dfloat64_type_node -#define T2X_D64 { STD_C23, "_Decimal64", T_D64 } +#define T23_D64 { STD_C23, "_Decimal64", T_D64 } #define T_D128 &dfloat128_type_node -#define T2X_D128 { STD_C23, "_Decimal128", T_D128 } +#define T23_D128 { STD_C23, "_Decimal128", T_D128 } #define T_I8 &int_least8_type_node -#define T2X_I8 { STD_C23, "int_least8_t", T_I8 } +#define T23_I8 { STD_C23, "int_least8_t", T_I8 } #define T_I16 &int_least16_type_node -#define T2X_I16 { STD_C23, "int_least16_t", T_I16 } +#define T23_I16 { STD_C23, "int_least16_t", T_I16 } #define T_I32 &int_least32_type_node -#define T2X_I32 { STD_C23, "int_least32_t", T_I32 } +#define T23_I32 { STD_C23, "int_least32_t", T_I32 } #define T_I64 &int_least64_type_node -#define T2X_I64 { STD_C23, "int_least64_t", T_I64 } +#define T23_I64 { STD_C23, "int_least64_t", T_I64 } #define T_U8 &uint_least8_type_node -#define T2X_U8 { STD_C23, "uint_least8_t", T_U8 } +#define T23_U8 { STD_C23, "uint_least8_t", T_U8 } #define T_U16 &uint_least16_type_node -#define T2X_U16 { STD_C23, "uint_least16_t", T_U16 } +#define T23_U16 { STD_C23, "uint_least16_t", T_U16 } #define T_U32 &uint_least32_type_node -#define T2X_U32 { STD_C23, "uint_least32_t", T_U32 } +#define T23_U32 { STD_C23, "uint_least32_t", T_U32 } #define T_U64 &uint_least64_type_node -#define T2X_U64 { STD_C23, "uint_least64_t", T_U64 } +#define T23_U64 { STD_C23, "uint_least64_t", T_U64 } #define T_IF8 &int_fast8_type_node -#define T2X_IF8 { STD_C23, "int_fast8_t", T_IF8 } +#define T23_IF8 { STD_C23, "int_fast8_t", T_IF8 } #define T_IF16 &int_fast16_type_node -#define T2X_IF16 { STD_C23, "int_fast16_t", T_IF16 } +#define T23_IF16 { STD_C23, "int_fast16_t", T_IF16 } #define T_IF32 &int_fast32_type_node -#define T2X_IF32 { STD_C23, "int_fast32_t", T_IF32 } +#define T23_IF32 { STD_C23, "int_fast32_t", T_IF32 } #define T_IF64 &int_fast64_type_node -#define T2X_IF64 { STD_C23, "int_fast64_t", T_IF64 } +#define T23_IF64 { STD_C23, "int_fast64_t", T_IF64 } #define T_UF8 &uint_fast8_type_node -#define T2X_UF8 { STD_C23, "uint_fast8_t", T_UF8 } +#define T23_UF8 { STD_C23, "uint_fast8_t", T_UF8 } #define T_UF16 &uint_fast16_type_node -#define T2X_UF16 { STD_C23, "uint_fast16_t", T_UF16 } +#define T23_UF16 { STD_C23, "uint_fast16_t", T_UF16 } #define T_UF32 &uint_fast32_type_node -#define T2X_UF32 { STD_C23, "uint_fast32_t", T_UF32 } +#define T23_UF32 { STD_C23, "uint_fast32_t", T_UF32 } #define T_UF64 &uint_fast64_type_node -#define T2X_UF64 { STD_C23, "uint_fast64_t", T_UF64 } +#define T23_UF64 { STD_C23, "uint_fast64_t", T_UF64 } /* Structure describing how format attributes such as "printf" are interpreted as "gnu_printf" or "ms_printf" on a particular system.