mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Improve performance of nsScanner::ReadUntil by requiring the terminal set to be nsAFlatString and using an nested while loop rather than calling a string find function. b=65431 r=harishd@netscape.com sr=vidur@netscape.com

This commit is contained in:
dbaron%fas.harvard.edu 2001-04-28 02:03:18 +00:00
Родитель 6535b4afb1
Коммит 3f445a6238
4 изменённых файлов: 92 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

75
htmlparser/src/nsScanner.cpp
Просмотреть файл

@ -1156,7 +1156,7 @@ nsresult nsScanner::ReadWhile(nsString& aString,
* @return error code
*/
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1165,27 +1165,31 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end, setstart, setend;
nsReadingIterator<PRUnichar> origin, current, end;
const PRUnichar* setstart = aTerminalSet.get();
const PRUnichar* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
break;
}
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {
@ -1210,7 +1214,7 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
* @return error code
*/
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
const nsAReadableCString& aTerminalSet,
const nsAFlatCString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1220,27 +1224,30 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end;
nsReadingIterator<char> setstart, setend;
const char* setstart = aTerminalSet.get();
const char* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
break;
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {
@ -1255,7 +1262,7 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
nsReadingIterator<PRUnichar>& aEnd,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1264,28 +1271,32 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end, setstart, setend;
nsReadingIterator<PRUnichar> origin, current, end;
const PRUnichar* setstart = aTerminalSet.get();
const PRUnichar* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
aStart = origin;
aEnd = current;
break;
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
aStart = origin;
aEnd = current;
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {

6
htmlparser/src/nsScanner.h
Просмотреть файл

@ -215,11 +215,11 @@ class nsScanner {
* @return error code
*/
nsresult ReadUntil(nsAWritableString& aString,
const nsAReadableString& aTermSet,
const nsAFlatString& aTermSet,
PRBool addTerminal);
nsresult ReadUntil(nsAWritableString& aString,
const nsAReadableCString& aTermSet,
const nsAFlatCString& aTermSet,
PRBool addTerminal);
nsresult ReadUntil(nsAWritableString& aString,
@ -233,7 +233,7 @@ class nsScanner {
nsresult ReadUntil(nsReadingIterator<PRUnichar>& aStart,
nsReadingIterator<PRUnichar>& aEnd,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal);

75
parser/htmlparser/src/nsScanner.cpp
Просмотреть файл

@ -1156,7 +1156,7 @@ nsresult nsScanner::ReadWhile(nsString& aString,
* @return error code
*/
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1165,27 +1165,31 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end, setstart, setend;
nsReadingIterator<PRUnichar> origin, current, end;
const PRUnichar* setstart = aTerminalSet.get();
const PRUnichar* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
break;
}
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {
@ -1210,7 +1214,7 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
* @return error code
*/
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
const nsAReadableCString& aTerminalSet,
const nsAFlatCString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1220,27 +1224,30 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end;
nsReadingIterator<char> setstart, setend;
const char* setstart = aTerminalSet.get();
const char* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
break;
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
AppendUnicodeTo(origin, current, aString);
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {
@ -1255,7 +1262,7 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString,
nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
nsReadingIterator<PRUnichar>& aEnd,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal)
{
if (!mSlidingBuffer) {
@ -1264,28 +1271,32 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
PRUnichar theChar=0;
nsresult result=Peek(theChar);
nsReadingIterator<PRUnichar> origin, current, end, setstart, setend;
nsReadingIterator<PRUnichar> origin, current, end;
const PRUnichar* setstart = aTerminalSet.get();
const PRUnichar* setcurrent;
origin = mCurrentPosition;
current = origin;
end = mEndPosition;
while(current != end) {
setcurrent = setstart;
theChar=*current;
if(theChar) {
aTerminalSet.BeginReading(setstart);
aTerminalSet.EndReading(setend);
if (FindCharInReadable(theChar, setstart, setend)) {
if(addTerminal)
current++;
aStart = origin;
aEnd = current;
break;
while (*setcurrent) {
if (*setcurrent == theChar) {
if(addTerminal)
current++;
aStart = origin;
aEnd = current;
goto found;
}
setcurrent++;
}
}
current++;
}
found:
SetPosition(current);
if (current == end) {

6
parser/htmlparser/src/nsScanner.h
Просмотреть файл

@ -215,11 +215,11 @@ class nsScanner {
* @return error code
*/
nsresult ReadUntil(nsAWritableString& aString,
const nsAReadableString& aTermSet,
const nsAFlatString& aTermSet,
PRBool addTerminal);
nsresult ReadUntil(nsAWritableString& aString,
const nsAReadableCString& aTermSet,
const nsAFlatCString& aTermSet,
PRBool addTerminal);
nsresult ReadUntil(nsAWritableString& aString,
@ -233,7 +233,7 @@ class nsScanner {
nsresult ReadUntil(nsReadingIterator<PRUnichar>& aStart,
nsReadingIterator<PRUnichar>& aEnd,
const nsAReadableString& aTerminalSet,
const nsAFlatString& aTerminalSet,
PRBool addTerminal);