Unified Diff: compiled/bindings/main.cpp
Issue 29556737:
Issue 5141 - Convert filter match to C++ (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Reworked the code, added test, they fail.
Created Sept. 29, 2017, 4:01 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« compiled/StringMap.h ('k')
|
compiled/filter/Matcher.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: compiled/bindings/main.cpp |
| =================================================================== |
| --- a/compiled/bindings/main.cpp |
| +++ b/compiled/bindings/main.cpp |
| @@ -29,16 +29,17 @@ |
| #include "../filter/ElemHideBase.h" |
| #include "../filter/ElemHideFilter.h" |
| #include "../filter/ElemHideException.h" |
| #include "../filter/ElemHideEmulationFilter.h" |
| #include "../subscription/Subscription.h" |
| #include "../subscription/DownloadableSubscription.h" |
| #include "../subscription/UserDefinedSubscription.h" |
| #include "../storage/FilterStorage.h" |
| +#include "../filter/Matcher.h" |
| #include "../FilterNotifier.h" |
| int main() |
| { |
| try |
| { |
| class_<Filter>("Filter") |
| .property("text", &Filter::GetText) |
| @@ -126,16 +127,37 @@ |
| .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); |
| + class_<ReMatchResults>("ReMatchResults") |
| + .function("push", &ReMatchResults::push); |
| + |
| + class_<CombinedMatcher>("CombinedMatcher") |
| + .function("add", &CombinedMatcher::Add) |
| + .function("remove", &CombinedMatcher::Remove) |
| + .function("matchesAny", &CombinedMatcher::MatchesAny) |
| + .function("clear", &CombinedMatcher::Clear) |
| + .function("hasFilter", &CombinedMatcher::HasFilter) |
| + .function("getKeywordForFilter", &CombinedMatcher::GetKeywordForFilter) |
| + .function("findKeyword", &CombinedMatcher::FindKeyword); |
| + |
| + class_<Matcher>("Matcher") |
| + .function("add", &Matcher::Add) |
| + .function("remove", &Matcher::Remove) |
| + .function("matchesAny", &Matcher::MatchesAny) |
| + .function("clear", &Matcher::Clear) |
| + .function("hasFilter", &Matcher::HasFilter) |
| + .function("getKeywordForFilter", &Matcher::GetKeywordForFilter) |
| + .function("findKeyword", &Matcher::FindKeyword); |
| + |
| singleton<FilterStorage>("FilterStorage", &FilterStorage::GetInstance) |
| .property("subscriptionCount", &FilterStorage::GetSubscriptionCount) |
| .function("subscriptionAt", &FilterStorage::SubscriptionAt) |
| .function("indexOfSubscription", &FilterStorage::IndexOfSubscription) |
| .function("getSubscriptionForFilter", &FilterStorage::GetSubscriptionForFilter) |
| .function("addSubscription", &FilterStorage::AddSubscription) |
| .function("removeSubscription", &FilterStorage::RemoveSubscription) |
| .function("moveSubscription", &FilterStorage::MoveSubscription); |
« no previous file with comments
|
« compiled/StringMap.h ('k')
|
compiled/filter/Matcher.h » ('j')
|
no next file with comments »
