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

Delta Between Two Patch Sets: compiled/RegExpFilter.h

Issue 29333474: Issue 4125 - [emscripten] Convert filter classes to C++ (Closed)
Left Patch Set: Now passing all filter matching tests (without filter options) Created Jan. 18, 2016, 6:12 p.m.
Right Patch Set: Addressed comments from Patch Set 28 Created March 21, 2017, 10:04 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « compiled/InvalidFilter.cpp ('k') | compiled/RegExpFilter.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #ifndef ADBLOCK_PLUS_REG_EXP_FILTER_H 1 #pragma once
2 #define ADBLOCK_PLUS_REG_EXP_FILTER_H
3
4 #include <string>
5 2
6 #include "Filter.h" 3 #include "Filter.h"
7 #include "ActiveFilter.h" 4 #include "ActiveFilter.h"
8 5
6 enum class TrippleState {YES, NO, ANY};
7
8 struct RegExpFilterData
9 {
10 mutable String::size_type mPatternStart;
11 union
12 {
13 mutable int mRegexpId;
14 mutable String::size_type mPatternEnd;
15 };
16 mutable String::size_type mDomainsStart;
17 mutable String::size_type mDomainsEnd;
18 mutable String::size_type mSitekeysStart;
19 mutable String::size_type mSitekeysEnd;
20 int mContentType;
21 bool mMatchCase;
22 TrippleState mThirdParty;
23 TrippleState mCollapse;
24
25 bool RegExpParsingDone() const
26 {
27 return mPatternStart == String::npos;
28 }
29
30 void SetRegExp(int regexpId) const
31 {
32 mRegexpId = regexpId;
33 mPatternStart = String::npos;
34 }
35
36 bool HasRegExp() const
37 {
38 return RegExpParsingDone() && mRegexpId;
39 }
40
41 const DependentString GetRegExpSource(const String& text) const
42 {
43 return DependentString(text, mPatternStart, mPatternEnd - mPatternStart);
44 }
45
46 bool DomainsParsingDone() const
47 {
48 return mDomainsStart == String::npos;
49 }
50
51 void SetDomainsParsingDone() const
52 {
53 mDomainsStart = String::npos;
54 }
55
56 const DependentString GetDomainsSource(const String& text) const
57 {
58 return DependentString(text, mDomainsStart, mDomainsEnd - mDomainsStart);
59 }
60
61 bool SitekeyParsingDone() const
62 {
63 return mSitekeysStart == String::npos;
64 }
65
66 void SetSitekeysParsingDone() const
67 {
68 mSitekeysStart = String::npos;
69 }
70
71 const DependentString GetSitekeysSource(const String& text) const
72 {
73 return DependentString(text, mSitekeysStart, mSitekeysEnd - mSitekeysStart);
74 }
75 };
76
9 class RegExpFilter : public ActiveFilter 77 class RegExpFilter : public ActiveFilter
10 { 78 {
11 private: 79 private:
12 int regexpId; 80 void ParseSitekeys(const String& sitekeys) const;
13 std::u16string regexpSource; 81
82 protected:
83 RegExpFilterData mData;
84
85 DomainMap* GetDomains() const override;
86 SitekeySet* GetSitekeys() const override;
14 public: 87 public:
15 explicit RegExpFilter(const std::u16string& text, const std::u16string& patter n, 88 explicit RegExpFilter(Type type, const String& text, const RegExpFilterData& d ata);
16 const std::u16string& options);
17 ~RegExpFilter(); 89 ~RegExpFilter();
18 static Filter* Create(const std::u16string& text); 90 static Type Parse(DependentString& text, DependentString& error,
19 Type GetType() const; 91 RegExpFilterData& data);
20 bool Matches(const std::u16string& location); 92 EMSCRIPTEN_KEEPALIVE static void InitJSTypes();
93 static OwnedString RegExpFromSource(const String& source);
94 EMSCRIPTEN_KEEPALIVE bool Matches(const String& location, int typeMask,
95 DependentString& docDomain, bool thirdParty, const String& sitekey) const;
21 }; 96 };
22
23 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld