From 8c38465b21dfc0553417dc2f13071ed865a3d740 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 9 Jul 2017 15:06:16 +0800 Subject: HIR Deserialise - Remove another place where ordering is assumed --- src/hir/deserialise.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp index 5870d269..21fc9cea 100644 --- a/src/hir/deserialise.cpp +++ b/src/hir/deserialise.cpp @@ -471,8 +471,11 @@ namespace { { switch( m_in.read_tag() ) { - case 0: - return ::HIR::TypeItem::make_Import({ deserialise_simplepath(), m_in.read_bool(), static_cast(m_in.read_count()) }); + case 0: { + auto spath = deserialise_simplepath(); + auto is_variant = m_in.read_bool(); + return ::HIR::TypeItem::make_Import({ mv$(spath), is_variant, static_cast(m_in.read_count()) }); + } case 1: return ::HIR::TypeItem( deserialise_module() ); case 2: @@ -493,8 +496,11 @@ namespace { { switch( m_in.read_tag() ) { - case 0: - return ::HIR::ValueItem::make_Import({ deserialise_simplepath(), m_in.read_bool(), static_cast(m_in.read_count()) }); + case 0: { + auto spath = deserialise_simplepath(); + auto is_variant = m_in.read_bool(); + return ::HIR::ValueItem::make_Import({ mv$(spath), is_variant, static_cast(m_in.read_count()) }); + } case 1: return ::HIR::ValueItem( deserialise_constant() ); case 2: -- cgit v1.2.3