HIR - Replace m_yeilds_final_value with a node

1 files changed, 4 insertions, 5 deletions

diff --git a/src/hir/expr.hpp b/src/hir/expr.hpp
index 81e89b28..3c37a930 100644
--- a/src/hir/expr.hpp
+++ b/src/hir/expr.hpp
@@ -68,21 +68,20 @@ struct ExprNode_Block:
 {
     bool    m_is_unsafe;
     ::std::vector< ExprNodeP >  m_nodes;
-    bool    m_yields_final;
+    ExprNodeP   m_value_node;   // can be null
 
     ::HIR::SimplePath   m_local_mod;
     t_trait_list    m_traits;
 
     ExprNode_Block(Span sp):
         ExprNode(mv$(sp)),
-        m_is_unsafe(false),
-        m_yields_final(false)
+        m_is_unsafe(false)
     {}
-    ExprNode_Block(Span sp, bool is_unsafe, ::std::vector<ExprNodeP> nodes):
+    ExprNode_Block(Span sp, bool is_unsafe, ::std::vector<ExprNodeP> nodes, ExprNodeP value_node):
         ExprNode( mv$(sp) ),
         m_is_unsafe(is_unsafe),
         m_nodes( mv$(nodes) ),
-        m_yields_final(false)
+        m_value_node( mv$(value_node) )
     {}
 
     NODE_METHODS();