| Index: third_party/re2/re2/filtered_re2.cc
|
| diff --git a/third_party/re2/re2/filtered_re2.cc b/third_party/re2/re2/filtered_re2.cc
|
| index 5dd65d5b71c1e21a4c5e39b03231fc84ea2d8944..f57625895e471978d2b61e28f4f1be133ea2dd07 100644
|
| --- a/third_party/re2/re2/filtered_re2.cc
|
| +++ b/third_party/re2/re2/filtered_re2.cc
|
| @@ -16,7 +16,7 @@
|
| }
|
|
|
| FilteredRE2::~FilteredRE2() {
|
| - for (size_t i = 0; i < re2_vec_.size(); i++)
|
| + for (int i = 0; i < re2_vec_.size(); i++)
|
| delete re2_vec_[i];
|
| delete prefilter_tree_;
|
| }
|
| @@ -33,7 +33,7 @@
|
| }
|
| delete re;
|
| } else {
|
| - *id = static_cast<int>(re2_vec_.size());
|
| + *id = re2_vec_.size();
|
| re2_vec_.push_back(re);
|
| }
|
|
|
| @@ -46,7 +46,7 @@
|
| return;
|
| }
|
|
|
| - for (size_t i = 0; i < re2_vec_.size(); i++) {
|
| + for (int i = 0; i < re2_vec_.size(); i++) {
|
| Prefilter* prefilter = Prefilter::FromRE2(re2_vec_[i]);
|
| prefilter_tree_->Add(prefilter);
|
| }
|
| @@ -56,9 +56,9 @@
|
| }
|
|
|
| int FilteredRE2::SlowFirstMatch(const StringPiece& text) const {
|
| - for (size_t i = 0; i < re2_vec_.size(); i++)
|
| + for (int i = 0; i < re2_vec_.size(); i++)
|
| if (RE2::PartialMatch(text, *re2_vec_[i]))
|
| - return static_cast<int>(i);
|
| + return i;
|
| return -1;
|
| }
|
|
|
| @@ -70,7 +70,7 @@
|
| }
|
| vector<int> regexps;
|
| prefilter_tree_->RegexpsGivenStrings(atoms, ®exps);
|
| - for (size_t i = 0; i < regexps.size(); i++)
|
| + for (int i = 0; i < regexps.size(); i++)
|
| if (RE2::PartialMatch(text, *re2_vec_[regexps[i]]))
|
| return regexps[i];
|
| return -1;
|
| @@ -83,16 +83,10 @@
|
| matching_regexps->clear();
|
| vector<int> regexps;
|
| prefilter_tree_->RegexpsGivenStrings(atoms, ®exps);
|
| - for (size_t i = 0; i < regexps.size(); i++)
|
| + for (int i = 0; i < regexps.size(); i++)
|
| if (RE2::PartialMatch(text, *re2_vec_[regexps[i]]))
|
| matching_regexps->push_back(regexps[i]);
|
| return !matching_regexps->empty();
|
| -}
|
| -
|
| -void FilteredRE2::AllPotentials(
|
| - const vector<int>& atoms,
|
| - vector<int>* potential_regexps) const {
|
| - prefilter_tree_->RegexpsGivenStrings(atoms, potential_regexps);
|
| }
|
|
|
| void FilteredRE2::RegexpsGivenStrings(const vector<int>& matched_atoms,
|
| @@ -100,6 +94,7 @@
|
| prefilter_tree_->RegexpsGivenStrings(matched_atoms, passed_regexps);
|
| }
|
|
|
| +
|
| void FilteredRE2::PrintPrefilter(int regexpid) {
|
| prefilter_tree_->PrintPrefilter(regexpid);
|
| }
|
|
|