diff options
author | John Hodge <tpg@mutabah.net> | 2016-09-15 10:28:04 +0800 |
---|---|---|
committer | John Hodge <tpg@mutabah.net> | 2016-09-15 10:28:04 +0800 |
commit | b150106b0fc68d52b492ffe485e3c9c3ddad1c22 (patch) | |
tree | 72b8139ae29059bc1be2b06d97868fc3bc29ec14 /src/hir/from_ast_expr.cpp | |
parent | 1b8a291c385ef116a30ff3f643eb82d0163549f6 (diff) | |
download | mrust-b150106b0fc68d52b492ffe485e3c9c3ddad1c22.tar.gz |
Restructure - Don't insert automatic () statements at end of blocks
Diffstat (limited to 'src/hir/from_ast_expr.cpp')
-rw-r--r-- | src/hir/from_ast_expr.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/hir/from_ast_expr.cpp b/src/hir/from_ast_expr.cpp index 35d27b24..3a2cd652 100644 --- a/src/hir/from_ast_expr.cpp +++ b/src/hir/from_ast_expr.cpp @@ -30,14 +30,10 @@ struct LowerHIR_ExprNode_Visitor: auto rv = new ::HIR::ExprNode_Block(v.span()); for(const auto& n : v.m_nodes) { - if( n ) { - rv->m_nodes.push_back( LowerHIR_ExprNode_Inner( *n ) ); - } - else { - assert(&n == &v.m_nodes.back()); - rv->m_nodes.push_back( ::HIR::ExprNodeP( new ::HIR::ExprNode_Tuple(Span(), {}) ) ); - } + ASSERT_BUG(v.get_pos(), n, "NULL node encountered in block"); + rv->m_nodes.push_back( LowerHIR_ExprNode_Inner( *n ) ); } + rv->m_yields_final = v.m_yields_final_value; if( v.m_local_mod ) { |