From 8b2dbb2481abadec1f5d5cb0af888ca2916b252f Mon Sep 17 00:00:00 2001 From: John Hodge Date: Wed, 18 May 2016 10:52:06 +0800 Subject: HIR/from_ast - Pattern conversion mostly done, crashes. --- src/hir/from_ast_expr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/hir/from_ast_expr.cpp') diff --git a/src/hir/from_ast_expr.cpp b/src/hir/from_ast_expr.cpp index 2ab1507a..4a801361 100644 --- a/src/hir/from_ast_expr.cpp +++ b/src/hir/from_ast_expr.cpp @@ -251,10 +251,10 @@ struct LowerHIR_ExprNode_Visitor: virtual void visit(::AST::ExprNode_Tuple& v) override { } virtual void visit(::AST::ExprNode_NamedValue& v) override { - if( v.m_path.is_trivial() ) { + TU_IFLET(::AST::Path::Class, v.m_path.m_class, Local, e, auto slot = v.m_path.binding().as_Variable().slot; - m_rv.reset( new ::HIR::ExprNode_Variable( v.m_path.nodes()[0].name(), slot ) ); - } + m_rv.reset( new ::HIR::ExprNode_Variable( e.name, slot ) ); + ) else { m_rv.reset( new ::HIR::ExprNode_PathValue( LowerHIR_Path(v.m_path) ) ); } -- cgit v1.2.3