X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Fregmatch.h;h=48f65c6df2b2409403762d0a28f067c8c297b07b;hb=99b9121e2158603372c7313400283b622e6754d8;hp=c5116cdc5408ec7238c65f6a250feb9bc23f8308;hpb=928694ff233bd4383f30b05bf6d2d37562b77a9a;p=libs%2Fcore.git diff --git a/source/strings/regmatch.h b/source/strings/regmatch.h index c5116cd..48f65c6 100644 --- a/source/strings/regmatch.h +++ b/source/strings/regmatch.h @@ -26,24 +26,21 @@ public: { typedef std::string::size_type size_type; - bool match; //< Whether or not this group matched - size_type begin; //< First offset of the match - size_type end; //< One-past-last offset - size_type length; //< Length of the match (end-begin) - std::string str; //< The part of the string that matched + bool match = false; //< Whether or not this group matched + size_type begin; //< First offset of the match + size_type end; //< One-past-last offset + size_type length; //< Length of the match (end-begin) + std::string str; //< The part of the string that matched - Group(): match(false) { } operator bool() const { return match; } }; - typedef std::vector GroupArray; - private: - GroupArray groups; + std::vector groups; public: /** Constructs a RegMatch representing a non-match. */ - RegMatch() { } + RegMatch() = default; /** Constructs a new RegMatch from a string and groups. The length and str members of each group are computed and need not be set. Intended to be used