+2013-10-18 Tim Shen <timshen91@gmail.com>
+
+ * include/bits/regex_scanner.tcc: (_Scanner<>::_M_scan_normal,
+ _Scanner<>::_M_eat_escape_ecma, _Scanner<>::_M_eat_escape_posix,
+ _Scanner<>::_M_eat_escape_awk): Narrow character before finding in maps.
+ * testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc:
+ New.
+
2013-10-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (regex_token_iterator<>::regex_token_iterator):
_M_state = _S_state_in_brace;
_M_token = _S_token_interval_begin;
}
- else if ((_M_spec_char.count(__c)
+ else if ((_M_spec_char.count(_M_ctype.narrow(__c, '\0'))
&& __c != ']'
&& __c != '}')
|| (_M_is_grep() && __c == '\n'))
auto __c = *_M_current++;
- if (_M_escape_map.count(__c)
+ if (_M_escape_map.count(_M_ctype.narrow(__c, '\0'))
&& (__c != 'b' || _M_state == _S_state_in_bracket))
{
_M_token = _S_token_ord_char;
auto __c = *_M_current;
- if (_M_spec_char.count(__c))
+ if (_M_spec_char.count(_M_ctype.narrow(__c, '\0')))
{
_M_token = _S_token_ord_char;
_M_value.assign(1, __c);
{
auto __c = *_M_current++;
- if (_M_escape_map.count(__c))
+ if (_M_escape_map.count(_M_ctype.narrow(__c, '\0')))
{
_M_token = _S_token_ord_char;
_M_value.assign(1, _M_escape_map.at(__c));
--- /dev/null
+// { dg-options "-std=gnu++11" }
+
+//
+// 2013-10-18 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 CJK support.
+
+#include <regex>
+#include <testsuite_hooks.h>
+#include <testsuite_regex.h>
+
+using namespace __gnu_test;
+using namespace std;
+
+void
+test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ const wchar_t * s = L"\u4f60\u597d\u002c\u0020\u4e16\u002b\u754c";
+
+ wregex re(s);
+ VERIFY(regex_match_debug(L"\u4f60\u597d\u002c\u0020\u4e16\u4e16\u4e16\u754c",
+ re));
+}
+
+int
+main()
+{
+ test01();
+ return 0;
+}