From b6e4b12bdc3f55b23f71c42c8f3e34bb8c383f3a Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 4 Feb 2018 22:57:59 +0800 Subject: Trans - Fixes to edge cases with enum variants --- src/trans/codegen_c.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/trans/codegen_c.cpp') diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp index 1bf2d923..d208c2ca 100644 --- a/src/trans/codegen_c.cpp +++ b/src/trans/codegen_c.cpp @@ -1437,7 +1437,11 @@ namespace { MIR_ASSERT(*m_mir_res, ty.m_data.as_Path().binding.is_Enum(), ""); const auto* repr = Target_GetTypeRepr(sp, m_resolve, ty); const auto& enm = *ty.m_data.as_Path().binding.as_Enum(); - if( const auto* ve = repr->variants.opt_NonZero() ) + if( repr->variants.is_None() ) + { + m_of << "{}"; + } + else if( const auto* ve = repr->variants.opt_NonZero() ) { if( e.idx == ve->zero_variant ) { @@ -2527,7 +2531,11 @@ namespace { const auto& ty = mir_res.get_lvalue_type(tmp, e.dst); auto* repr = Target_GetTypeRepr(sp, m_resolve, ty); - if( const auto* re = repr->variants.opt_NonZero() ) + if( repr->variants.is_None() ) + { + emit_lvalue(e.dst); m_of << ".TAG = "; emit_param(ve.val); + } + else if( const auto* re = repr->variants.opt_NonZero() ) { MIR_ASSERT(*m_mir_res, ve.index < 2, ""); if( ve.index == re->zero_variant ) { -- cgit v1.2.3