From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DC297385DC16 for ; Tue, 16 Jan 2024 16:18:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC297385DC16 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DC297385DC16 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705421902; cv=none; b=woucY2Ziv35IGb94q+0N7zHyJ9I9J7WclLHRfXVfmjwN4KFK/tKjYMoyS+I32gjpnrFgKV0oM0y8LqlEtzT/VlVW62MJ7tnqNkVIRxzQNTo5ZCVj1E6+SzNjO9exhu3ruJ1/XIIC6ZeU6mImVKnkVaccDbqVxM5y85P9IQFlVIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705421902; c=relaxed/simple; bh=3rr9VgAkZgGugIig4vqgCjn4QjUxNZwfNdKKQVDpItY=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=TyeADJ6LtMceZjhSe0kSjUZUuCh9GISB4c6CeHJ1ekwe4oAxUDnN7bzbNykHuKnW6yzoUZWTfzW35hjAGW4408AM9Tp+EqGOg9isDlouL2k3nQR+5nyL1jQKYWJd5Lq/vb/R5Pn7nxloT51Lt9x+5JGW17ap+EWAzbi9lSJp4jc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705421890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9Awti+mvY97MCUpOjQp0xyHuAf4WYOJfg1p/sUo3drU=; b=JKwhXK4/jtp1BO3JfJKM693lKImCGNr+x1N157sd7BJPI7QjUcCWWcGobqq/Nv13Rr8RmD y+t4SBiq16+3PABA8mC6v+Pw82bXgFkHD+moGMY+67oeiDQzfXkqRkXe8HZNohuGo4fD// YXbUDbbgnpp3o6bp1v4/F2/dXBG8+K8= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-455-O5abPYD8OSmJUiy5CnxYsg-1; Tue, 16 Jan 2024 11:18:09 -0500 X-MC-Unique: O5abPYD8OSmJUiy5CnxYsg-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-5e6fe91c706so178675507b3.2 for ; Tue, 16 Jan 2024 08:18:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705421888; x=1706026688; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9Awti+mvY97MCUpOjQp0xyHuAf4WYOJfg1p/sUo3drU=; b=JgarIT1aLb7QHuVhi2v4soUdwk2q8x5Pqu729Lpw/NtwRHX9VmoHcZWxvLGpq6it8y GnxqIAkRRDU37xO/SSVcLacR46BKg1Bv3ajYZ5Lsquxzh3uCrwROiBZjoYm9HigOGmhc jYIeYFc7aYHYEA1iG78LPNjJZYV3G6QUiFPqQtxWfbpRDbIoRWTeZpf+3GFgrJoRiJ5Z kRLD+Z/keW0y3/5mwi+tuzXAAZFjil3YEXeIvWcOcQFL6dcxtqQOysBgAmyI2+XbAFgJ ZzTKqhi7runTPFEIF3odnovMsKPqvCfZaVlaJvcvyq6WPr3GmmOyss+NNmPRrXKx7pOI QBtA== X-Gm-Message-State: AOJu0YxQQpQzghbp5+oSYjcX0/q5F5WUGbgv5mPOmmT8+QCEiYWko+0i ijvQC2NcPtuer2CZxSj6SuCRbckgA+HXaTv1BZesjuN/LT80wC7/Q450oReIgXZzqyKbEE6RXZQ kRlX+txJccURLkK87fxdxbreVIpnh0xOAVrzdnAIR2Q== X-Received: by 2002:a05:690c:4:b0:5ea:905d:6f4 with SMTP id bc4-20020a05690c000400b005ea905d06f4mr5783468ywb.50.1705421887853; Tue, 16 Jan 2024 08:18:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBpc7D4pKzLkAyPBweSCrG4LNY5EvX6K0UAF3MCNxO8EEicSVO/QrCNkcV9Kph+bHZAl7dfxutu76bNlDJgm8= X-Received: by 2002:a05:690c:4:b0:5ea:905d:6f4 with SMTP id bc4-20020a05690c000400b005ea905d06f4mr5783454ywb.50.1705421887316; Tue, 16 Jan 2024 08:18:07 -0800 (PST) MIME-Version: 1.0 References: <20240113124834.1296437-1-jwakely@redhat.com> <20240115204803.1550804-1-jwakely@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Tue, 16 Jan 2024 16:17:51 +0000 Message-ID: Subject: Re: [PATCH v4] libstdc++: Implement C++26 std::text_encoding (P1885R12) [PR113318] To: Patrick Palka Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 List-Id: On Tue, 16 Jan 2024 at 15:39, Jonathan Wakely wrote: > > On Tue, 16 Jan 2024 at 14:07, Jonathan Wakely wrote: > > > > On 15/01/24 19:09 -0500, Patrick Palka wrote: > > >> + friend _Iterator > > >> + operator+(_Iterator __i, difference_type __n) > > > > > >constexpr? > > > > Fixed. I've added tests that all iterator ops are usable in constant > > expressions, which found a bug in operator+= (it didn't let you > > increment one past the end of the range). > > I found another bug in operator+= which is fixed and tested like so: > > --- a/libstdc++-v3/include/std/text_encoding > +++ b/libstdc++-v3/include/std/text_encoding > @@ -584,7 +584,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > *this == _Iterator{}; > } > } > - __glibcxx_assert(_M_rep != nullptr); > + if (__n != 0) > + __glibcxx_assert(_M_rep != nullptr); > return *this; > } > > --- a/libstdc++-v3/testsuite/std/text_encoding/requirements.cc > +++ b/libstdc++-v3/testsuite/std/text_encoding/requirements.cc > @@ -67,6 +67,11 @@ test_constexpr_iterator() > VERIFY( *(iter + 1) == iter[1] ); > VERIFY( (1 + iter - 1) == begin ); > VERIFY( (-1 + (iter - -2) + -1) == begin ); > + > + std::ranges::iterator_t singular; > + VERIFY( (singular + 0) == singular ); > + VERIFY( (singular - 0) == singular ); > + > return true; > } > static_assert( test_constexpr_iterator() ); I'll also change this, after a suggestion from one of the paper authors (Corentin): --- a/libstdc++-v3/src/c++26/text_encoding.cc +++ b/libstdc++-v3/src/c++26/text_encoding.cc @@ -38,7 +38,7 @@ text_encoding __locale_encoding(const char* name) { text_encoding enc; - if (locale_t loc = ::newlocale(LC_ALL_MASK, name, (locale_t)0)) + if (locale_t loc = ::newlocale(LC_CTYPE_MASK, name, (locale_t)0)) { if (const char* codeset = ::nl_langinfo_l(CODESET, loc)) { @@ -64,7 +64,7 @@ bool std::text_encoding::_M_is_environment() const { bool matched = false; - if (locale_t loc = ::newlocale(LC_ALL_MASK, "", (locale_t)0)) + if (locale_t loc = ::newlocale(LC_CTYPE_MASK, "", (locale_t)0)) { if (const char* codeset = ::nl_langinfo_l(CODESET, loc)) {