From patchwork Thu Oct 7 11:25:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 67039 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]) by ozlabs.org (Postfix) with SMTP id 53E95B6F07 for ; Thu, 7 Oct 2010 22:25:27 +1100 (EST) Received: (qmail 28084 invoked by alias); 7 Oct 2010 11:25:20 -0000 Received: (qmail 28048 invoked by uid 22791); 7 Oct 2010 11:25:17 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from vsmtp3.tin.it (HELO vsmtp3.tin.it) (212.216.176.223) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Oct 2010 11:25:11 +0000 Received: from [192.168.0.4] (79.43.235.43) by vsmtp3.tin.it (8.5.113) id 4BCE36060C7D0281; Thu, 7 Oct 2010 13:25:08 +0200 Message-ID: <4CADAE14.1050409@oracle.com> Date: Thu, 07 Oct 2010 13:25:08 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Improve a bit time_get error checking X-IsSubscribed: yes 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 Hi, noticed while reviewing 45896 that we can do a bit better here, more improvements in the C++0x context. Tested x86_64-linux, committed. Paolo. ////////////////// 2010-10-07 Paolo Carlini * include/bits/locale_facets_nonio.tcc (time_get<>:: _M_extract_via_format): Tighten somewhat error checking. * testsuite/22_locale/time_get/get_time/char/6.cc: New. * testsuite/22_locale/time_get/get_time/wchar_t/6.cc: Likewise. Index: include/bits/locale_facets_nonio.tcc =================================================================== --- include/bits/locale_facets_nonio.tcc (revision 165087) +++ include/bits/locale_facets_nonio.tcc (working copy) @@ -633,7 +633,8 @@ const size_t __len = char_traits<_CharT>::length(__format); ios_base::iostate __tmperr = ios_base::goodbit; - for (size_t __i = 0; __beg != __end && __i < __len && !__tmperr; ++__i) + size_t __i = 0; + for (; __beg != __end && __i < __len && !__tmperr; ++__i) { if (__ctype.narrow(__format[__i], 0) == '%') { @@ -827,7 +828,7 @@ } } - if (__tmperr) + if (__tmperr || __i != __len) __err |= ios_base::failbit; return __beg; Index: testsuite/22_locale/time_get/get_time/wchar_t/6.cc =================================================================== --- testsuite/22_locale/time_get/get_time/wchar_t/6.cc (revision 0) +++ testsuite/22_locale/time_get/get_time/wchar_t/6.cc (revision 0) @@ -0,0 +1,71 @@ +// 2010-10-07 Paolo Carlini + +// Copyright (C) 2010 Free Software Foundation +// +// 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 +// . + +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef wstring::const_iterator iter_type; + typedef time_get time_get_type; + const ios_base::iostate goodbit = ios_base::goodbit; + const ios_base::iostate eofbit = ios_base::eofbit; + const ios_base::iostate failbit = ios_base::failbit; + ios_base::iostate err = goodbit; + const locale loc_c = locale::classic(); + + // Create "C" time objects + tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); + tm tm1 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); + + wistringstream iss; + iss.imbue(locale(loc_c, new time_get_type)); + + // Iterator advanced, state, output. + const time_get_type& tg = use_facet(iss.getloc()); + + const wstring str0 = L"12"; + tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); + VERIFY( err == (failbit | eofbit) ); + VERIFY( tm0.tm_sec == 0 ); + VERIFY( tm0.tm_min == 0 ); + // This is quite hard to guarantee now, revisit together with DR 461 + // in the C++0x context. + // VERIFY( tm0.tm_hour == 0 ); + + const wstring str1 = L"12:30 "; + err = goodbit; + iter_type end1 = tg.get_time(str1.begin(), str1.end(), iss, err, &tm1); + VERIFY( err == failbit ); + VERIFY( *end1 == ' ' ); + VERIFY( tm1.tm_sec == 0 ); + // See above... + // VERIFY( tm1.tm_min == 0 ); + // VERIFY( tm1.tm_hour == 0 ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/22_locale/time_get/get_time/char/6.cc =================================================================== --- testsuite/22_locale/time_get/get_time/char/6.cc (revision 0) +++ testsuite/22_locale/time_get/get_time/char/6.cc (revision 0) @@ -0,0 +1,71 @@ +// 2010-10-07 Paolo Carlini + +// Copyright (C) 2010 Free Software Foundation +// +// 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 +// . + +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef string::const_iterator iter_type; + typedef time_get time_get_type; + const ios_base::iostate goodbit = ios_base::goodbit; + const ios_base::iostate eofbit = ios_base::eofbit; + const ios_base::iostate failbit = ios_base::failbit; + ios_base::iostate err = goodbit; + const locale loc_c = locale::classic(); + + // Create "C" time objects + tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); + tm tm1 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); + + istringstream iss; + iss.imbue(locale(loc_c, new time_get_type)); + + // Iterator advanced, state, output. + const time_get_type& tg = use_facet(iss.getloc()); + + const string str0 = "12"; + tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); + VERIFY( err == (failbit | eofbit) ); + VERIFY( tm0.tm_sec == 0 ); + VERIFY( tm0.tm_min == 0 ); + // This is quite hard to guarantee now, revisit together with DR 461 + // in the C++0x context. + // VERIFY( tm0.tm_hour == 0 ); + + const string str1 = "12:30 "; + err = goodbit; + iter_type end1 = tg.get_time(str1.begin(), str1.end(), iss, err, &tm1); + VERIFY( err == failbit ); + VERIFY( *end1 == ' ' ); + VERIFY( tm1.tm_sec == 0 ); + // See above... + // VERIFY( tm1.tm_min == 0 ); + // VERIFY( tm1.tm_hour == 0 ); +} + +int main() +{ + test01(); + return 0; +}