Remove excessive parentheses

There are many more.
This commit is contained in:
John Hood
2016-11-07 00:56:02 -05:00
parent 1ae23b4dcc
commit 3346419724
8 changed files with 23 additions and 18 deletions
+5 -5
View File
@@ -79,15 +79,15 @@ Transition State::input( wchar_t ch ) const
static bool C0_prime( wchar_t ch )
{
return ( (ch <= 0x17)
|| (ch == 0x19)
|| ( (0x1C <= ch) && (ch <= 0x1F) ) );
return (ch <= 0x17)
|| (ch == 0x19)
|| ( (0x1C <= ch) && (ch <= 0x1F) );
}
static bool GLGR ( wchar_t ch )
{
return ( ( (0x20 <= ch) && (ch <= 0x7F) ) /* GL area */
|| ( (0xA0 <= ch) && (ch <= 0xFF) ) ); /* GR area */
return ( (0x20 <= ch) && (ch <= 0x7F) ) /* GL area */
|| ( (0xA0 <= ch) && (ch <= 0xFF) ); /* GR area */
}
Transition Ground::input_state_rule( wchar_t ch ) const
+1 -1
View File
@@ -179,5 +179,5 @@ void Emulator::resize( size_t s_width, size_t s_height )
bool Emulator::operator==( Emulator const &x ) const
{
/* dispatcher and user are irrelevant for us */
return ( fb == x.fb );
return fb == x.fb;
}
+6 -2
View File
@@ -248,6 +248,10 @@ void Dispatcher::OSC_start( const Parser::OSC_Start *act __attribute((unused)) )
bool Dispatcher::operator==( const Dispatcher &x ) const
{
return ( params == x.params ) && ( parsed_params == x.parsed_params ) && ( parsed == x.parsed )
&& ( dispatch_chars == x.dispatch_chars ) && ( OSC_string == x.OSC_string ) && ( terminal_to_host == x.terminal_to_host );
return ( params == x.params )
&& ( parsed_params == x.parsed_params )
&& ( parsed == x.parsed )
&& ( dispatch_chars == x.dispatch_chars )
&& ( OSC_string == x.OSC_string )
&& ( terminal_to_host == x.terminal_to_host );
}
+2 -1
View File
@@ -227,7 +227,8 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const
/* Common case: if we're already on the bottom line and we're scrolling the whole
* screen, just do a CR and LFs.
*/
if ( (scroll_height + lines_scrolled == f.ds.get_height() ) && frame.cursor_y + 1 == f.ds.get_height() ) {
if ( scroll_height + lines_scrolled == f.ds.get_height()
&& frame.cursor_y + 1 == f.ds.get_height() ) {
frame.append( '\r' );
frame.append( lines_scrolled, '\n' );
frame.cursor_x = 0;
+2 -2
View File
@@ -584,8 +584,8 @@ void Dispatcher::OSC_dispatch( const Parser::OSC_End *act __attribute((unused)),
cmd_num = OSC_string[ 0 ] - L'0';
offset = 2;
}
bool set_icon = (cmd_num == 0 || cmd_num == 1);
bool set_title = (cmd_num == 0 || cmd_num == 2);
bool set_icon = cmd_num == 0 || cmd_num == 1;
bool set_title = cmd_num == 0 || cmd_num == 2;
if ( set_icon || set_title ) {
fb->set_title_initialized();
int title_length = min(OSC_string.size(), (size_t)256);