Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29

1 files changed, 11 insertions, 1 deletions

diff --git a/src/ast/expr.cpp b/src/ast/expr.cpp
index 1525ed12..dc006212 100644
--- a/src/ast/expr.cpp
+++ b/src/ast/expr.cpp
@@ -93,6 +93,12 @@ NODE(ExprNode_Block, {
     return NEWNODE(ExprNode_Block, m_is_unsafe, m_yields_final_value, mv$(nodes), m_local_mod);
 })
 
+NODE(ExprNode_Try, {
+    os << "try " << *m_inner;
+},{
+    return NEWNODE(ExprNode_Try, m_inner->clone());
+})
+
 NODE(ExprNode_Macro, {
     os << m_name << "!";
     if( m_ident.size() > 0 )
@@ -358,7 +364,8 @@ NODE(ExprNode_Tuple, {
 })
 
 NODE(ExprNode_NamedValue, {
-    os << m_path;
+    m_path.print_pretty(os, false);
+    //os << m_path;
 },{
     return NEWNODE(ExprNode_NamedValue, AST::Path(m_path));
 })
@@ -470,6 +477,9 @@ NV(ExprNode_Block, {
         visit(child);
     //UNINDENT();
 })
+NV(ExprNode_Try, {
+    visit(node.m_inner);
+})
 NV(ExprNode_Macro,
 {
     BUG(node.span(), "Hit unexpanded macro in expression - " << node);