diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-15 14:55:49 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-15 14:56:57 +0100 |
| commit | 080c69c5b77102882a291110b6571bbef8ef8ffd (patch) | |
| tree | 2ae88f69401f359c3052f50f7033b7eed2aa0015 | |
| parent | Minor tidy up and add basic doxygen comments (diff) | |
| download | libadhocutil-0.3.6.1.tar.bz2 libadhocutil-0.3.6.1.tar.xz libadhocutil-0.3.6.1.zip | |
Test and fix multibyte behaviour in lexer-regexlibadhocutil-0.3.6.1
| -rw-r--r-- | libadhocutil/lexer-regex.cpp | 2 | ||||
| -rw-r--r-- | libadhocutil/unittests/testLexer.cpp | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/libadhocutil/lexer-regex.cpp b/libadhocutil/lexer-regex.cpp index 9ffee8b..2e3d7cf 100644 --- a/libadhocutil/lexer-regex.cpp +++ b/libadhocutil/lexer-regex.cpp @@ -56,7 +56,7 @@ namespace AdHoc { if (start == -1 && end == -1) { return boost::optional<Glib::ustring>(); } - return Glib::ustring(str + start, end - start); + return Glib::ustring(str + start, str + end); } return boost::optional<Glib::ustring>(); } diff --git a/libadhocutil/unittests/testLexer.cpp b/libadhocutil/unittests/testLexer.cpp index a8bc6ce..0e23586 100644 --- a/libadhocutil/unittests/testLexer.cpp +++ b/libadhocutil/unittests/testLexer.cpp @@ -73,6 +73,25 @@ BOOST_AUTO_TEST_CASE( state ) BOOST_REQUIRE_EQUAL("aa", s); } +BOOST_AUTO_TEST_CASE( multibyte ) +{ + AdHoc::Lexer::PatternPtr maskHead = AdHoc::LexerMatchers::regex( + "^# ([^<\n]+)? ?(<(.+?@[^\n>]+)>?)? \\((\\d+ *(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\w* \\d+)\\)$", + (GRegexCompileFlags)(G_REGEX_OPTIMIZE | G_REGEX_CASELESS | G_REGEX_UNGREEDY)); + Glib::ustring input("# Michał Górny <mgorny@gentoo.org> (28 Mar 2015)"); + BOOST_REQUIRE(input.bytes() > input.length()); + BOOST_REQUIRE(maskHead->matches(input.c_str(), input.bytes(), 0)); + BOOST_REQUIRE_EQUAL(maskHead->matchedLength(), input.bytes()); + BOOST_REQUIRE(maskHead->match(1)); + BOOST_REQUIRE_EQUAL("Michał Górny", *maskHead->match(1)); + BOOST_REQUIRE(maskHead->match(2)); + BOOST_REQUIRE_EQUAL("<mgorny@gentoo.org>", *maskHead->match(2)); + BOOST_REQUIRE(maskHead->match(3)); + BOOST_REQUIRE_EQUAL("mgorny@gentoo.org", *maskHead->match(3)); + BOOST_REQUIRE(maskHead->match(4)); + BOOST_REQUIRE_EQUAL("28 Mar 2015", *maskHead->match(4)); +} + BOOST_AUTO_TEST_CASE( badre ) { BOOST_REQUIRE_THROW(regex("["), std::runtime_error); |