Commit a20aa64a authored by barraclough@apple.com's avatar barraclough@apple.com

2009-04-22 Gavin Barraclough <barraclough@apple.com>

        Rubber stamped by Sam "Blackbeard" Weinig.

        Although pirates do spell the word 'generate' as 'genertate',
        webkit developers do not.  Fixerate.

        * yarr/RegexJIT.cpp:
        (JSC::Yarr::RegexGenerator::generateAssertionBOL):
        (JSC::Yarr::RegexGenerator::generateAssertionEOL):
        (JSC::Yarr::RegexGenerator::generateAssertionWordBoundary):
        (JSC::Yarr::RegexGenerator::generatePatternCharacterSingle):
        (JSC::Yarr::RegexGenerator::generatePatternCharacterPair):
        (JSC::Yarr::RegexGenerator::generatePatternCharacterFixed):
        (JSC::Yarr::RegexGenerator::generatePatternCharacterGreedy):
        (JSC::Yarr::RegexGenerator::generatePatternCharacterNonGreedy):
        (JSC::Yarr::RegexGenerator::generateCharacterClassSingle):
        (JSC::Yarr::RegexGenerator::generateCharacterClassFixed):
        (JSC::Yarr::RegexGenerator::generateCharacterClassGreedy):
        (JSC::Yarr::RegexGenerator::generateCharacterClassNonGreedy):
        (JSC::Yarr::RegexGenerator::generateTerm):



git-svn-id: svn://svn.chromium.org/blink/trunk@42755 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3576db13
2009-04-22 Gavin Barraclough <barraclough@apple.com>
Rubber stamped by Sam "Blackbeard" Weinig.
Although pirates do spell the word 'generate' as 'genertate',
webkit developers do not. Fixerate.
* yarr/RegexJIT.cpp:
(JSC::Yarr::RegexGenerator::generateAssertionBOL):
(JSC::Yarr::RegexGenerator::generateAssertionEOL):
(JSC::Yarr::RegexGenerator::generateAssertionWordBoundary):
(JSC::Yarr::RegexGenerator::generatePatternCharacterSingle):
(JSC::Yarr::RegexGenerator::generatePatternCharacterPair):
(JSC::Yarr::RegexGenerator::generatePatternCharacterFixed):
(JSC::Yarr::RegexGenerator::generatePatternCharacterGreedy):
(JSC::Yarr::RegexGenerator::generatePatternCharacterNonGreedy):
(JSC::Yarr::RegexGenerator::generateCharacterClassSingle):
(JSC::Yarr::RegexGenerator::generateCharacterClassFixed):
(JSC::Yarr::RegexGenerator::generateCharacterClassGreedy):
(JSC::Yarr::RegexGenerator::generateCharacterClassNonGreedy):
(JSC::Yarr::RegexGenerator::generateTerm):
2009-04-22 Gavin Barraclough <barraclough@apple.com>
Reviewed by Sam "Blackbeard" Weinig.
......@@ -395,7 +395,7 @@ class RegexGenerator : private MacroAssembler {
bool isBackTrackGenerated;
};
void genertateAssertionBOL(TermGenerationState& state)
void generateAssertionBOL(TermGenerationState& state)
{
PatternTerm& term = state.term();
......@@ -420,7 +420,7 @@ class RegexGenerator : private MacroAssembler {
}
}
void genertateAssertionEOL(TermGenerationState& state)
void generateAssertionEOL(TermGenerationState& state)
{
PatternTerm& term = state.term();
......@@ -458,7 +458,7 @@ class RegexGenerator : private MacroAssembler {
matchCharacterClass(character, nextIsWordChar, m_pattern.wordcharCharacterClass());
}
void genertateAssertionWordBoundary(TermGenerationState& state)
void generateAssertionWordBoundary(TermGenerationState& state)
{
const RegisterID character = regT0;
PatternTerm& term = state.term();
......@@ -502,7 +502,7 @@ class RegexGenerator : private MacroAssembler {
wordCharThenNonWordChar.link(this);
}
void genertatePatternCharacterSingle(TermGenerationState& state)
void generatePatternCharacterSingle(TermGenerationState& state)
{
const RegisterID character = regT0;
UChar ch = state.term().patternCharacter;
......@@ -517,7 +517,7 @@ class RegexGenerator : private MacroAssembler {
}
}
void genertatePatternCharacterPair(TermGenerationState& state)
void generatePatternCharacterPair(TermGenerationState& state)
{
const RegisterID character = regT0;
UChar ch1 = state.term().patternCharacter;
......@@ -541,7 +541,7 @@ class RegexGenerator : private MacroAssembler {
state.jumpToBacktrack(branch32(NotEqual, BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), Imm32(chPair)), this);
}
void genertatePatternCharacterFixed(TermGenerationState& state)
void generatePatternCharacterFixed(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -564,7 +564,7 @@ class RegexGenerator : private MacroAssembler {
branch32(NotEqual, countRegister, index).linkTo(loop, this);
}
void genertatePatternCharacterGreedy(TermGenerationState& state)
void generatePatternCharacterGreedy(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -602,7 +602,7 @@ class RegexGenerator : private MacroAssembler {
state.setBacktrackGenerated(backtrackBegin);
}
void genertatePatternCharacterNonGreedy(TermGenerationState& state)
void generatePatternCharacterNonGreedy(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -640,7 +640,7 @@ class RegexGenerator : private MacroAssembler {
state.setBacktrackGenerated(backtrackBegin);
}
void genertateCharacterClassSingle(TermGenerationState& state)
void generateCharacterClassSingle(TermGenerationState& state)
{
const RegisterID character = regT0;
PatternTerm& term = state.term();
......@@ -657,7 +657,7 @@ class RegexGenerator : private MacroAssembler {
}
}
void genertateCharacterClassFixed(TermGenerationState& state)
void generateCharacterClassFixed(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -682,7 +682,7 @@ class RegexGenerator : private MacroAssembler {
branch32(NotEqual, countRegister, index).linkTo(loop, this);
}
void genertateCharacterClassGreedy(TermGenerationState& state)
void generateCharacterClassGreedy(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -723,7 +723,7 @@ class RegexGenerator : private MacroAssembler {
state.setBacktrackGenerated(backtrackBegin);
}
void genertateCharacterClassNonGreedy(TermGenerationState& state)
void generateCharacterClassNonGreedy(TermGenerationState& state)
{
const RegisterID character = regT0;
const RegisterID countRegister = regT1;
......@@ -1009,15 +1009,15 @@ class RegexGenerator : private MacroAssembler {
switch (term.type) {
case PatternTerm::TypeAssertionBOL:
genertateAssertionBOL(state);
generateAssertionBOL(state);
break;
case PatternTerm::TypeAssertionEOL:
genertateAssertionEOL(state);
generateAssertionEOL(state);
break;
case PatternTerm::TypeAssertionWordBoundary:
genertateAssertionWordBoundary(state);
generateAssertionWordBoundary(state);
break;
case PatternTerm::TypePatternCharacter:
......@@ -1025,18 +1025,18 @@ class RegexGenerator : private MacroAssembler {
case QuantifierFixedCount:
if (term.quantityCount == 1) {
if (state.isSinglePatternCharacterLookaheadTerm() && (state.lookaheadTerm().inputPosition == (term.inputPosition + 1))) {
genertatePatternCharacterPair(state);
generatePatternCharacterPair(state);
state.nextTerm();
} else
genertatePatternCharacterSingle(state);
generatePatternCharacterSingle(state);
} else
genertatePatternCharacterFixed(state);
generatePatternCharacterFixed(state);
break;
case QuantifierGreedy:
genertatePatternCharacterGreedy(state);
generatePatternCharacterGreedy(state);
break;
case QuantifierNonGreedy:
genertatePatternCharacterNonGreedy(state);
generatePatternCharacterNonGreedy(state);
break;
}
break;
......@@ -1045,15 +1045,15 @@ class RegexGenerator : private MacroAssembler {
switch (term.quantityType) {
case QuantifierFixedCount:
if (term.quantityCount == 1)
genertateCharacterClassSingle(state);
generateCharacterClassSingle(state);
else
genertateCharacterClassFixed(state);
generateCharacterClassFixed(state);
break;
case QuantifierGreedy:
genertateCharacterClassGreedy(state);
generateCharacterClassGreedy(state);
break;
case QuantifierNonGreedy:
genertateCharacterClassNonGreedy(state);
generateCharacterClassNonGreedy(state);
break;
}
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment