Source/wtf/text/StringImpl.cpp - Issue 23464095: WTF::notFound looks too much like a local variable.

Unified Diff: Source/wtf/text/StringImpl.cpp

Issue 23464095: WTF::notFound looks too much like a local variable. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/wtf/text/StringImpl.cpp

diff --git a/Source/wtf/text/StringImpl.cpp b/Source/wtf/text/StringImpl.cpp

index ce7357a1e8b93b1ffebdac028ee70da5539c678a..4ad5302521023d03fdd7df60f89c45d2457e3967 100644

--- a/Source/wtf/text/StringImpl.cpp

+++ b/Source/wtf/text/StringImpl.cpp

@@ -973,7 +973,7 @@ size_t StringImpl::find(const LChar* matchString, unsigned index)

{

// Check for null or empty string to match against

if (!matchString)

- return notFound;

+ return kNotFound;

size_t matchStringLength = strlen(reinterpret_cast<const char*>(matchString));

RELEASE_ASSERT(matchStringLength <= numeric_limits<unsigned>::max());

unsigned matchLength = matchStringLength;

@@ -986,10 +986,10 @@ size_t StringImpl::find(const LChar* matchString, unsigned index)

// Check index & matchLength are in range.

if (index > length())

- return notFound;

+ return kNotFound;

unsigned searchLength = length() - index;

if (matchLength > searchLength)

- return notFound;

+ return kNotFound;

// delta is the number of additional times to test; delta == 0 means test only once.

unsigned delta = searchLength - matchLength;

@@ -1008,7 +1008,7 @@ size_t StringImpl::find(const LChar* matchString, unsigned index)

// keep looping until we match

while (searchHash != matchHash || !equal(searchCharacters + i, matchString, matchLength)) {

if (i == delta)

- return notFound;

+ return kNotFound;

searchHash += searchCharacters[i + matchLength];

searchHash -= searchCharacters[i];

++i;

@@ -1025,7 +1025,7 @@ ALWAYS_INLINE size_t findIgnoringCaseInternal(const CharType* searchCharacters,

unsigned i = 0;

while (!equalIgnoringCase(searchCharacters + i, matchString, matchLength)) {

if (i == delta)

- return notFound;

+ return kNotFound;

++i;

}

return index + i;

@@ -1035,7 +1035,7 @@ size_t StringImpl::findIgnoringCase(const LChar* matchString, unsigned index)

{

// Check for null or empty string to match against

if (!matchString)

- return notFound;

+ return kNotFound;

size_t matchStringLength = strlen(reinterpret_cast<const char*>(matchString));

RELEASE_ASSERT(matchStringLength <= numeric_limits<unsigned>::max());

unsigned matchLength = matchStringLength;

@@ -1044,10 +1044,10 @@ size_t StringImpl::findIgnoringCase(const LChar* matchString, unsigned index)

// Check index & matchLength are in range.

if (index > length())

- return notFound;

+ return kNotFound;

unsigned searchLength = length() - index;

if (matchLength > searchLength)

- return notFound;

+ return kNotFound;

if (is8Bit())

return findIgnoringCaseInternal(characters8() + index, matchString, index, searchLength, matchLength);

@@ -1075,7 +1075,7 @@ ALWAYS_INLINE static size_t findInternal(const SearchCharacterType* searchCharac

// keep looping until we match

while (searchHash != matchHash || !equal(searchCharacters + i, matchCharacters, matchLength)) {

if (i == delta)

- return notFound;

+ return kNotFound;

searchHash += searchCharacters[i + matchLength];

searchHash -= searchCharacters[i];

++i;

@@ -1087,7 +1087,7 @@ size_t StringImpl::find(StringImpl* matchString)

{

// Check for null string to match against

if (UNLIKELY(!matchString))

- return notFound;

+ return kNotFound;

unsigned matchLength = matchString->length();

// Optimization 1: fast case for strings of length 1.

@@ -1104,7 +1104,7 @@ size_t StringImpl::find(StringImpl* matchString)

// Check matchLength is in range.

if (matchLength > length())

- return notFound;

+ return kNotFound;

// Check for empty string to match against

if (UNLIKELY(!matchLength))

@@ -1126,7 +1126,7 @@ size_t StringImpl::find(StringImpl* matchString, unsigned index)

{

// Check for null or empty string to match against

if (UNLIKELY(!matchString))

- return notFound;

+ return kNotFound;

unsigned matchLength = matchString->length();

@@ -1142,10 +1142,10 @@ size_t StringImpl::find(StringImpl* matchString, unsigned index)

// Check index & matchLength are in range.

if (index > length())

- return notFound;

+ return kNotFound;

unsigned searchLength = length() - index;

if (matchLength > searchLength)

- return notFound;

+ return kNotFound;

if (is8Bit()) {

if (matchString->is8Bit())

@@ -1169,7 +1169,7 @@ ALWAYS_INLINE static size_t findIgnoringCaseInner(const SearchCharacterType* sea

// keep looping until we match

while (!equalIgnoringCase(searchCharacters + i, matchCharacters, matchLength)) {

if (i == delta)

- return notFound;

+ return kNotFound;

++i;

}

return index + i;

@@ -1179,17 +1179,17 @@ size_t StringImpl::findIgnoringCase(StringImpl* matchString, unsigned index)

{

// Check for null or empty string to match against

if (!matchString)

- return notFound;

+ return kNotFound;

unsigned matchLength = matchString->length();

if (!matchLength)

return min(index, length());

// Check index & matchLength are in range.

if (index > length())

- return notFound;

+ return kNotFound;

unsigned searchLength = length() - index;

if (matchLength > searchLength)

- return notFound;

+ return kNotFound;

if (is8Bit()) {

if (matchString->is8Bit())

@@ -1249,7 +1249,7 @@ ALWAYS_INLINE static size_t reverseFindInner(const SearchCharacterType* searchCh

// keep looping until we match

while (searchHash != matchHash || !equal(searchCharacters + delta, matchCharacters, matchLength)) {

if (!delta)

- return notFound;

+ return kNotFound;

--delta;

searchHash -= searchCharacters[delta + matchLength];

searchHash += searchCharacters[delta];

@@ -1261,7 +1261,7 @@ size_t StringImpl::reverseFind(StringImpl* matchString, unsigned index)

{

// Check for null or empty string to match against

if (!matchString)

- return notFound;

+ return kNotFound;

unsigned matchLength = matchString->length();

unsigned ourLength = length();

if (!matchLength)

@@ -1276,7 +1276,7 @@ size_t StringImpl::reverseFind(StringImpl* matchString, unsigned index)

// Check index & matchLength are in range.

if (matchLength > ourLength)

- return notFound;

+ return kNotFound;

if (is8Bit()) {

if (matchString->is8Bit())

@@ -1299,7 +1299,7 @@ ALWAYS_INLINE static size_t reverseFindIgnoringCaseInner(const SearchCharacterTy

// keep looping until we match

while (!equalIgnoringCase(searchCharacters + delta, matchCharacters, matchLength)) {

if (!delta)

- return notFound;

+ return kNotFound;

--delta;

}

return delta;

@@ -1309,7 +1309,7 @@ size_t StringImpl::reverseFindIgnoringCase(StringImpl* matchString, unsigned ind

{

// Check for null or empty string to match against

if (!matchString)

- return notFound;

+ return kNotFound;

unsigned matchLength = matchString->length();

unsigned ourLength = length();

if (!matchLength)

@@ -1317,7 +1317,7 @@ size_t StringImpl::reverseFindIgnoringCase(StringImpl* matchString, unsigned ind

// Check index & matchLength are in range.

if (matchLength > ourLength)

- return notFound;

+ return kNotFound;

if (is8Bit()) {

if (matchString->is8Bit())

@@ -1510,7 +1510,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const LChar* replaceme

unsigned matchCount = 0;

// Count the matches.

- while ((srcSegmentStart = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentStart = find(pattern, srcSegmentStart)) != kNotFound) {

++matchCount;

++srcSegmentStart;

}

@@ -1537,7 +1537,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const LChar* replaceme

LChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

memcpy(data + dstOffset, characters8() + srcSegmentStart, srcSegmentLength * sizeof(LChar));

dstOffset += srcSegmentLength;

@@ -1557,7 +1557,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const LChar* replaceme

UChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

memcpy(data + dstOffset, characters16() + srcSegmentStart, srcSegmentLength * sizeof(UChar));

@@ -1585,7 +1585,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const UChar* replaceme

unsigned matchCount = 0;

// Count the matches.

- while ((srcSegmentStart = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentStart = find(pattern, srcSegmentStart)) != kNotFound) {

++matchCount;

++srcSegmentStart;

}

@@ -1612,7 +1612,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const UChar* replaceme

UChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

for (unsigned i = 0; i < srcSegmentLength; ++i)

data[i + dstOffset] = characters8()[i + srcSegmentStart];

@@ -1636,7 +1636,7 @@ PassRefPtr<StringImpl> StringImpl::replace(UChar pattern, const UChar* replaceme

UChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

memcpy(data + dstOffset, characters16() + srcSegmentStart, srcSegmentLength * sizeof(UChar));

@@ -1669,7 +1669,7 @@ PassRefPtr<StringImpl> StringImpl::replace(StringImpl* pattern, StringImpl* repl

unsigned matchCount = 0;

// Count the matches.

- while ((srcSegmentStart = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentStart = find(pattern, srcSegmentStart)) != kNotFound) {

++matchCount;

srcSegmentStart += patternLength;

}

@@ -1703,7 +1703,7 @@ PassRefPtr<StringImpl> StringImpl::replace(StringImpl* pattern, StringImpl* repl

// Case 1

LChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

memcpy(data + dstOffset, characters8() + srcSegmentStart, srcSegmentLength * sizeof(LChar));

dstOffset += srcSegmentLength;

@@ -1722,7 +1722,7 @@ PassRefPtr<StringImpl> StringImpl::replace(StringImpl* pattern, StringImpl* repl

UChar* data;

RefPtr<StringImpl> newImpl = createUninitialized(newSize, data);

- while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != notFound) {

+ while ((srcSegmentEnd = find(pattern, srcSegmentStart)) != kNotFound) {

srcSegmentLength = srcSegmentEnd - srcSegmentStart;

if (srcIs8Bit) {

// Case 3.

« no previous file with comments | « Source/wtf/text/StringImpl.h ('k') | Source/wtf/text/TextPosition.cpp » ('j') | no next file with comments »