Issue 5131 - [emscripten] Clean separation of bindings code and runtime code

compiled/bindings/main.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
@@ skipping 21 matching lines @@
 #include "../filter/ElemHideEmulationFilter.h"
 #include "../subscription/Subscription.h"
 #include "../subscription/DownloadableSubscription.h"
 #include "../subscription/UserDefinedSubscription.h"
 #include "../FilterNotifier.h"
 
 int main()
 {
   try
   {
     class_<Filter>("Filter")

[sergei, 2017/04/20 14:52:00]

Maybe it worth to leave these code in a function and call the latter from main.
The current version is is fine me, though.

[Wladimir Palant, 2017/04/20 14:54:29]

This is worth considering but let's land this change first - I really need to
get it out of my patch queue :)

         .property("text", &Filter::GetText)
         .function("serialize", &Filter::Serialize)
         .class_function("fromText", &Filter::FromText)
         .subclass_differentiator(&Filter::mType, {
           {Filter::Type::INVALID, "InvalidFilter"},
           {Filter::Type::COMMENT, "CommentFilter"},
           {Filter::Type::BLOCKING, "BlockingFilter"},
           {Filter::Type::WHITELIST, "WhitelistFilter"},
           {Filter::Type::ELEMHIDE, "ElemHideFilter"},
           {Filter::Type::ELEMHIDEEXCEPTION, "ElemHideException"},
@@ skipping 12 matching lines @@
         .property("hitCount", &ActiveFilter::GetHitCount, &ActiveFilter::SetHitCount)
         .property("lastHit", &ActiveFilter::GetLastHit, &ActiveFilter::SetLastHit)
         .function("isActiveOnDomain", &ActiveFilter::IsActiveOnDomain)
         .function("isActiveOnlyOnDomain", &ActiveFilter::IsActiveOnlyOnDomain)
         .function("isGeneric", &ActiveFilter::IsGeneric)
         .function("serialize", &ActiveFilter::Serialize);
 
     class_<RegExpFilter,ActiveFilter>("RegExpFilter")
         .function("matches", &RegExpFilter::Matches);
 
-    custom_generator(&RegExpFilter::GenerateCustomBindings);
-
     class_<BlockingFilter,RegExpFilter>("BlockingFilter")
         .class_property("type", "'blocking'");
 
     class_<WhitelistFilter,RegExpFilter>("WhitelistFilter")
         .class_property("type", "'whitelist'");
 
     class_<ElemHideBase,ActiveFilter>("ElemHideBase")
         .property("selector", &ElemHideBase::GetSelector)
         .property("selectorDomain", &ElemHideBase::GetSelectorDomain);
 
@@ skipping 36 matching lines @@
         .property("softExpiration", &DownloadableSubscription::GetSoftExpiration, &DownloadableSubscription::SetSoftExpiration)
         .property("lastDownload", &DownloadableSubscription::GetLastDownload, &DownloadableSubscription::SetLastDownload)
         .property("downloadStatus", &DownloadableSubscription::GetDownloadStatus, &DownloadableSubscription::SetDownloadStatus)
         .property("lastSuccess", &DownloadableSubscription::GetLastSuccess, &DownloadableSubscription::SetLastSuccess)
         .property("errors", &DownloadableSubscription::GetErrorCount, &DownloadableSubscription::SetErrorCount)
         .property("version", &DownloadableSubscription::GetDataRevision, &DownloadableSubscription::SetDataRevision)
         .property("requiredVersion", &DownloadableSubscription::GetRequiredVersion, &DownloadableSubscription::SetRequiredVersion)
         .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount)
         .function("serialize", &DownloadableSubscription::Serialize);
 
-    custom_generator(&FilterNotifier::GenerateCustomBindings);
+    printBindings();
+    RegExpFilter::GenerateCustomBindings();
+    FilterNotifier::GenerateCustomBindings();
 
-    printBindings();
     return 0;
   }
   catch (const std::exception& e)
   {
     EM_ASM_ARGS(
       console.error("Error occurred generating JavaScript bindings: " +
           Module.AsciiToString($0)), e.what()
     );
     return 1;
   }
 }