Skip to content

Commit

Permalink
src: clean up string_search
Browse files Browse the repository at this point in the history
This commit removes some unnecessary signed checks on unsigned
variables and removes a few unused private functions.

PR-URL: #7174
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
mscdex authored and evanlucas committed Jun 16, 2016
1 parent d71ede8 commit cf0928c
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions src/string_search.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Vector {

// Access individual vector elements - checks bounds in debug mode.
T& operator[](size_t index) const {
ASSERT(0 <= index && index < length_);
ASSERT(index < length_);
return start_[is_forward_ ? index : (length_ - index - 1)];
}

Expand Down Expand Up @@ -139,12 +139,6 @@ class StringSearch : private StringSearchBase {
Vector<const Char>,
size_t);

static size_t FailSearch(StringSearch<Char>*,
Vector<const Char> subject,
size_t) {
return subject.length();
}

static size_t SingleCharSearch(StringSearch<Char>* search,
Vector<const Char> subject,
size_t start_index);
Expand All @@ -170,12 +164,6 @@ class StringSearch : private StringSearchBase {

void PopulateBoyerMooreTable();

static inline bool exceedsOneByte(uint8_t c) { return false; }

static inline bool exceedsOneByte(uint16_t c) {
return c > kMaxOneByteCharCodeU;
}

static inline int CharOccurrence(int* bad_char_occurrence,
Char char_code) {
if (sizeof(Char) == 1) {
Expand Down Expand Up @@ -401,7 +389,7 @@ size_t StringSearch<Char>::BoyerMooreSearch(
return subject.length();
}
}
while (j >= 0 && pattern[j] == (c = subject[index + j])) {
while (pattern[j] == (c = subject[index + j])) {
if (j == 0) {
return index;
}
Expand Down Expand Up @@ -529,7 +517,7 @@ size_t StringSearch<Char>::BoyerMooreHorspoolSearch(
}
}
j--;
while (j >= 0 && pattern[j] == (subject[index + j])) {
while (pattern[j] == (subject[index + j])) {
if (j == 0) {
return index;
}
Expand Down

0 comments on commit cf0928c

Please sign in to comment.