Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: compiled/bindings/main.cpp

Issue 29548581: Issue 4128, 5138 - Add Parser and Serializer implemented in C++ Base URL: https://github.com/adblockplus/adblockpluscore.git
Patch Set: rebase Created March 7, 2018, 12:01 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | compiled/storage/Parser.h » ('j') | compiled/storage/Parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiled/bindings/main.cpp
diff --git a/compiled/bindings/main.cpp b/compiled/bindings/main.cpp
index 25614f0dd6fd252f39fc2d147172f03c17036f9f..94c1de216c97c582fd2e67208124c9a54c70a7df 100644
--- a/compiled/bindings/main.cpp
+++ b/compiled/bindings/main.cpp
@@ -37,6 +37,8 @@
#include "../ElemHide.h"
#include "../ElemHideEmulation.h"
#include "../FilterNotifier.h"
+#include "../storage/Parser.h"
+#include "../storage/Serializer.h"
ABP_NS_USING
@@ -106,8 +108,6 @@ int main()
.property("filterCount", &Subscription::GetFilterCount)
.function("filterAt", &Subscription::FilterAt)
.function("indexOfFilter", &Subscription::IndexOfFilter)
- .function("serialize", &Subscription::Serialize)
- .function("serializeFilters", &Subscription::SerializeFilters)
.class_function("fromURL", &Subscription::FromID)
.subclass_differentiator(&Subscription::mType, {
{Subscription::Type::USERDEFINED, "UserDefinedSubscription"},
@@ -119,8 +119,7 @@ int main()
.function("makeDefaultFor", &UserDefinedSubscription::MakeDefaultFor)
.function("isGeneric", &UserDefinedSubscription::IsGeneric)
.function("insertFilterAt", &UserDefinedSubscription::InsertFilterAt)
- .function("removeFilterAt", &UserDefinedSubscription::RemoveFilterAt)
- .function("serialize", &UserDefinedSubscription::Serialize);
+ .function("removeFilterAt", &UserDefinedSubscription::RemoveFilterAt);
class_<DownloadableSubscription,Subscription>("DownloadableSubscription")
.property("fixedTitle", &DownloadableSubscription::GetFixedTitle, &DownloadableSubscription::SetFixedTitle)
@@ -134,8 +133,7 @@ int main()
.property("errorCount", &DownloadableSubscription::GetErrorCount, &DownloadableSubscription::SetErrorCount)
.property("dataRevision", &DownloadableSubscription::GetDataRevision, &DownloadableSubscription::SetDataRevision)
.property("requiredVersion", &DownloadableSubscription::GetRequiredVersion, &DownloadableSubscription::SetRequiredVersion)
- .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount)
- .function("serialize", &DownloadableSubscription::Serialize);
+ .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount);
singleton<FilterStorage>("FilterStorage", &FilterStorage::GetInstance)
.property("subscriptionCount", &FilterStorage::GetSubscriptionCount)
@@ -170,6 +168,18 @@ int main()
.function("clear", &ElemHideEmulation::Clear)
.function("getRulesForDomain", &ElemHideEmulation::GetRulesForDomain);
+ class_<Parser>("_FilterStorage_Parser")
+ .property("subscriptionCount", &Parser::GetSubscriptionCount)
+ .function("process", &Parser::Process)
+ .function("finalize", &Parser::Finalize)
+ .function("subscriptionAt", &Parser::SubscriptionAt)
+ .class_function("create", &Parser::Create);
+
+ class_<Serializer>("_FilterStorage_Serializer")
+ .property("data", &Serializer::GetData)
+ .function("serialize", &Serializer::Serialize)
+ .class_function("create", &Serializer::Create);
+
printBindings();
RegExpFilter::GenerateCustomBindings();
FilterNotifier::GenerateCustomBindings::Generate();
« no previous file with comments | « no previous file | compiled/storage/Parser.h » ('j') | compiled/storage/Parser.h » ('J')

Powered by Google App Engine
This is Rietveld