Issue 5062 - [emscripten] Allow generation of custom bindings code

compiled/filter/RegExpFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cctype>
 #include <climits>
 #include <cstdio>
+#include <string>
 
 #include <emscripten.h>
 
 #include "RegExpFilter.h"
 #include "../StringScanner.h"
 #include "../StringMap.h"
 
 namespace
 {
   enum
   {
     TYPE_OTHER = 0x1,
     TYPE_SCRIPT = 0x2,
     TYPE_IMAGE = 0x4,
     TYPE_STYLESHEET = 0x8,
     TYPE_OBJECT = 0x10,
     TYPE_SUBDOCUMENT = 0x20,
     TYPE_DOCUMENT = 0x40,
+    TYPE_WEBSOCKET = 0x80,
+    TYPE_WEBRTC = 0x100,
     TYPE_PING = 0x400,
     TYPE_XMLHTTPREQUEST = 0x800,
     TYPE_OBJECT_SUBREQUEST = 0x1000,
     TYPE_MEDIA = 0x4000,
     TYPE_FONT = 0x8000,
     TYPE_POPUP = 0x8000000,
     TYPE_GENERICBLOCK = 0x10000000,
     TYPE_GENERICHIDE = 0x20000000,
     TYPE_ELEMHIDE = 0x40000000,
   };
 
-  StringMap<int> typeMap {
+  const StringMap<int> typeMap {
     {u"other"_str, TYPE_OTHER},
     {u"script"_str, TYPE_SCRIPT},
     {u"image"_str, TYPE_IMAGE},
     {u"stylesheet"_str, TYPE_STYLESHEET},
     {u"object"_str, TYPE_OBJECT},
     {u"subdocument"_str, TYPE_SUBDOCUMENT},
     {u"document"_str, TYPE_DOCUMENT},
+    {u"websocket"_str, TYPE_WEBSOCKET},
+    {u"webrtc"_str, TYPE_WEBRTC},
     {u"xbl"_str, TYPE_OTHER},          // Backwards compat
     {u"ping"_str, TYPE_PING},
     {u"xmlhttprequest"_str, TYPE_XMLHTTPREQUEST},
     {u"object-subrequest"_str, TYPE_OBJECT_SUBREQUEST},
     {u"dtd"_str, TYPE_OTHER},          // Backwards compat
     {u"media"_str, TYPE_MEDIA},
     {u"font"_str, TYPE_FONT},
     {u"background"_str, TYPE_IMAGE},   // Backwards compat
 
     {u"popup"_str, TYPE_POPUP},
@@ skipping 273 matching lines @@
         AddSitekey(DependentString(sitekeys, start, scanner.position() - start));
       start = scanner.position() + 1;
     }
   }
 }
 
 void RegExpFilter::GenerateCustomBindings()
 {
   printf("exports.RegExpFilter.typeMap = {\n");
 
-  OwnedString type;
-  char type_cstr[256];
-  for (auto it = typeMap.begin(); it != typeMap.end(); ++it)

[hub, 2017/03/31 02:57:22]

Shouldn't we use a range iterator here (with const ref for the value) ?

Short of that, at least a const iterator.

[Wladimir Palant, 2017/04/04 14:26:01]

Done.

-  {
-    type = it->first;
-    for (int i = 0; i < type.length(); i++)
-    {
-      if (type[i] == '-')
-        type_cstr[i] = '_';
-      else
-        type_cstr[i] = toupper(type[i]);
-    }

[hub, 2017/03/31 02:57:22]

Also we don't check that i or type.length() is < 255.

[Wladimir Palant, 2017/04/04 14:26:01]

I didn't really want to bother but let's do a proper size check here. No point
recovering however, it's a fatal error.

-    type_cstr[type.length()] = 0;
-    printf("  %s: %i,\n", type_cstr, it->second);
+  for (const auto& item : typeMap)
+  {
+    std::string type(item.first.length(), '\0');
+    for (int i = 0; i < item.first.length(); i++)
+      type[i] = (item.first[i] == '-' ? '_' : toupper(item.first[i]));
+    printf("  %s: %i,\n", type.c_str(), item.second);
   }
   printf("};\n");
 }
 
 RegExpFilter::DomainMap* RegExpFilter::GetDomains() const
 {
   if (!mData.DomainsParsingDone())
   {
     ParseDomains(mData.GetDomainsSource(mText), u'|');
     mData.SetDomainsParsingDone();
@@ skipping 22 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);
 }