From patchwork Sat Jun 8 03:44:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Smith-Rowland <3dw4rd@verizon.net> X-Patchwork-Id: 249920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 8F43B2C02E9 for ; Sat, 8 Jun 2013 13:44:44 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=OTC3oSbm6sfCzvlS0 vn/H4Uo3bWhnxM0qle6QzNe75yMBRSd49FEWKfaIvRzkhftXTUG/wSuUAyKGkpX3 g+ucnv92olm50GMYsi+kRGldk9sr07umm1ml8upy8FcMYwNBA+4/SK5fw1drTAqG Z6UxgVCSMR3FX4X1q2AtTvjP1o= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=46DAXKo0gvW8uF8HUmUb7Wu CtuM=; b=icnUYU3MXXwwYvkGrUwnjse9b/4VqejN/ivyvuzfr+88vC57tDnMUZG YgvWtRUEQQdiNsTTRV4bUnMVJuhEzgfApWH81c7YO30omBMOw8pNp4XV0x5/jTEg 5H/eY4uSiXX3eRc+t8xy9fThhJSiS80vSAwKAg99DIo85HN8sMyU= Received: (qmail 23928 invoked by alias); 8 Jun 2013 03:44:29 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 23909 invoked by uid 89); 8 Jun 2013 03:44:28 -0000 X-Spam-SWARE-Status: No, score=2.4 required=5.0 tests=AWL, BAYES_00, BOTNET, KHOP_THREADED, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, SPF_PASS, TW_PW autolearn=no version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from vms173019pub.verizon.net (HELO vms173019pub.verizon.net) (206.46.173.19) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sat, 08 Jun 2013 03:44:26 +0000 Received: from [192.168.1.4] ([unknown] [96.244.50.87]) by vms173019.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MO200C2F2DLW120@vms173019.mailsrvcs.net>; Fri, 07 Jun 2013 22:44:10 -0500 (CDT) Message-id: <51B2A88C.3010109@verizon.net> Date: Fri, 07 Jun 2013 23:44:12 -0400 From: Ed Smith-Rowland <3dw4rd@verizon.net> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-version: 1.0 To: Jonathan Wakely Cc: "libstdc++@gcc.gnu.org" , gcc-patches Subject: Re: [libstdc++-v3][C++14] Implement N3654 - Quoted Strings References: <51AF8F13.80807@verizon.net> <51B0A2C8.4060701@verizon.net> In-reply-to: <51B0A2C8.4060701@verizon.net> Content-type: multipart/mixed; boundary=------------090106070105020707030306 X-Virus-Found: No On 06/06/2013 10:55 AM, Ed Smith-Rowland wrote: > On 06/05/2013 04:01 PM, Jonathan Wakely wrote: >> On 5 June 2013 20:18, Ed Smith-Rowland wrote: >>> Greetings, >>> This patch implements quoted string manipulators for C++14. >>> >>> 27.7.6 - Quoted manipulators [quoted.manip]. >>> >>> The idea is to allow round trip insert and extract of strings with >>> spaces. >>> >>> std::stringstream ss; >>> std::string original = "thing1 thing1"; >>> std::string round_trip; >>> ss << std::quoted(original); >>> ss >> std::quoted(round_trip); >>> assert( original == round_trip ); >>> >>> Builds and tests clean on x86-64-linux. >> As I suggested for your literals patch, couldn't the test for: >> #if __cplusplus > 201103L >> go inside the existing one? >> >> i.e. >> >> #if __cplusplus >= 201103L >> [...] >> #if __cplusplus > 201103L >> [...] >> #endif >> #endif > Certainly. I forgot that in the last literals patch. I'll fix that > after I finish this one. (I just noticed junk comments in the > testcases for literals also). >> >> >> _Quoted_string appears to do two copies of the string, one for the >> constructor argument and one for the member variable, do they >> definitely get elided? > I looks that way. But all used of the template parm String are either > references or pointers so these operations should be efficient. > _Quoted_string should be used as a non-owning string thing. >> >> The members of _Quoted_string should be named _M_xxx not __xxx, to >> follow the coding style guidelines. > Done. >> >> What is __delim2 for? >> >> What if the first extraction in the operator>> fails, is doing >> __is.unget() the right thing to do? > Thanks. I'll return with __is rather than attempting to continue reading. >> >> You could simplify the quoted() overloads by using auto return type >> deduction, is it an intentional choice not to use that? > For some reason I forgot about auto return type in C++14. It sure > cleans things up nicely. Done. > Rebuilt and retested on x86_64 > OK, I added a static_assert to check that _String is only reference or pointer. I also added a tests that check the case where _String is 'const basic_string<>&'. Built and tested on x86_64-linux. OK? Ed 2013-06-08 Ed Smith-Rowland <3dw4rd@verizon.net> Implement N3654 - Quoted Strings Library Proposal * include/std/iomanip: Add quoted(String, Char delim, Char escape) manipulators and supporting machinery in c++1y mode. * testsuite/27_io/manipulators/standard/char/quoted.cc: New. * testsuite/27_io/manipulators/standard/wchar_t/quoted.cc: New. Index: include/std/iomanip =================================================================== --- include/std/iomanip (revision 199730) +++ include/std/iomanip (working copy) @@ -334,8 +334,161 @@ return __os; } -#endif +#if __cplusplus > 201103L + namespace __detail { + + /** + * @brief Struct for delimited strings. + * The left and right delimiters can be different. + */ + template + struct _Quoted_string + { + static_assert(is_reference<_String>::value + || is_pointer<_String>::value, + "String type must be pointer or reference"); + + _Quoted_string(_String __str, _CharT __del, _CharT __esc) + : _M_string(__str), _M_delim{__del}, _M_escape{__esc} + { } + + _Quoted_string& + operator=(_Quoted_string&) = delete; + + _String _M_string; + _CharT _M_delim; + _CharT _M_escape; + }; + + /** + * @brief Inserter for delimited strings. + * The left and right delimiters can be different. + */ + template + auto& + operator<<(std::basic_ostream<_CharT, _Traits>& __os, + const _Quoted_string& __str) + { + __os << __str._M_delim; + for (const _CharT* __c = __str._M_string; *__c; ++__c) + { + if (*__c == __str._M_delim || *__c == __str._M_escape) + __os << __str._M_escape; + __os << *__c; + } + __os << __str._M_delim; + + return __os; + } + + /** + * @brief Inserter for delimited strings. + * The left and right delimiters can be different. + */ + template + auto& + operator<<(std::basic_ostream<_CharT, _Traits>& __os, + const _Quoted_string<_String, _CharT>& __str) + { + __os << __str._M_delim; + for (auto& __c : __str._M_string) + { + if (__c == __str._M_delim || __c == __str._M_escape) + __os << __str._M_escape; + __os << __c; + } + __os << __str._M_delim; + + return __os; + } + + /** + * @brief Extractor for delimited strings. + * The left and right delimiters can be different. + */ + template + auto& + operator>>(std::basic_istream<_CharT, _Traits>& __is, + const _Quoted_string&, + _CharT>& __str) + { + __str._M_string.clear(); + + _CharT __c; + __is >> __c; + if (!__is.good()) + return __is; + if (__c != __str._M_delim) + { + __is.unget(); + __is >> __str._M_string; + return __is; + } + std::ios_base::fmtflags __flags + = __is.flags(__is.flags() & ~std::ios_base::skipws); + do + { + __is >> __c; + if (!__is.good()) + break; + if (__c == __str._M_escape) + { + __is >> __c; + if (!__is.good()) + break; + } + else if (__c == __str._M_delim) + break; + __str._M_string += __c; + } + while (true); + __is.setf(__flags); + + return __is; + } + + } // namespace __detail + + /** + * @brief Manipulator for quoted strings. + * @param __str String to quote. + * @param __delim Character to quote string with. + * @param __escape Escape character to escape itself or quote character. + */ + template + inline auto + quoted(const _CharT* __string, + _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\')) + { + return __detail::_Quoted_string(__string, __delim, + __escape); + } + + template + inline auto + quoted(const basic_string<_CharT, _Traits, _Alloc>& __string, + _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\')) + { + return __detail::_Quoted_string< + const basic_string<_CharT, _Traits, _Alloc>&, _CharT>( + __string, __delim, __escape); + } + + template + inline auto + quoted(basic_string<_CharT, _Traits, _Alloc>& __string, + _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\')) + { + return __detail::_Quoted_string< + basic_string<_CharT, _Traits, _Alloc>&, _CharT>( + __string, __delim, __escape); + } + +#endif // __cplusplus > 201103L + +#endif // __cplusplus >= 201103L + // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. Index: testsuite/27_io/manipulators/standard/char/quoted.cc =================================================================== --- testsuite/27_io/manipulators/standard/char/quoted.cc (revision 0) +++ testsuite/27_io/manipulators/standard/char/quoted.cc (working copy) @@ -0,0 +1,88 @@ +// { dg-do run } +// { dg-options "-std=gnu++1y" } + +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 27.7.6 - Quoted manipulators [quoted.manip] + +#include +#include +#include +#include + +void +test01() +{ + // Basic test from paper. + bool test [[gnu::unused]] = true; + std::stringstream ss; + std::string original = "foolish me"; + std::string round_trip; + ss << std::quoted(original); + ss >> std::quoted(round_trip); + VERIFY( original == round_trip ); +} + +void +test02() +{ + // Test skipws correctness. + bool test [[gnu::unused]] = true; + std::stringstream ss; + ss << std::quoted("Hello Goodbye") << ' ' << 1 << ' ' << 2; + std::string song; + int thing1, thing2; + ss >> std::quoted(song) >> thing1 >> thing2; + VERIFY( song == "Hello Goodbye" ); + VERIFY( thing1 == 1 ); + VERIFY( thing2 == 2 ); +} + +void +test03() +{ + // Test read of unquoted string. + bool test [[gnu::unused]] = true; + std::stringstream ss; + ss << "Alpha Omega"; + std::string testit; + ss >> std::quoted(testit); + VERIFY( testit == "Alpha" ); +} + +auto +test04(const std::string& message) +{ + // Test 'const basic_string&' + bool test [[gnu::unused]] = true; + std::stringstream ss; + ss << "** Error: " << std::quoted(message) << " **"; + return ss.str(); +} + +int +main() +{ + test01(); + test02(); + test03(); + auto ss = test04("My biscuits are burnin'!"); + VERIFY( ss == "** Error: \"My biscuits are burnin'!\" **" ); + + return 0; +} Index: testsuite/27_io/manipulators/standard/wchar_t/quoted.cc =================================================================== --- testsuite/27_io/manipulators/standard/wchar_t/quoted.cc (revision 0) +++ testsuite/27_io/manipulators/standard/wchar_t/quoted.cc (working copy) @@ -0,0 +1,88 @@ +// { dg-do run } +// { dg-options "-std=gnu++1y" } + +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 27.7.6 - Quoted manipulators [quoted.manip] + +#include +#include +#include +#include + +void +test01() +{ + // Basic test from paper. + bool test [[gnu::unused]] = true; + std::wstringstream ss; + std::wstring original = L"foolish me"; + std::wstring round_trip; + ss << std::quoted(original); + ss >> std::quoted(round_trip); + VERIFY( original == round_trip ); +} + +void +test02() +{ + // Test skipws correctness. + bool test [[gnu::unused]] = true; + std::wstringstream ss; + ss << std::quoted(L"Hello Goodbye") << L' ' << 1 << L' ' << 2; + std::wstring song; + int thing1, thing2; + ss >> std::quoted(song) >> thing1 >> thing2; + VERIFY( song == L"Hello Goodbye" ); + VERIFY( thing1 == 1 ); + VERIFY( thing2 == 2 ); +} + +void +test03() +{ + // Test read of unquoted string. + bool test [[gnu::unused]] = true; + std::wstringstream ss; + ss << L"Alpha Omega"; + std::wstring testit; + ss >> std::quoted(testit); + VERIFY( testit == L"Alpha" ); +} + +auto +test04(const std::wstring& message) +{ + // Test 'const basic_string&' + bool test [[gnu::unused]] = true; + std::wstringstream ss; + ss << L"** Error: " << std::quoted(message) << L" **"; + return ss.str(); +} + +int +main() +{ + test01(); + test02(); + test03(); + auto ss = test04(L"My biscuits are burnin'!"); + VERIFY( ss == L"** Error: \"My biscuits are burnin'!\" **" ); + + return 0; +}