[libcxx] Support std::regex_constants::match_not_null
Summary: Fixes PR21597.
Reviewers: mclow.lists, EricWF
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D25595
llvm-svn: 284881
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: abd1a6e687b7d4b332dc2fa35526a6e8de5f3857
diff --git a/include/regex b/include/regex
index f8fb6af..975f640 100644
--- a/include/regex
+++ b/include/regex
@@ -5555,6 +5555,12 @@
switch (__s.__do_)
{
case __state::__end_state:
+ if (__flags & regex_constants::match_not_null &&
+ __s.__current_ == __first)
+ {
+ __states.pop_back();
+ break;
+ }
__m.__matches_[0].first = __first;
__m.__matches_[0].second = _VSTD::next(__first, __s.__current_ - __first);
__m.__matches_[0].matched = true;
@@ -5618,6 +5624,12 @@
switch (__s.__do_)
{
case __state::__end_state:
+ if (__flags & regex_constants::match_not_null &&
+ __s.__current_ == __first)
+ {
+ __states.pop_back();
+ break;
+ }
if (!__matched || __highest_j < __s.__current_ - __s.__first_)
__highest_j = __s.__current_ - __s.__first_;
__matched = true;
@@ -5703,6 +5715,12 @@
switch (__s.__do_)
{
case __state::__end_state:
+ if (__flags & regex_constants::match_not_null &&
+ __s.__current_ == __first)
+ {
+ __states.pop_back();
+ break;
+ }
if (!__matched || __highest_j < __s.__current_ - __s.__first_)
{
__highest_j = __s.__current_ - __s.__first_;
diff --git a/test/std/re/re.const/re.matchflag/match_not_null.pass.cpp b/test/std/re/re.const/re.matchflag/match_not_null.pass.cpp
new file mode 100644
index 0000000..41963fb
--- /dev/null
+++ b/test/std/re/re.const/re.matchflag/match_not_null.pass.cpp
@@ -0,0 +1,46 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// match_not_null:
+// The regular expression shall not match an empty sequence.
+
+#include "test_macros.h"
+#include <cassert>
+#include <regex>
+
+int main()
+{
+ // When match_not_null is on, the regex engine should reject empty matches and
+ // move on to try other solutions.
+ std::cmatch m;
+ assert(!std::regex_search("a", m, std::regex("b*"),
+ std::regex_constants::match_not_null));
+ assert(std::regex_search("aa", m, std::regex("a*?"),
+ std::regex_constants::match_not_null));
+ assert(m[0].length() == 1);
+ assert(!std::regex_search("a", m, std::regex("b*", std::regex::extended),
+ std::regex_constants::match_not_null));
+ assert(!std::regex_search(
+ "a", m,
+ std::regex("b*", std::regex::extended | std::regex_constants::nosubs),
+ std::regex_constants::match_not_null));
+
+ assert(!std::regex_match("", m, std::regex("a*"),
+ std::regex_constants::match_not_null));
+ assert(!std::regex_match("", m, std::regex("a*", std::regex::extended),
+ std::regex_constants::match_not_null));
+ assert(!std::regex_match(
+ "", m,
+ std::regex("a*", std::regex::extended | std::regex_constants::nosubs),
+ std::regex_constants::match_not_null));
+
+ return 0;
+}