diff options
Diffstat (limited to 'src/ast/expr.cpp')
| -rw-r--r-- | src/ast/expr.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/ast/expr.cpp b/src/ast/expr.cpp index 65048183..dd586683 100644 --- a/src/ast/expr.cpp +++ b/src/ast/expr.cpp @@ -85,9 +85,7 @@ NODE(ExprNode_Block, { ::std::vector<ExprNodeP> nodes; for(const auto& n : m_nodes) nodes.push_back( n->clone() ); - if( m_local_mod ) - TODO(get_pos(), "Handle cloning ExprNode_Block with a module"); - return NEWNODE(ExprNode_Block, m_is_unsafe, m_yields_final_value, mv$(nodes), nullptr); + return NEWNODE(ExprNode_Block, m_is_unsafe, m_yields_final_value, mv$(nodes), m_local_mod); }) NODE(ExprNode_Macro, { @@ -266,7 +264,16 @@ NODE(ExprNode_ByteString, { }) NODE(ExprNode_Closure, { - os << "/* todo: closure */"; + if( m_is_move ) + os << "move "; + os << "|"; + for(const auto& a : m_args) + { + os << a.first << ": " << a.second << ","; + } + os << "|"; + os << "->" << m_return; + os << " " << *m_code; },{ ExprNode_Closure::args_t args; for(const auto& a : m_args) { @@ -276,7 +283,16 @@ NODE(ExprNode_Closure, { }); NODE(ExprNode_StructLiteral, { - os << "/* todo: sl */"; + os << m_path << " { "; + for(const auto& v : m_values) + { + os << v.first << ": " << *v.second << ", "; + } + if(m_base_value) + { + os << ".." << *m_base_value; + } + os << "}"; },{ ExprNode_StructLiteral::t_values vals; |