Changeset 65358 in webkit


Ignore:
Timestamp:
Aug 13, 2010 11:26:10 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-08-13 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename some concepts in HTML entity search to be more self-documenting
​https://bugs.webkit.org/show_bug.cgi?id=44004

Start and end are now first and last, which lets us use some better
names for the statics in HTMLEntityTable.

  • html/HTMLEntityParser.cpp: (WebCore::consumeHTMLEntity):
  • html/HTMLEntitySearch.cpp: (WebCore::HTMLEntitySearch::HTMLEntitySearch): (WebCore::HTMLEntitySearch::findFirst): (WebCore::HTMLEntitySearch::findLast): (WebCore::HTMLEntitySearch::advance):
  • html/HTMLEntitySearch.h: (WebCore::HTMLEntitySearch::isEntityPrefix): (WebCore::HTMLEntitySearch::mostRecentMatch): (WebCore::HTMLEntitySearch::fail):
  • html/HTMLEntityTable.h:

2010-08-13 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename some concepts in HTML entity search to be more self-documenting
​https://bugs.webkit.org/show_bug.cgi?id=44004

Reflect name change in generator script.

  • Scripts/create-html-entity-table:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r65354 r65358  
     12010-08-13  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename some concepts in HTML entity search to be more self-documenting
     6        https://bugs.webkit.org/show_bug.cgi?id=44004
     7
     8        Start and end are now first and last, which lets us use some better
     9        names for the statics in HTMLEntityTable.
     10
     11        * html/HTMLEntityParser.cpp:
     12        (WebCore::consumeHTMLEntity):
     13        * html/HTMLEntitySearch.cpp:
     14        (WebCore::HTMLEntitySearch::HTMLEntitySearch):
     15        (WebCore::HTMLEntitySearch::findFirst):
     16        (WebCore::HTMLEntitySearch::findLast):
     17        (WebCore::HTMLEntitySearch::advance):
     18        * html/HTMLEntitySearch.h:
     19        (WebCore::HTMLEntitySearch::isEntityPrefix):
     20        (WebCore::HTMLEntitySearch::mostRecentMatch):
     21        (WebCore::HTMLEntitySearch::fail):
     22        * html/HTMLEntityTable.h:
     23
    1242010-08-13  Adam Barth  <abarth@webkit.org>
    225

  • trunk/WebCore/html/HTMLEntityParser.cpp

    r65354 r65358  
    197197                return 0;
    198198            }
    199             if (!entitySearch.lastMatch()) {
     199            if (!entitySearch.mostRecentMatch()) {
    200200                ASSERT(!entitySearch.currentValue());
    201201                unconsumeCharacters(source, consumedCharacters);
    202202                return 0;
    203203            }
    204             if (entitySearch.lastMatch()->length != entitySearch.currentLength()) {
     204            if (entitySearch.mostRecentMatch()->length != entitySearch.currentLength()) {
    205205                // We've consumed too many characters.  We need to walk the
    206206                // source back to the point at which we had consumed an
    … …  
    208208                unconsumeCharacters(source, consumedCharacters);
    209209                consumedCharacters.clear();
    210                 const int length = entitySearch.lastMatch()->length;
    211                 const UChar* reference = entitySearch.lastMatch()->entity;
     210                const int length = entitySearch.mostRecentMatch()->length;
     211                const UChar* reference = entitySearch.mostRecentMatch()->entity;
    212212                for (int i = 0; i < length; ++i) {
    213213                    cc = *source;
    … …  
    219219                cc = *source;
    220220            }
    221             if (entitySearch.lastMatch()->lastCharacter() == ';')
    222                 return entitySearch.lastMatch()->value;
     221            if (entitySearch.mostRecentMatch()->lastCharacter() == ';')
     222                return entitySearch.mostRecentMatch()->value;
    223223            if (!additionalAllowedCharacter || !(isAlphaNumeric(cc) || cc == '='))
    224                 return entitySearch.lastMatch()->value;
     224                return entitySearch.mostRecentMatch()->value;
    225225            unconsumeCharacters(source, consumedCharacters);
    226226            return 0;

  • trunk/WebCore/html/HTMLEntitySearch.cpp

    r65351 r65358  
    4343    : m_currentLength(0)
    4444    , m_currentValue(0)
    45     , m_lastMatch(0)
    46     , m_start(HTMLEntityTable::start())
    47     , m_end(HTMLEntityTable::end())
     45    , m_mostRecentMatch(0)
     46    , m_first(HTMLEntityTable::firstEntry())
     47    , m_last(HTMLEntityTable::lastEntry())
    4848{
    4949}
    … …  
    5959}
    6060
    61 const HTMLEntityTableEntry* HTMLEntitySearch::findStart(UChar nextCharacter) const
     61const HTMLEntityTableEntry* HTMLEntitySearch::findFirst(UChar nextCharacter) const
    6262{
    63     const HTMLEntityTableEntry* left = m_start;
    64     const HTMLEntityTableEntry* right = m_end;
     63    const HTMLEntityTableEntry* left = m_first;
     64    const HTMLEntityTableEntry* right = m_last;
    6565    if (left == right)
    6666        return left;
    … …  
    8484}
    8585
    86 const HTMLEntityTableEntry* HTMLEntitySearch::findEnd(UChar nextCharacter) const
     86const HTMLEntityTableEntry* HTMLEntitySearch::findLast(UChar nextCharacter) const
    8787{
    88     const HTMLEntityTableEntry* left = m_start;
    89     const HTMLEntityTableEntry* right = m_end;
     88    const HTMLEntityTableEntry* left = m_first;
     89    const HTMLEntityTableEntry* right = m_last;
    9090    if (left == right)
    9191        return right;
    … …  
    113113    ASSERT(isEntityPrefix());
    114114    if (!m_currentLength) {
    115         m_start = HTMLEntityTable::start(nextCharacter);
    116         m_end = HTMLEntityTable::end(nextCharacter);
     115        m_first = HTMLEntityTable::firstEntryStartingWith(nextCharacter);
     116        m_last = HTMLEntityTable::lastEntryStartingWith(nextCharacter);
    117117    } else {
    118         m_start = findStart(nextCharacter);
    119         m_end = findEnd(nextCharacter);
    120         if (m_start == m_end && compare(m_start, nextCharacter) != Prefix)
     118        m_first = findFirst(nextCharacter);
     119        m_last = findLast(nextCharacter);
     120        if (m_first == m_last && compare(m_first, nextCharacter) != Prefix)
    121121            return fail();
    122122    }
    123123    ++m_currentLength;
    124     if (m_start->length != m_currentLength) {
     124    if (m_first->length != m_currentLength) {
    125125        m_currentValue = 0;
    126126        return;
    127127    }
    128     m_lastMatch = m_start;
    129     m_currentValue = m_lastMatch->value;
     128    m_mostRecentMatch = m_first;
     129    m_currentValue = m_mostRecentMatch->value;
    130130}
    131131

  • trunk/WebCore/html/HTMLEntitySearch.h

    r65351 r65358  
    3939    void advance(UChar);
    4040
    41     bool isEntityPrefix() const { return !!m_start; }
     41    bool isEntityPrefix() const { return !!m_first; }
    4242    int currentValue() const { return m_currentValue; }
    4343    int currentLength() const { return m_currentLength; }
    4444
    45     const HTMLEntityTableEntry* lastMatch() const { return m_lastMatch; }
     45    const HTMLEntityTableEntry* mostRecentMatch() const { return m_mostRecentMatch; }
    4646
    4747private:
    … …  
    5353
    5454    CompareResult compare(const HTMLEntityTableEntry*, UChar) const;
    55     const HTMLEntityTableEntry* findStart(UChar) const;
    56     const HTMLEntityTableEntry* findEnd(UChar) const;
     55    const HTMLEntityTableEntry* findFirst(UChar) const;
     56    const HTMLEntityTableEntry* findLast(UChar) const;
    5757
    5858    void fail()
    5959    {
    6060        m_currentValue = 0;
    61         m_start = 0;
    62         m_end = 0;
     61        m_first = 0;
     62        m_last = 0;
    6363    }
    6464
    … …  
    6666    int m_currentValue;
    6767
    68     const HTMLEntityTableEntry* m_lastMatch;
    69     const HTMLEntityTableEntry* m_start;
    70     const HTMLEntityTableEntry* m_end;
     68    const HTMLEntityTableEntry* m_mostRecentMatch;
     69    const HTMLEntityTableEntry* m_first;
     70    const HTMLEntityTableEntry* m_last;
    7171};
    7272

  • trunk/WebCore/html/HTMLEntityTable.h

    r65351 r65358  
    4141class HTMLEntityTable {
    4242public:
    43     static const HTMLEntityTableEntry* start();
    44     static const HTMLEntityTableEntry* end();
     43    static const HTMLEntityTableEntry* firstEntry();
     44    static const HTMLEntityTableEntry* lastEntry();
    4545
    46     static const HTMLEntityTableEntry* start(UChar);
    47     static const HTMLEntityTableEntry* end(UChar);
     46    static const HTMLEntityTableEntry* firstEntryStartingWith(UChar);
     47    static const HTMLEntityTableEntry* lastEntryStartingWith(UChar);
    4848};
    4949

  • trunk/WebKitTools/ChangeLog

    r65351 r65358  
     12010-08-13  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename some concepts in HTML entity search to be more self-documenting
     6        https://bugs.webkit.org/show_bug.cgi?id=44004
     7
     8        Reflect name change in generator script.
     9
     10        * Scripts/create-html-entity-table:
     11
    1122010-08-12  Adam Barth  <abarth@webkit.org>
    213

  • trunk/WebKitTools/Scripts/create-html-entity-table

    r65351 r65358  
    146146}
    147147
    148 const HTMLEntityTableEntry* HTMLEntityTable::start(UChar c)
     148const HTMLEntityTableEntry* HTMLEntityTable::firstEntryStartingWith(UChar c)
    149149{
    150150    if (c >= 'A' && c <= 'Z')
    … …  
    155155}
    156156
    157 const HTMLEntityTableEntry* HTMLEntityTable::end(UChar c)
     157const HTMLEntityTableEntry* HTMLEntityTable::lastEntryStartingWith(UChar c)
    158158{
    159159    if (c >= 'A' && c <= 'Z')
    … …  
    164164}
    165165
    166 const HTMLEntityTableEntry* HTMLEntityTable::start()
     166const HTMLEntityTableEntry* HTMLEntityTable::firstEntry()
    167167{
    168168    return &staticEntityTable[0];
    169169}
    170170
    171 const HTMLEntityTableEntry* HTMLEntityTable::end()
     171const HTMLEntityTableEntry* HTMLEntityTable::lastEntry()
    172172{
    173173    return &staticEntityTable[%s - 1];
Note: See TracChangeset for help on using the changeset viewer.