Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch by Vasilis Kaoutsis: removed the use of goto

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20147 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2007-02-17 13:35:40 +00:00
parent 0ba2462a6d
commit f082d94258
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/apps/terminal/TermView.cpp
View File

@ -2229,52 +2229,54 @@ TermView::Find (const BString &str, bool forwardSearch, bool matchCase, bool mat
offset = (selectionstart.y) * fTermColumns + selectionstart.x;
}
restart:
//Actual search
if (forwardSearch) {
if (matchCase) {
result = buffer.FindFirst(str, offset);
} else {
result = buffer.IFindFirst(str, offset);
}
} else {
if (matchCase) {
result = buffer.FindLast(str, offset);
} else {
result = buffer.IFindLast(str, offset);
}
}
if (result == B_ERROR) { //Wrap search like Be's Terminal
for (;;) {
//Actual search
if (forwardSearch) {
if (matchCase) {
result = buffer.FindFirst(str, 0);
} else {
result = buffer.IFindFirst(str, 0);
}
} else {
if (matchCase) {
result = buffer.FindLast(str, buffer.Length());
} else {
result = buffer.IFindLast(str, buffer.Length());
}
}
}
if (result < 0)
return false;
if (matchWord) {
if (isalnum(buffer.ByteAt(result - 1)) || isalnum(buffer.ByteAt(result + str.Length()))) {
if (initialresult == -1) //Set the initial offset to the first result to aid word matching
initialresult = result;
else if (initialresult == result) //We went round the buffer, nothing found
return false;
if (forwardSearch)
offset = result + str.Length();
if (matchCase)
result = buffer.FindFirst(str, offset);
else
offset = result;
goto restart;
result = buffer.IFindFirst(str, offset);
} else {
if (matchCase)
result = buffer.FindLast(str, offset);
else
result = buffer.IFindLast(str, offset);
}
if (result == B_ERROR) { //Wrap search like Be's Terminal
if (forwardSearch) {
if (matchCase)
result = buffer.FindFirst(str, 0);
else
result = buffer.IFindFirst(str, 0);
} else {
if (matchCase)
result = buffer.FindLast(str, buffer.Length());
else
result = buffer.IFindLast(str, buffer.Length());
}
}
if (result < 0)
return false;
if (matchWord) {
if (isalnum(buffer.ByteAt(result - 1)) || isalnum(buffer.ByteAt(result + str.Length()))) {
if (initialresult == -1) //Set the initial offset to the first result to aid word matching
initialresult = result;
else if (initialresult == result) //We went round the buffer, nothing found
return false;
if (forwardSearch)
offset = result + str.Length();
else
offset = result;
continue;
}
else
break;
}
else
break;
}
//Select the found text