Cleaning up some cruft.

1 files changed, 7 insertions, 1 deletions

diff --git a/includes/BRegex.h b/includes/BRegex.h
index 4a2f207..9b030bc 100644
--- a/includes/BRegex.h
+++ b/includes/BRegex.h
@@ -11,12 +11,18 @@ namespace Balau {
 class Regex {
   public:
     typedef std::vector<String> Captures;
+      Regex(const String & regex, bool icase = false) : Regex(regex.to_charp(), icase) { }
+      Regex(const Regex & regex) : Regex(regex.m_regexStr, regex.m_icase) { }
+      Regex(Regex && regex) { regex.m_moved = true; m_regex = regex.m_regex; }
       Regex(const char * regex, bool icase = false) throw (GeneralException);
-      ~Regex();
+      ~Regex() { if (!m_moved) regfree(&m_regex); }
     Captures match(const char * str) const throw (GeneralException);
   private:
+      Regex & operator=(const Regex &) = delete;
     String getError(int err) const;
+    String m_regexStr;
     regex_t m_regex;
+    bool m_icase, m_moved = false;
 };
 
 class Regexes {