From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id F16FA393D03B for ; Wed, 28 Apr 2021 22:05:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F16FA393D03B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=joseph_myers@mentor.com IronPort-SDR: vyFQEsA03n4+oN7hMrottcOc8kQSla1WB+hl63RJtq6/ySl8sVCJNeyqehyFWuUUPH4vD8tx7l 9rybKNHTXwwS8p3MVwxwySRpDZPgyHc0zBpCij59w76qQbaSFBOK1xObo0qazfpqBB3rWL8+iz g1JIypoH8jBXOIsabRok302BwpHDEnITBdVMbW1t8haJJb/hJgVCw9tmr27C3zRqU/dbuxci8i vfpUt2SjbK/4qLgnibxUeWL3CMbPqDPgEgW8xkYDJIeLjtvMgw/gbT4g/0VRkl/bklyyKUQ2OW Qkc= X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="63019118" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 28 Apr 2021 14:05:08 -0800 IronPort-SDR: wG5/ksPcaLWlw+HajKDYDkcbQ5A369Y5eokjvVkS3oDkurDGgxmWxq/ibfrgK+EuYQUjH6+pzy wB0Mn+w26QuMNErXaqDKO5TjzctErXv2cPjEUfNOMhgWMy+w8D3mW9+ZYvqCeWiNBgRCh8r1dd GfqswNvpOak3Fb5oXHM1CRg1i+TDXvSUGVaU37tOoo9UNDi5Ftg7/yYoKuWoSlAbCrg+SDAbZ2 1nV+P16uGhw8GjmQovS0JOgUVtaNplLS0HIp3bvJtHpwctCkx2smWLfv9H5OELYao1mwTTahJU 6Yk= Date: Wed, 28 Apr 2021 22:05:02 +0000 From: Joseph Myers X-X-Sender: jsm28@digraph.polyomino.org.uk To: CC: , Subject: preprocessor: Handle digit separators in #line [PR82359] Message-ID: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-3127.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, 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: 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-List-Received-Date: Wed, 28 Apr 2021 22:05:10 -0000 As reported in bug 82359, the preprocessor does not allow C++ digit separators in the line number in a #line directive, despite the standard syntax for that directive using digit-sequence which allows digit separators. There is some confusion in that bug about whether C++ is meant to allow digit separators there or not, but the last comment there suggests they are meant to be allowed, and the version of digit separators accepted for C2X at the March meeting explicitly mentions digit separators in the #line specification to avoid any ambiguity there. This patch thus adds code to handle digit separators in the line number in #line, as part of the preparation for enabling digit separators in C2X mode. The code changed does not contain any conditionals for whether digit separators are supported in the chosen language version, because that was handled earlier in pp-number lexing and if they aren't supported they won't appear in the string passed to that function. It does however make sure not to allow adjacent digit separators because those are only handled at a later stage of lexing at present. (Problems with how certain source character sequences involving digit separators that don't actually match the pp-number syntax get lexed as a pp-number and only diagnosed later, if at all, are bugs 83873 and 97604, to be addressed separately.) Making the change in this location will have the effect of allowing digit separators in the "# " form of directive as well as #line; I don't think that's a problem. Bootstrapped with no regressions for x86_64-pc-linux-gnu. Any C++ maintainer comments on this patch? libcpp/ PR preprocessor/82359 * directives.c (strtolinenum): Handle digit separators. gcc/testsuite/ PR preprocessor/82359 * g++.dg/cpp1y/digit-sep-line.C, g++.dg/cpp1y/digit-sep-line-neg.C: New tests. diff --git a/gcc/testsuite/g++.dg/cpp1y/digit-sep-line-neg.C b/gcc/testsuite/g++.dg/cpp1y/digit-sep-line-neg.C new file mode 100644 index 00000000000..fa3b1352109 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/digit-sep-line-neg.C @@ -0,0 +1,4 @@ +// Test digit separators in #line (bug 82359). Test invalid usage. +// { dg-do preprocess { target c++14 } } + +#line 0''123 // { dg-error "is not a positive integer" } diff --git a/gcc/testsuite/g++.dg/cpp1y/digit-sep-line.C b/gcc/testsuite/g++.dg/cpp1y/digit-sep-line.C new file mode 100644 index 00000000000..48846e42221 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/digit-sep-line.C @@ -0,0 +1,8 @@ +// Test digit separators in #line (bug 82359). +// { dg-do compile { target c++14 } } + +#line 0'123 +static_assert (__LINE__ == 123, "#line with digit separator"); + +#line 4'56'7'8'9 +static_assert (__LINE__ == 456789, "#line with digit separator"); diff --git a/libcpp/directives.c b/libcpp/directives.c index f4aa17d1156..795f93e664b 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -922,12 +922,19 @@ strtolinenum (const uchar *str, size_t len, linenum_type *nump, bool *wrapped) linenum_type reg = 0; uchar c; + bool seen_digit_sep = false; *wrapped = false; while (len--) { c = *str++; + if (!seen_digit_sep && c == '\'' && len) + { + seen_digit_sep = true; + continue; + } if (!ISDIGIT (c)) return true; + seen_digit_sep = false; if (reg > ((linenum_type) -1) / 10) *wrapped = true; reg *= 10; -- Joseph S. Myers joseph@codesourcery.com