Issue 4127 - [emscripten] Convert subscription classes to C++ - Part 1

compiled/subscription/Subscription.h

 /*
  * 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/>.
  */
 
 #pragma once
 
+#include <type_traits>
 #include <vector>
 
 #include "../filter/Filter.h"
 #include "../String.h"
 #include "../intrusive_ptr.h"
 #include "../debug.h"
 
 #define SUBSCRIPTION_PROPERTY(type, name, getter, setter) \
+    static_assert(std::is_arithmetic<type>::value, "SUBSCRIPTION_PROPERTY macro can only be used with arithmetic types");\
     private:\
       type name;\
     public:\
       type EMSCRIPTEN_KEEPALIVE getter() const\
       {\
         return name;\
       }\
       void EMSCRIPTEN_KEEPALIVE setter(type value)\
       {\
         if (name != value)\
         {\
           type oldvalue = name;\
           name = value;\
           DependentString action(u"subscription."_str #name);\
           if (sizeof(type) <= 4)\
           {\
             EM_ASM_ARGS({\
               var subscription = new (exports[Subscription_mapping[$2]])($1);\
               FilterNotifier.triggerListeners(readString($0), subscription, $3, $4);\
             }, &action, this, mType, value, oldvalue);\
           }\
           else\
           {\
             EM_ASM_ARGS({\
               var subscription = new (exports[Subscription_mapping[$2]])($1);\
               FilterNotifier.triggerListeners(readString($0), subscription, $3, $4);\
             }, &action, this, mType, (double)value, (double)oldvalue);\

[sergei, 2017/04/12 12:04:33]

It seems SUBSCRIPTION_PROPERTY is only for numbers and bool, I would like to
have a static assert using std::is_arithmetic in these methods.

[Wladimir Palant, 2017/04/13 13:04:41]

Done.

           }\
         }\
       }
 
 #define SUBSCRIPTION_STRING_PROPERTY(name, getter, setter) \
     private:\
       OwnedString name;\
     public:\
       const String& EMSCRIPTEN_KEEPALIVE getter() const\
       {\
         return name;\
       }\
       void EMSCRIPTEN_KEEPALIVE setter(const String& value)\
       {\
         if (!name.equals(value))\
         {\
           OwnedString oldvalue(name);\
           name = value;\
           DependentString action(u"subscription."_str #name);\

[sergei, 2017/04/12 12:04:33]

I'm not sure that the `action` value is correct here and above. For instance,
originally the value was "subscription.title", but here it is
"subscription.mTitle".

[Wladimir Palant, 2017/04/13 13:04:41]

No, it's not correct - and neither for filter classes. This is addressed in
https://issues.adblockplus.org/ticket/5063 which is also under review.

           EM_ASM_ARGS({\
             var subscription = new (exports[Subscription_mapping[$2]])($1);\
             FilterNotifier.triggerListeners(readString($0), subscription, readString($3), readString($4));\
           }, &action, this, mType, &value, &oldvalue);\
         }\
       }
 
 class Subscription : public ref_counted
 {
 protected:
@@ skipping 21 matching lines @@
   SUBSCRIPTION_STRING_PROPERTY(mTitle, GetTitle, SetTitle);
   SUBSCRIPTION_PROPERTY(bool, mDisabled, GetDisabled, SetDisabled);
 
   EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const;
   EMSCRIPTEN_KEEPALIVE OwnedString SerializeFilters() const;
 
   static EMSCRIPTEN_KEEPALIVE Subscription* FromID(const String& id);
 };
 
 typedef intrusive_ptr<Subscription> SubscriptionPtr;