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 107 matching lines @@
         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;
-        DependentString(text, valueStart, valueEnd - valueStart).tolower();
+        DependentString(text, valueStart, valueEnd - valueStart).toLower();
       }
     }
     else if (name.equals(u"sitekey"_str))
     {
       if (valueStart >= 0 && valueEnd > valueStart)
       {
         data.mSitekeysStart = valueStart;
         data.mSitekeysEnd = valueEnd;
       }
     }
@@ skipping 70 matching lines @@
 {
   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));
     if (data.mRegexpId == -1)
     {
       error.reset(u"filter_invalid_regexp"_str);
       return Type::INVALID;
     }
   }
 
-  if (blocking)
-    return Type::BLOCKING;
-  else
-    return Type::WHITELIST;

[sergei, 2017/01/10 15:57:50]

It seems we could simply change type of blocking variable to Filter::Type,
assign the values of Type type and then simply return blocking.

[Wladimir Palant, 2017/03/13 17:42:11]

Done.

+  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();
@@ skipping 103 matching lines @@
     return false;
   }
 
   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);
 }