izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer early exit/break to large conditional blocks.

Browse Source 
Some of these are large and contain smaller unrelated refactors.
This commit is contained in:
John Hood
2016-11-07 00:52:19 -05:00
parent b1a6f7c144
commit 1ae23b4dcc
4 changed files with 176 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/terminaloverlay.cc
+22 -24
View File
@@ -90,32 +90,30 @@ Validity ConditionalOverlayCell::get_validity( const Framebuffer &fb, int row,
const Cell &current = *( fb.get_cell( row, col ) );
/* see if it hasn't been updated yet */
if ( late_ack >= expiration_frame ) {
if ( unknown ) {
return CorrectNoCredit;
}
if ( replacement.is_blank() ) { /* too easy for this to trigger falsely */
return CorrectNoCredit;
}
if ( current.contents_match( replacement ) ) {
vector<Cell>::const_iterator it = original_contents.begin();
for ( ; it != original_contents.end(); it++ ) {
if ( it->contents_match( replacement ) )
break;
}
if ( it == original_contents.end() ) {
return Correct;
} else {
return CorrectNoCredit;
}
} else {
return IncorrectOrExpired;
}
if ( late_ack < expiration_frame ) {
return Pending;
}
return Pending;
if ( unknown ) {
return CorrectNoCredit;
}
if ( replacement.is_blank() ) { /* too easy for this to trigger falsely */
return CorrectNoCredit;
}
if ( current.contents_match( replacement ) ) {
vector<Cell>::const_iterator it = original_contents.begin();
for ( ; it != original_contents.end(); it++ ) {
if ( it->contents_match( replacement ) )
break;
}
if ( it == original_contents.end() ) {
return Correct;
}
return CorrectNoCredit;
}
return IncorrectOrExpired;
}
Validity ConditionalCursorMove::get_validity( const Framebuffer &fb,