Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
afwbkbc committed Jan 11, 2024
1 parent dff42c8 commit 6a337b8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/config/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ CLASS( Config, base::Module )

#ifdef DEBUG

uint16_t m_debug_flags = DF_NONE;
uint32_t m_debug_flags = DF_NONE;
util::Random::state_t m_quickstart_seed = {};
std::string m_quickstart_mapdump = "";
std::string m_quickstart_mapfile = "";
Expand Down
36 changes: 18 additions & 18 deletions src/gse/parser/JS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,29 +170,29 @@ const program::Scope* JS::GetScope( const source_elements_t::const_iterator& beg
}
}
if ( brackets.empty() ) {
if (
( *it)->m_type == SourceElement::ET_BLOCK &&
( (Block *)( *it))->m_block_type == BLOCK_CURLY_BRACKETS &&
( (Block *)( *it))->m_block_side == Block::BS_BEGIN &&
if (
( *it )->m_type == SourceElement::ET_BLOCK &&
( ( Block * )( *it ) )->m_block_type == BLOCK_CURLY_BRACKETS &&
( ( Block * )( *it ) )->m_block_side == Block::BS_BEGIN &&
( *it_end )->m_type == SourceElement::ET_BLOCK &&
( (Block *)( *it_end))->m_block_type == BLOCK_CURLY_BRACKETS &&
( (Block *)( *it_end))->m_block_side == Block::BS_END &&
it_end != end &&
it_end + 1 != end &&
(*(it_end + 1))->m_type != SourceElement::ET_CONDITIONAL
( ( Block * )( *it_end ) )->m_block_type == BLOCK_CURLY_BRACKETS &&
( ( Block * )( *it_end ) )->m_block_side == Block::BS_END &&
it_end != end &&
it_end + 1 != end &&
( *( it_end + 1 ) )->m_type != SourceElement::ET_CONDITIONAL
) {
body.push_back( GetControl( it, it_end + 1 ) );
break;
}
else if (
( *it_end )->m_type == SourceElement::ET_DELIMITER &&
body.push_back( GetControl( it, it_end + 1 ) );
break;
}
else if (
( *it_end )->m_type == SourceElement::ET_DELIMITER &&
( ( Delimiter * )( *it_end ) )->m_delimiter_type == Delimiter::DT_CODE
) {
if ( it != it_end ) {
body.push_back( GetControl( it, it_end ) );
}
break;
if ( it != it_end ) {
body.push_back( GetControl( it, it_end ) );
}
break;
}
}
if ( it_end != end ) {
it_end++;
Expand Down

0 comments on commit 6a337b8

Please sign in to comment.