Issue 4125 - [emscripten] Convert filter classes to C++

compiled/RegExpFilter.cpp

 #include <climits>
 
 #include <emscripten.h>
 
 #include "RegExpFilter.h"
 #include "StringScanner.h"
 #include "StringMap.h"
 
 namespace
 {
@@ skipping 33 matching lines @@
     {u"media"_str, TYPE_MEDIA},
     {u"font"_str, TYPE_FONT},
     {u"background"_str, TYPE_IMAGE},   // Backwards compat
 
     {u"popup"_str, TYPE_POPUP},
     {u"genericblock"_str, TYPE_GENERICBLOCK},
     {u"generichide"_str, TYPE_GENERICHIDE},
     {u"elemhide"_str, TYPE_ELEMHIDE},
   };
 
-  int defaultTypeMask = INT_MAX & ~(TYPE_DOCUMENT | TYPE_ELEMHIDE | TYPE_POPUP |

[sergei, 2016/02/17 12:54:38]

Should not it be const?

[Wladimir Palant, 2016/02/18 16:06:45]

Done.

-      TYPE_GENERICBLOCK | TYPE_GENERICHIDE);
+  const int defaultTypeMask = INT_MAX & ~(TYPE_DOCUMENT | TYPE_ELEMHIDE |
+      TYPE_POPUP | TYPE_GENERICBLOCK | TYPE_GENERICHIDE);
 
   int GenerateRegExp(const String& regexp, bool matchCase)
   {
     return EM_ASM_INT(return regexps.create($0, $1), &regexp, matchCase);
   }
 
   void NormalizeWhitespace(DependentString& text)
   {
     // We want to remove all spaces but bail out early in the common scenario
     // that the string contains no spaces.
@@ skipping 13 matching lines @@
     for (pos = pos + 1; pos < len; pos++)
     {
       if (text[pos] == ' ')
         delta++;
       else
         text[pos - delta] = text[pos];
     }
     text.reset(text, 0, len - delta);
   }
 
-  void ParseOption(String& text, OwnedString& error, RegExpFilterData& data,
+  void ParseOption(String& text, DependentString& error, RegExpFilterData& data,
       int optionStart, int optionEnd, int valueStart, int valueEnd)
   {
     if (optionEnd <= optionStart)
       return;
 
     bool reverse = false;
     if (text[optionStart] == u'~')
     {
       reverse = true;
       optionStart++;
     }
 
     DependentString name(text, optionStart, optionEnd - optionStart);
     for (size_t i = 0; i < name.length(); ++i)
     {
       char16_t currChar = name[i];
       if (currChar >= u'A' && currChar <= u'Z')
         name[i] = currChar + u'a' - u'A';
       else if (currChar == u'_')
         name[i] = u'-';
     }
 
     auto it = typeMap.find(name);
-    if (it != typeMap.end())
+    if (it)
     {
       if (data.mContentType < 0)
         data.mContentType = reverse ? defaultTypeMask : 0;
       if (reverse)
         data.mContentType &= ~it->second;
       else
         data.mContentType |= it->second;
     }
     else if (name.equals(u"domain"_str))
     {
       if (valueStart >= 0 && valueEnd > valueStart)
       {
         data.mDomainsStart = valueStart;
         data.mDomainsEnd = valueEnd;
-        ActiveFilter::ToLower(text, data.mDomainsStart, data.mDomainsEnd);
+        DependentString(text, valueStart, valueEnd - valueStart).toLower();
       }
     }
     else if (name.equals(u"sitekey"_str))
     {
       if (valueStart >= 0 && valueEnd > valueStart)
       {
         data.mSitekeysStart = valueStart;
         data.mSitekeysEnd = valueEnd;
       }
     }
     else if (name.equals(u"match-case"_str))
       data.mMatchCase = !reverse;
     else if (name.equals(u"third-party"_str))
       data.mThirdParty = reverse ? TrippleState::NO : TrippleState::YES;
     else if (name.equals(u"collapse"_str))
       data.mCollapse = reverse ? TrippleState::NO : TrippleState::YES;
     else
-    {
-      error = u"Unknown option "_str;
-      error.append(name);
-    }
-  }
-
-  void ParseOptions(String& text, OwnedString& error, RegExpFilterData& data,
+      error.reset(u"filter_unknown_option"_str);
+  }
+
+  void ParseOptions(String& text, DependentString& error, RegExpFilterData& data,
       String::size_type optionsStart)
   {
     data.mMatchCase = false;
     data.mThirdParty = TrippleState::ANY;
     data.mCollapse = TrippleState::ANY;
     data.mDomainsStart = String::npos;
     data.mSitekeysStart = String::npos;
     if (optionsStart >= text.length())
     {
       data.mContentType = defaultTypeMask;
@@ skipping 33 matching lines @@
           valueStart = -1;
           break;
       }
     }
 
     if (data.mContentType < 0)
       data.mContentType = defaultTypeMask;
   }
 }
 
-RegExpFilter::RegExpFilter(const String& text, const RegExpFilterData& data)
-    : ActiveFilter(text, true), RegExpFilterData(data)
+RegExpFilter::RegExpFilter(Type type, const String& text, const RegExpFilterData& data)
+    : ActiveFilter(type, text, true), mData(data)
 {
 }
 
 RegExpFilter::~RegExpFilter()
 {
-  if (HasRegExp())
-    EM_ASM_ARGS(regexps.delete($0), mRegexpId);
-}
-
-Filter::Type RegExpFilter::Parse(DependentString& text, OwnedString& error,
+  if (mData.HasRegExp())
+    EM_ASM_ARGS(regexps.delete($0), mData.mRegexpId);
+}
+
+Filter::Type RegExpFilter::Parse(DependentString& text, DependentString& error,
     RegExpFilterData& data)
 {
   NormalizeWhitespace(text);
 
-  bool blocking = true;
+  Filter::Type type = Type::BLOCKING;
 
   data.mPatternStart = 0;
   if (text.length() >= 2 && text[0] == u'@' && text[1] == u'@')
   {
-    blocking = false;
+    type = Type::WHITELIST;
     data.mPatternStart = 2;
   }
 
   data.mPatternEnd = text.find(u'$', data.mPatternStart);
   if (data.mPatternEnd == text.npos)
     data.mPatternEnd = text.length();
 
   ParseOptions(text, error, data, data.mPatternEnd + 1);
   if (!error.empty())
     return Type::INVALID;
 
   if (data.mPatternEnd - data.mPatternStart >= 2 &&
       text[data.mPatternStart] == u'/' &&
       text[data.mPatternEnd - 1] == u'/')
   {
     data.SetRegExp(GenerateRegExp(DependentString(text, data.mPatternStart + 1,
         data.mPatternEnd - data.mPatternStart - 2), data.mMatchCase));
-
-    int errorLength = EM_ASM_INT(return regexps.getErrorLength($0),
-        data.mRegexpId);
-    if (errorLength >= 0)
-    {
-      OwnedString regexpError(errorLength);
-      EM_ASM_ARGS(regexps.getError($0, $1), data.mRegexpId, regexpError.data());
-      error = std::move(regexpError);
+    if (data.mRegexpId == -1)
+    {
+      error.reset(u"filter_invalid_regexp"_str);
       return Type::INVALID;
     }
   }
 
-  if (blocking)
-    return Type::BLOCKING;
-  else
-    return Type::WHITELIST;
+  return type;
 }
 
 void RegExpFilter::ParseSitekeys(const String& sitekeys) const
 {
   StringScanner scanner(sitekeys, 0, u'|');
   size_t start = 0;
   bool done = false;
   while (!done)
   {
     done = scanner.done();
     if (scanner.next() == u'|')
     {
       if (scanner.position() > start)
         AddSitekey(DependentString(sitekeys, start, scanner.position() - start));
       start = scanner.position() + 1;
     }
   }
 }
 
 void RegExpFilter::InitJSTypes()
 {
   EM_ASM(exports.RegExpFilter.typeMap = {};);
   for (auto it = typeMap.begin(); it != typeMap.end(); ++it)
-    EM_ASM_ARGS(exports.RegExpFilter.typeMap[getStringData($0).replace("-", "_").toUpperCase()] = $1, &(it->first), it->second);
+    EM_ASM_ARGS(exports.RegExpFilter.typeMap[readString($0).replace("-", "_").toUpperCase()] = $1, &(it->first), it->second);
 }
 
 OwnedString RegExpFilter::RegExpFromSource(const String& source)
 {
   /* TODO: this is very inefficient */
 
   // Note: This doesn't remove trailing wildcards, otherwise the result should
   // be identical to Filter.toRegExp().
   OwnedString result;
   String::value_type prevChar = u'*';
@@ skipping 38 matching lines @@
             !(currChar >= u'A' && currChar <= u'Z') &&
             !(currChar >= u'0' && currChar <= u'9') &&
             currChar < 128)
         {
           result.append(u'\\');
         }
         result.append(currChar);
     }
     prevChar = currChar;
   }
-  return std::move(result);
-}
-
-Filter::Type RegExpFilter::GetType() const
-{
-  return Type::BLOCKING;
+  return result;
 }
 
 RegExpFilter::DomainMap* RegExpFilter::GetDomains() const
 {
-  if (!DomainsParsingDone())
-  {
-    ParseDomains(GetDomainsSource(mText), u'|');
-    SetDomainsParsingDone();
+  if (!mData.DomainsParsingDone())
+  {
+    ParseDomains(mData.GetDomainsSource(mText), u'|');
+    mData.SetDomainsParsingDone();
   }
   return ActiveFilter::GetDomains();
 }
 
 RegExpFilter::SitekeySet* RegExpFilter::GetSitekeys() const
 {
-  if (!SitekeyParsingDone())
-  {
-    ParseSitekeys(GetSitekeysSource(mText));
-    SetSitekeysParsingDone();
+  if (!mData.SitekeyParsingDone())
+  {
+    ParseSitekeys(mData.GetSitekeysSource(mText));
+    mData.SetSitekeysParsingDone();
   }
   return ActiveFilter::GetSitekeys();
 }
 
 bool RegExpFilter::Matches(const String& location, int typeMask,
     DependentString& docDomain, bool thirdParty, const String& sitekey) const
 {
-  if (!(mContentType & typeMask) ||
-      (mThirdParty == TrippleState::YES && !thirdParty) ||
-      (mThirdParty == TrippleState::NO && thirdParty) ||
+  if (!(mData.mContentType & typeMask) ||
+      (mData.mThirdParty == TrippleState::YES && !thirdParty) ||
+      (mData.mThirdParty == TrippleState::NO && thirdParty) ||
       !IsActiveOnDomain(docDomain, sitekey))
   {
     return false;
   }
 
-  if (!RegExpParsingDone())
-  {
-    const OwnedString pattern(GetRegExpSource(mText));
-    SetRegExp(GenerateRegExp(RegExpFromSource(pattern), mMatchCase));
-  }
-  return EM_ASM_INT(return regexps.test($0, $1), mRegexpId, &location);
-}
+  if (!mData.RegExpParsingDone())
+  {
+    const OwnedString pattern(mData.GetRegExpSource(mText));
+    mData.SetRegExp(GenerateRegExp(RegExpFromSource(pattern), mData.mMatchCase));
+  }
+  return EM_ASM_INT(return regexps.test($0, $1), mData.mRegexpId, &location);
+}