Skip to content

R
riscv-gcc-1
Commit 7c812a2a by Tim Shen
Options

regex_automaton.h: Add dummy node type. 

2013-09-05  Tim Shen  <timshen91@gmail.com>

	* include/bits/regex_automaton.h: Add dummy node type. Rewrite
	_StateSeq.
	* include/bits/regex_automaton.tcc: Implement them.
	* include/bits/regex_compiler.h: Rewrite _Compiler to use new
	_StateSeq interfaces.
	* include/bits/regex_compiler.tcc: Implement them.
	* include/bits/regex_scanner.h: Add word boundry assertion token.
	* include/bits/regex_scanner.tcc (_Scanner<>::_M_eat_escape_ecma):
	Support word boundry.
	* testsuite/28_regex/algorithms/regex_match/basic/
	string_range_02_03.cc: Remove "xfail".
	* testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	string_range_02_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	cstring_questionmark.cc: Remove xfail and get correct length of
	c-string.
	* testsuite/28_regex/algorithms/regex_match/extended/
	string_range_00_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc:
	New.
	* testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc:
	New.
	* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc: New.

From-SVN: r202290
parent e6523306
Showing with 382 additions and 171 deletions
libstdc++-v3/ChangeLog
2013-09-05 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.h: Add dummy node type. Rewrite
_StateSeq.
* include/bits/regex_automaton.tcc: Implement them.
* include/bits/regex_compiler.h: Rewrite _Compiler to use new
_StateSeq interfaces.
* include/bits/regex_compiler.tcc: Implement them.
* include/bits/regex_scanner.h: Add word boundry assertion token.
* include/bits/regex_scanner.tcc (_Scanner<>::_M_eat_escape_ecma):
Support word boundry.
* testsuite/28_regex/algorithms/regex_match/basic/
string_range_02_03.cc: Remove "xfail".
* testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc:
Likewise.
* testsuite/28_regex/algorithms/regex_match/extended/
string_range_02_03.cc: Likewise.
* testsuite/28_regex/algorithms/regex_match/extended/
cstring_questionmark.cc: Remove xfail and get correct length of
c-string.
* testsuite/28_regex/algorithms/regex_match/extended/
string_range_00_03.cc: Likewise.
* testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc:
New.
* testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc:
New.
* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc: New.
2013-09-03 Paolo Carlini <paolo.carlini@oracle.com> 2013-09-03 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/58302 PR libstdc++/58302
* include/bits/random.tcc (negative_binomial_distribution<>:: * include/bits/random.tcc (negative_binomial_distribution<>::
operator()(_UniformRandomNumberGenerator&, const param_type&): operator()(_UniformRandomNumberGenerator&, const param_type&)):
Fix typo in template argument. Fix typo in template argument.
* testsuite/26_numerics/random/negative_binomial_distribution/ * testsuite/26_numerics/random/negative_binomial_distribution/
operators/58302.cc: New. operators/58302.cc: New.
......
libstdc++-v3/include/bits/regex_automaton.h
...@@ -56,6 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -56,6 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_opcode_backref = 2, _S_opcode_backref = 2,
_S_opcode_subexpr_begin = 4, _S_opcode_subexpr_begin = 4,
_S_opcode_subexpr_end = 5, _S_opcode_subexpr_end = 5,
_S_opcode_dummy = 6,
_S_opcode_match = 100, _S_opcode_match = 100,
_S_opcode_accept = 255 _S_opcode_accept = 255
}; };
...@@ -69,7 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -69,7 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_OpcodeT _M_opcode; // type of outgoing transition _OpcodeT _M_opcode; // type of outgoing transition
_StateIdT _M_next; // outgoing transition _StateIdT _M_next; // outgoing transition
union // Since they are mutual exclusive. union // Since they are mutually exclusive.
{ {
_StateIdT _M_alt; // for _S_opcode_alternative _StateIdT _M_alt; // for _S_opcode_alternative
unsigned int _M_subexpr; // for _S_opcode_subexpr_* unsigned int _M_subexpr; // for _S_opcode_subexpr_*
...@@ -201,6 +202,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -201,6 +202,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_StateIdT _StateIdT
_M_insert_backref(unsigned int __index); _M_insert_backref(unsigned int __index);
_StateIdT
_M_insert_dummy()
{
this->push_back(_StateT(_S_opcode_dummy));
return this->size()-1;
}
_StateIdT
_M_insert_state(_StateT __s)
{
this->push_back(__s);
return this->size()-1;
}
// Eliminate dummy node in this NFA to make it compact.
void
_M_eliminate_dummy();
#ifdef _GLIBCXX_DEBUG #ifdef _GLIBCXX_DEBUG
std::ostream& std::ostream&
_M_dot(std::ostream& __ostr) const; _M_dot(std::ostream& __ostr) const;
...@@ -222,58 +241,40 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -222,58 +241,40 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
public: public:
typedef _NFA<_CharT, _TraitsT> _RegexT; typedef _NFA<_CharT, _TraitsT> _RegexT;
public:
// Constructs a single-node sequence
_StateSeq(_RegexT& __ss, _StateIdT __s,
_StateIdT __e = _S_invalid_state_id)
: _M_nfa(__ss), _M_start(__s), _M_end1(__s), _M_end2(__e)
{ }
// Constructs a split sequence from two other sequencces
_StateSeq(const _StateSeq& __e1, const _StateSeq& __e2)
: _M_nfa(__e1._M_nfa),
_M_start(_M_nfa._M_insert_alt(__e1._M_start, __e2._M_start)),
_M_end1(__e1._M_end1), _M_end2(__e2._M_end1)
{ }
// Constructs a split sequence from a single sequence public:
_StateSeq(const _StateSeq& __e, _StateIdT __id) _StateSeq(_RegexT& __nfa, _StateIdT __s)
: _M_nfa(__e._M_nfa), : _StateSeq(__nfa, __s, __s)
_M_start(_M_nfa._M_insert_alt(__id, __e._M_start)),
_M_end1(__id), _M_end2(__e._M_end1)
{ } { }
// Constructs a copy of a %_StateSeq _StateSeq(_RegexT& __nfa, _StateIdT __s, _StateIdT __end)
_StateSeq(const _StateSeq& __rhs) : _M_nfa(__nfa), _M_start(__s), _M_end(__end)
: _M_nfa(__rhs._M_nfa), _M_start(__rhs._M_start),
_M_end1(__rhs._M_end1), _M_end2(__rhs._M_end2)
{ } { }
_StateSeq& operator=(const _StateSeq& __rhs); // Append a state on *this and change *this to the new sequence.
_StateIdT
_M_front() const
{ return _M_start; }
// Extends a sequence by one.
void
_M_push_back(_StateIdT __id);
// Extends and maybe joins a sequence.
void void
_M_append(_StateIdT __id); _M_append(_StateIdT __id)
{
_M_nfa[_M_end]._M_next = __id;
_M_end = __id;
}
// Append a sequence on *this and change *this to the new sequence.
void void
_M_append(_StateSeq& __rhs); _M_append(const _StateSeq& __s)
{
_M_nfa[_M_end]._M_next = __s._M_start;
_M_end = __s._M_end;
}
// Clones an entire sequence. // Clones an entire sequence.
_StateIdT _StateSeq
_M_clone(); _M_clone();
private: public:
_RegexT& _M_nfa; _RegexT& _M_nfa;
_StateIdT _M_start; _StateIdT _M_start;
_StateIdT _M_end1; _StateIdT _M_end;
_StateIdT _M_end2;
}; };
//@} regex-detail //@} regex-detail
......
libstdc++-v3/include/bits/regex_automaton.tcc
...@@ -102,9 +102,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -102,9 +102,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
case _S_opcode_accept: case _S_opcode_accept:
__ostr << __id << " [label=\"" << __id << "\\nACC\"];\n" ; __ostr << __id << " [label=\"" << __id << "\\nACC\"];\n" ;
break; break;
case _S_opcode_dummy:
break;
default: default:
__ostr << __id << " [label=\"" << __id << "\\nUNK\"];\n" _GLIBCXX_DEBUG_ASSERT(false);
<< __id << " -> " << _M_next << " [label=\"?\"];\n";
break; break;
} }
return __ostr; return __ostr;
...@@ -145,66 +146,62 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -145,66 +146,62 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _CharT, typename _TraitsT> template<typename _CharT, typename _TraitsT>
_StateSeq<_CharT, _TraitsT>& _StateSeq<_CharT, _TraitsT>:: void _NFA<_CharT, _TraitsT>::
operator=(const _StateSeq& __rhs) _M_eliminate_dummy()
{
_M_start = __rhs._M_start;
_M_end1 = __rhs._M_end1;
_M_end2 = __rhs._M_end2;
return *this;
}
template<typename _CharT, typename _TraitsT>
void _StateSeq<_CharT, _TraitsT>::
_M_push_back(_StateIdT __id)
{ {
if (_M_end1 != _S_invalid_state_id) for (auto& __it : *this)
_M_nfa[_M_end1]._M_next = __id; {
_M_end1 = __id; while (__it._M_next >= 0 && (*this)[__it._M_next]._M_opcode
== _S_opcode_dummy)
__it._M_next = (*this)[__it._M_next]._M_next;
if (__it._M_opcode == _S_opcode_alternative)
while (__it._M_alt >= 0 && (*this)[__it._M_alt]._M_opcode
== _S_opcode_dummy)
__it._M_alt = (*this)[__it._M_alt]._M_next;
}
} }
// Just apply DFS on the sequence and re-link their links.
template<typename _CharT, typename _TraitsT> template<typename _CharT, typename _TraitsT>
void _StateSeq<_CharT, _TraitsT>:: _StateSeq<_CharT, _TraitsT> _StateSeq<_CharT, _TraitsT>::
_M_append(_StateIdT __id) _M_clone()
{
if (_M_end2 != _S_invalid_state_id)
{
if (_M_end2 == _M_end1)
_M_nfa[_M_end2]._M_alt = __id;
else
_M_nfa[_M_end2]._M_next = __id;
_M_end2 = _S_invalid_state_id;
}
if (_M_end1 != _S_invalid_state_id)
_M_nfa[_M_end1]._M_next = __id;
_M_end1 = __id;
}
template<typename _CharT, typename _TraitsT>
void _StateSeq<_CharT, _TraitsT>::
_M_append(_StateSeq& __rhs)
{ {
if (_M_end2 != _S_invalid_state_id) std::map<_StateIdT, _StateIdT> __m;
{ std::stack<_StateIdT> __stack;
if (_M_end2 == _M_end1) __stack.push(_M_start);
_M_nfa[_M_end2]._M_alt = __rhs._M_start; while (!__stack.empty())
else {
_M_nfa[_M_end2]._M_next = __rhs._M_start; auto __u = __stack.top();
_M_end2 = _S_invalid_state_id; __stack.pop();
} auto __dup = _M_nfa[__u];
if (__rhs._M_end2 != _S_invalid_state_id) auto __id = _M_nfa._M_insert_state(__dup);
_M_end2 = __rhs._M_end2; __m[__u] = __id;
if (_M_end1 != _S_invalid_state_id) if (__u == _M_end)
_M_nfa[_M_end1]._M_next = __rhs._M_start; continue;
_M_end1 = __rhs._M_end1; if (__m.count(__dup._M_next) == 0)
__stack.push(__dup._M_next);
if (__dup._M_opcode == _S_opcode_alternative)
if (__m.count(__dup._M_alt) == 0)
__stack.push(__dup._M_alt);
}
for (auto __it : __m)
{
auto& __ref = _M_nfa[__it.second];
if (__ref._M_next != -1)
{
_GLIBCXX_DEBUG_ASSERT(__m.count(__ref._M_next));
__ref._M_next = __m[__ref._M_next];
}
if (__ref._M_opcode == _S_opcode_alternative)
if (__ref._M_alt != -1)
{
_GLIBCXX_DEBUG_ASSERT(__m.count(__ref._M_alt));
__ref._M_alt = __m[__ref._M_alt];
}
}
return _StateSeq(_M_nfa, __m[_M_start], __m[_M_end]);
} }
// @todo implement this function.
template<typename _CharT, typename _TraitsT>
_StateIdT _StateSeq<_CharT, _TraitsT>::
_M_clone()
{ return 0; }
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
} // namespace } // namespace
libstdc++-v3/include/bits/regex_compiler.h
...@@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
std::shared_ptr<_RegexT> std::shared_ptr<_RegexT>
_M_get_nfa() const _M_get_nfa() const
{ return std::shared_ptr<_RegexT>(new _RegexT(_M_state_store)); } { return std::shared_ptr<_RegexT>(new _RegexT(_M_nfa)); }
private: private:
typedef _Scanner<_FwdIter> _ScannerT; typedef _Scanner<_FwdIter> _ScannerT;
...@@ -64,6 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -64,6 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _StateSeq<_CharT, _TraitsT> _StateSeqT; typedef _StateSeq<_CharT, _TraitsT> _StateSeqT;
typedef std::stack<_StateSeqT, std::vector<_StateSeqT>> _StackT; typedef std::stack<_StateSeqT, std::vector<_StateSeqT>> _StackT;
typedef _BracketMatcher<_CharT, _TraitsT> _BMatcherT; typedef _BracketMatcher<_CharT, _TraitsT> _BMatcherT;
typedef std::ctype<_CharT> _CtypeT;
// accepts a specific token or returns false. // accepts a specific token or returns false.
bool bool
...@@ -91,21 +92,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -91,21 +92,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_bracket_expression(); _M_bracket_expression();
void void
_M_bracket_list(_BMatcherT& __matcher);
bool
_M_follow_list(_BMatcherT& __matcher);
void
_M_expression_term(_BMatcherT& __matcher); _M_expression_term(_BMatcherT& __matcher);
bool bool
_M_range_expression(_BMatcherT& __matcher); _M_range_expression(_BMatcherT& __matcher);
bool bool
_M_start_range(_BMatcherT& __matcher);
bool
_M_collating_symbol(_BMatcherT& __matcher); _M_collating_symbol(_BMatcherT& __matcher);
bool bool
...@@ -120,12 +112,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -120,12 +112,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool bool
_M_try_char(); _M_try_char();
_CharT _StateSeqT
_M_get_char(); _M_pop()
{
auto ret = _M_stack.top();
_M_stack.pop();
return ret;
}
const _TraitsT& _M_traits; const _TraitsT& _M_traits;
const _CtypeT& _M_ctype;
_ScannerT _M_scanner; _ScannerT _M_scanner;
_RegexT _M_state_store; _RegexT _M_nfa;
_StringT _M_value; _StringT _M_value;
_StackT _M_stack; _StackT _M_stack;
_FlagT _M_flags; _FlagT _M_flags;
......
libstdc++-v3/include/bits/regex_scanner.h
...@@ -86,6 +86,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -86,6 +86,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_token_closure1, _S_token_closure1,
_S_token_line_begin, _S_token_line_begin,
_S_token_line_end, _S_token_line_end,
_S_token_word_bound,
_S_token_neg_word_bound,
_S_token_comma, _S_token_comma,
_S_token_dup_count, _S_token_dup_count,
_S_token_eof, _S_token_eof,
......
libstdc++-v3/include/bits/regex_scanner.tcc
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* Do not attempt to use it directly. @headername{regex} * Do not attempt to use it directly. @headername{regex}
*/ */
// TODO make comments doxygen format // TODO make comments doxygen format.
// N3376 specified 6 regex styles: ECMAScript, basic, extended, grep, egrep // N3376 specified 6 regex styles: ECMAScript, basic, extended, grep, egrep
// and awk // and awk
...@@ -370,10 +370,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -370,10 +370,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_token = _S_token_ord_char; _M_token = _S_token_ord_char;
_M_value.assign(1, _M_escape_map.at(__c)); _M_value.assign(1, _M_escape_map.at(__c));
} }
else if (__c == 'b')
_M_token = _S_token_word_bound;
else if (__c == 'B')
_M_token = _S_token_neg_word_bound;
// N3376 28.13 // N3376 28.13
else if (__c == 'b' else if (__c == 'd'
|| __c == 'B'
|| __c == 'd'
|| __c == 'D' || __c == 'D'
|| __c == 's' || __c == 's'
|| __c == 'S' || __c == 'S'
......
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// { dg-do run { xfail *-*-* } }
// //
// 2010-06-16 Stephen M. Webb <stephen.webb@bregmasoft.ca> // 2010-06-16 Stephen M. Webb <stephen.webb@bregmasoft.ca>
......
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc 0 → 100644
// { dg-options "-std=gnu++11" }
//
// 2013-09-05 Tim Shen <timshen91@gmail.com>
//
// 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
// <http://www.gnu.org/licenses/>.
// 28.11.2 regex_match
// Tests ECMAScript \d \D \s \S \w \W
#include <regex>
#include <testsuite_hooks.h>
using namespace std;
void
test01()
{
bool test __attribute__((unused)) = true;
VERIFY(regex_match("01", regex("\\d*")));
VERIFY(regex_match("asdfjkl", regex("\\D*")));
VERIFY(!regex_match("asdfjkl0", regex("\\D*")));
VERIFY(regex_match("\r\t\v\f ", regex("\\s*")));
VERIFY(regex_match("asdfjkl", regex("\\S*")));
VERIFY(!regex_match("asdfjkl\r", regex("\\S*")));
VERIFY(regex_match("_az", regex("\\w*")));
VERIFY(regex_match("!@#$%", regex("\\W*")));
VERIFY(!regex_match("_01234", regex("\\W*")));
}
int
main()
{
test01();
return 0;
}
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// { dg-do run { xfail *-*-* } }
// //
// 2010-06-21 Stephen M. Webb <stephen.webb@bregmasoft.ca> // 2010-06-21 Stephen M. Webb <stephen.webb@bregmasoft.ca>
...@@ -32,27 +31,31 @@ test01() ...@@ -32,27 +31,31 @@ test01()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::regex re("(a+)", std::regex::extended); std::regex re("(a+)", std::regex::extended);
const char target[] = "aa"; const char target[] = "aa";
std::cmatch m; std::cmatch m;
VERIFY( std::regex_match(target, m, re) ); VERIFY( std::regex_match(target, m, re) );
VERIFY( re.mark_count() == 1 ); VERIFY( re.mark_count() == 1 );
VERIFY( m.size() == re.mark_count()+1 ); VERIFY( m.size() == re.mark_count()+1 );
VERIFY( m.empty() == false ); VERIFY( m.empty() == false );
VERIFY( m.prefix().first == target ); VERIFY( m.prefix().first == target );
VERIFY( m.prefix().second == target ); VERIFY( m.prefix().second == target );
VERIFY( m.prefix().matched == false ); VERIFY( m.prefix().matched == false );
VERIFY( m.suffix().first == target+sizeof(target) ); VERIFY( m.suffix().first == target+sizeof(target)-1 );
VERIFY( m.suffix().second == target+sizeof(target) ); VERIFY( m.suffix().second == target+sizeof(target)-1 );
VERIFY( m.suffix().matched == false ); VERIFY( m.suffix().matched == false );
VERIFY( m[0].first == target ); VERIFY( m[0].first == target );
VERIFY( m[0].second == target+sizeof(target) ); VERIFY( m[0].second == target+sizeof(target)-1 );
VERIFY( m[0].matched == true ); VERIFY( m[0].matched == true );
VERIFY( m[1].first == target ); VERIFY( m[1].first == target );
VERIFY( m[1].second == target+sizeof(target) ); VERIFY( m[1].second == target+sizeof(target)-1 );
VERIFY( m[1].matched == true ); VERIFY( m[1].matched == true );
VERIFY(!std::regex_match("", std::regex("a+", std::regex::extended)));
VERIFY(std::regex_match("a", std::regex("a+", std::regex::extended)));
VERIFY(std::regex_match("aa", std::regex("a+", std::regex::extended)));
} }
......
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// { dg-do run { xfail *-*-* } }
// //
// 2010-06-21 Stephen M. Webb <stephen.webb@bregmasoft.ca> // 2010-06-21 Stephen M. Webb <stephen.webb@bregmasoft.ca>
...@@ -32,27 +31,31 @@ test01() ...@@ -32,27 +31,31 @@ test01()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::regex re("(aa?)", std::regex::extended); std::regex re("(aa?)", std::regex::extended);
char target[] = "a"; char target[] = "a";
std::cmatch m; std::cmatch m;
VERIFY( std::regex_match(target, m, re) ); VERIFY( std::regex_match(target, m, re) );
VERIFY( re.mark_count() == 1 ); VERIFY( re.mark_count() == 1 );
VERIFY( m.size() == re.mark_count()+1 ); VERIFY( m.size() == re.mark_count()+1 );
VERIFY( m.empty() == false ); VERIFY( m.empty() == false );
VERIFY( m.prefix().first == target ); VERIFY( m.prefix().first == target );
VERIFY( m.prefix().second == target ); VERIFY( m.prefix().second == target );
VERIFY( m.prefix().matched == false ); VERIFY( m.prefix().matched == false );
VERIFY( m.suffix().first == target+sizeof(target) ); VERIFY( m.suffix().first == target+sizeof(target)-1 );
VERIFY( m.suffix().second == target+sizeof(target) ); VERIFY( m.suffix().second == target+sizeof(target)-1 );
VERIFY( m.suffix().matched == false ); VERIFY( m.suffix().matched == false );
VERIFY( m[0].first == target ); VERIFY( m[0].first == target );
VERIFY( m[0].second == target+sizeof(target) ); VERIFY( m[0].second == target+sizeof(target)-1 );
VERIFY( m[0].matched == true ); VERIFY( m[0].matched == true );
VERIFY( m[1].first == target ); VERIFY( m[1].first == target );
VERIFY( m[1].second == target+sizeof(target) ); VERIFY( m[1].second == target+sizeof(target)-1 );
VERIFY( m[1].matched == true ); VERIFY( m[1].matched == true );
VERIFY(std::regex_match("", std::regex("a?", std::regex::extended)));
VERIFY(std::regex_match("a", std::regex("a?", std::regex::extended)));
VERIFY(!std::regex_match("aa", std::regex("a?", std::regex::extended)));
} }
......
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc 0 → 100644
// { dg-options "-std=gnu++11" }
//
// 2013-09-05 Tim Shen <timshen91@gmail.com>
//
// 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
// <http://www.gnu.org/licenses/>.
// 28.11.2 regex_match
// Tests Extended interval range.
#include <regex>
#include <testsuite_hooks.h>
using namespace std;
void
test01()
{
bool test __attribute__((unused)) = true;
regex re;
re.assign("(ab){3}", std::regex::extended);
VERIFY(!regex_match("abab", re));
VERIFY(regex_match("ababab", re));
VERIFY(!regex_match("abababab", re));
re.assign("(ab){3,}", std::regex::extended);
VERIFY(!regex_match("abab", re));
VERIFY(regex_match("ababab", re));
VERIFY(regex_match("abababab", re));
VERIFY(regex_match("ababababab", re));
re.assign("(ab){0,3}", std::regex::extended);
VERIFY(regex_match("", re));
VERIFY(regex_match("ab", re));
VERIFY(regex_match("abab", re));
VERIFY(regex_match("ababab", re));
VERIFY(!regex_match("abababab", re));
re.assign("(a|b){0,2}", std::regex::extended);
VERIFY(regex_match("", re));
VERIFY(regex_match("a", re));
VERIFY(regex_match("b", re));
VERIFY(regex_match("aa", re));
VERIFY(regex_match("ab", re));
VERIFY(regex_match("ba", re));
VERIFY(regex_match("bb", re));
VERIFY(!regex_match("aaa", re));
}
int
main()
{
test01();
return 0;
}
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
...@@ -31,23 +31,23 @@ test01() ...@@ -31,23 +31,23 @@ test01()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::regex re("a{0,3}", std::regex::extended); std::regex re("a{0,3}", std::regex::extended);
std::string target("aa"); std::string target("aa");
std::smatch m; std::smatch m;
VERIFY( std::regex_match(target, m, re) ); VERIFY( std::regex_match(target, m, re) );
VERIFY( m.size() == re.mark_count()+1 ); VERIFY( m.size() == re.mark_count()+1 );
VERIFY( m.empty() == false ); VERIFY( m.empty() == false );
VERIFY( m.prefix().first == target.begin() ); VERIFY( m.prefix().first == target.begin() );
VERIFY( m.prefix().second == target.begin() ); VERIFY( m.prefix().second == target.begin() );
VERIFY( m.prefix().matched == false ); VERIFY( m.prefix().matched == false );
VERIFY( m.suffix().first == target.end() ); VERIFY( m.suffix().first == target.end() );
VERIFY( m.suffix().second == target.end() ); VERIFY( m.suffix().second == target.end() );
VERIFY( m.suffix().matched == false ); VERIFY( m.suffix().matched == false );
VERIFY( m[0].first == target.begin() ); VERIFY( m[0].first == target.begin() );
VERIFY( m[0].second == target.end() ); VERIFY( m[0].second == target.end() );
VERIFY( m[0].matched == true ); VERIFY( m[0].matched == true );
} }
......
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// { dg-do run { xfail *-*-* } }
// //
// 2010-06-16 Stephen M. Webb <stephen.webb@bregmasoft.ca> // 2010-06-16 Stephen M. Webb <stephen.webb@bregmasoft.ca>
......
libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc 0 → 100644
// { dg-options "-std=gnu++11" }
// { dg-require-namedlocale "en_US.UTF-8" }
// { dg-do run { xfail *-*-* } }
//
// 2013-09-05 Tim Shen <timshen91@gmail.com>
//
// 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
// <http://www.gnu.org/licenses/>.
// 28.12.1 regex_iterator
// Tests regex_iterator class
#include <regex>
#include <testsuite_hooks.h>
void
test01()
{
bool test __attribute__((unused)) = true;
std::setlocale(LC_ALL, "en_US.UTF-8");
std::wstring str2 = L"ä\u2009Ä\u2009ö\u2009Ö\u2009ü\u2009Ü";
std::wregex re2;
re2.imbue(std::locale("en_US.UTF-8"));
re2.assign(L"([[:lower:]]{0,1}[[:space:]]{0,1}[[:upper:]]{0,1})");
std::wsregex_iterator p(str2.begin(), str2.end(), re2);
auto a = p;
++p;
VERIFY(a != p);
//for (std::wsregex_iterator p(str2.begin(), str2.end(), re2);
// p != std::wsregex_iterator{}; ++p)
// std::wcout << (*p)[1] << std::endl;
}
int
main()
{
test01();
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment