This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] regex undefinitions
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Date: Mon, 5 Jan 2009 17:15:40 -0800
- Subject: [v3] regex undefinitions
Consistent removal of function definitions for things marked
unimplemented or to-do in <regex>. Then, change the existing
dg-do link test cases to dg-do compile. Clearly, when more of this is
implemented the testcases with execute components (ie, anything with
VERIFY) should be dg-do run as per usual.
tested x86_64/linux
-benjamin
2009-01-05 Benjamin Kosnik <bkoz@redhat.com>
* include/tr1_impl/regex: Remove unimplemented function definitions.
* testsuite/28_regex/init-list.cc: Compile only.
* testsuite/tr1/7_regular_expressions/regex/cons/char/
c_string_extended.cc: Same.
* testsuite/tr1/7_regular_expressions/basic_regex/assign/*: Same.
* testsuite/tr1/7_regular_expressions/basic_regex/ctors/*: Same.
Index: include/tr1_impl/regex
===================================================================
--- include/tr1_impl/regex (revision 143109)
+++ include/tr1_impl/regex (working copy)
@@ -1,6 +1,6 @@
// class template regex -*- C++ -*-
-// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 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
@@ -535,8 +535,7 @@
*/
template<typename _Fwd_iter>
string_type
- transform_primary(_Fwd_iter __first, _Fwd_iter __last) const
- { return string_type(); }
+ transform_primary(_Fwd_iter __first, _Fwd_iter __last) const;
/**
* @brief Gets a collation element by name.
@@ -553,8 +552,7 @@
*/
template<typename _Fwd_iter>
string_type
- lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const
- { return string_type(); }
+ lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const;
/**
* @brief Maps one or mire characters to a named character
@@ -591,8 +589,7 @@
*/
template<typename _Fwd_iter>
char_class_type
- lookup_classname(_Fwd_iter __first, _Fwd_iter __last) const
- { return 0; }
+ lookup_classname(_Fwd_iter __first, _Fwd_iter __last) const;
/**
* @brief Determines if @p c is a member of an identified class.
@@ -1043,8 +1040,7 @@
* @brief Compiles a regular expression pattern into a NFA.
* @todo Implement this function.
*/
- void _M_compile()
- { }
+ void _M_compile();
protected:
flag_type _M_flags;
@@ -1995,8 +1991,7 @@
_Out_iter
format(_Out_iter __out, const string_type& __fmt,
regex_constants::match_flag_type __flags
- = regex_constants::format_default) const
- { return __out; }
+ = regex_constants::format_default) const;
/**
* @todo Implement this function.
@@ -2120,8 +2115,7 @@
match_results<_Bi_iter, _Allocator>& __m,
const basic_regex<_Ch_type, _Rx_traits>& __re,
regex_constants::match_flag_type __flags
- = regex_constants::match_default)
- { return false; }
+ = regex_constants::match_default);
/**
* @brief Indicates if there is a match between the regular expression @p e
@@ -2262,8 +2256,7 @@
match_results<_Bi_iter, _Allocator>& __m,
const basic_regex<_Ch_type, _Rx_traits>& __re,
regex_constants::match_flag_type __flags
- = regex_constants::match_default)
- { return false; }
+ = regex_constants::match_default);
/**
* Searches for a regular expression within a range.
@@ -2396,8 +2389,7 @@
const basic_regex<_Ch_type, _Rx_traits>& __e,
const basic_string<_Ch_type>& __fmt,
regex_constants::match_flag_type __flags
- = regex_constants::match_default)
- { return __out; }
+ = regex_constants::match_default);
/**
* @doctodo
Index: testsuite/28_regex/init-list.cc
===================================================================
--- testsuite/28_regex/init-list.cc (revision 143109)
+++ testsuite/28_regex/init-list.cc (working copy)
@@ -1,4 +1,7 @@
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2008, 2009 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
@@ -25,8 +28,6 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-// { dg-options "-std=gnu++0x" }
-
#include <regex>
#include <testsuite_hooks.h>
@@ -38,13 +39,11 @@
regex r = { 'a', 'b', 'c' };
cmatch res;
- // Enable when regex class actually implemented.
- // VERIFY(regex_match ("abc", res, r));
+ VERIFY(regex_match ("abc", res, r));
VERIFY(!regex_match ("ab", res, r));
r = { 'd', 'e', 'f' };
- // Enable when regex class actually implemented.
- // VERIFY(regex_match ("def", res, r));
+ VERIFY(regex_match ("def", res, r));
VERIFY(!regex_match ("abc", res, r));
return test;
Index: testsuite/tr1/7_regular_expressions/regex/cons/char/c_string_extended.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/regex/cons/char/c_string_extended.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/regex/cons/char/c_string_extended.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do run }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/range.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/range.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/range.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string_op.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string_op.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string_op.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/pstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/pstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/pstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/string.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring_op.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring_op.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring_op.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/wchar_t/cstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/range.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/range.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/range.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string_op.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string_op.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string_op.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/pstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/pstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/pstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/string.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring_op.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring_op.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring_op.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/assign/char/cstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/range.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/range.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/range.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/default.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/default.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/default.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/pstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/pstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/pstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/string.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/string.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/string.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/cstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/cstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/wchar_t/cstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/range.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/range.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/range.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/default.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/default.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/default.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/pstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/pstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/pstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/string.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/string.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/string.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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
Index: testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/cstring.cc
===================================================================
--- testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/cstring.cc (revision 143109)
+++ testsuite/tr1/7_regular_expressions/basic_regex/ctors/char/cstring.cc (working copy)
@@ -1,8 +1,8 @@
-// { dg-do link }
+// { dg-do compile }
// 2007-03-12 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009 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