diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-01-01 18:45:10 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-01-01 18:45:10 +0800 |
| commit | 6bb397dadbaabeab1a2f8a44da52948c801833b7 (patch) | |
| tree | 5f78c86529729bfa35ab73d14cae1a1d4c64b5fd /src | |
| parent | 3ae5e62aedbd7e3c566e02579a76e759f7eb3cb9 (diff) | |
| download | mrust-6bb397dadbaabeab1a2f8a44da52948c801833b7.tar.gz | |
Typecheck Expressions - Fallback type for tuples in match ergonomics
Diffstat (limited to 'src')
| -rw-r--r-- | src/hir_typeck/expr_cs.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/hir_typeck/expr_cs.cpp b/src/hir_typeck/expr_cs.cpp index 041247ba..301c5d54 100644 --- a/src/hir_typeck/expr_cs.cpp +++ b/src/hir_typeck/expr_cs.cpp @@ -3781,6 +3781,8 @@ void Context::handle_pattern(const Span& sp, ::HIR::Pattern& pat, const ::HIR::T ::HIR::Pattern& m_pattern; ::HIR::PatternBinding::Type m_outer_mode; + mutable ::std::vector<::HIR::TypeRef> m_temp_ivars; + MatchErgonomicsRevisit(Span sp, ::HIR::TypeRef outer, ::HIR::Pattern& pat, ::HIR::PatternBinding::Type binding_mode=::HIR::PatternBinding::Type::Move): sp(mv$(sp)), m_outer_ty(mv$(outer)), m_pattern(pat), @@ -3852,7 +3854,7 @@ void Context::handle_pattern(const Span& sp, ::HIR::Pattern& pat, const ::HIR::T if( n_deref == 0 && is_fallback ) { ::HIR::TypeRef possible_type; - // TODO: Get a potential type from the pattern, and set as a possibility. + // Get a potential type from the pattern, and set as a possibility. // - Note, this is only if no derefs were applied TU_MATCH_HDR( (pattern.m_data), { ) TU_ARM(pattern.m_data, Any, pe) { @@ -3871,7 +3873,15 @@ void Context::handle_pattern(const Span& sp, ::HIR::Pattern& pat, const ::HIR::T BUG(sp, "Match ergonomics - & pattern"); } TU_ARM(pattern.m_data, Tuple, e) { - // TODO: Get type info `(T, U, ...)` + // Get type info `(T, U, ...)` + if( m_temp_ivars.size() != e.sub_patterns.size() ) { + for(size_t i = 0; i < e.sub_patterns.size(); i ++) + m_temp_ivars.push_back( context.m_ivars.new_ivar_tr() ); + } + decltype(m_temp_ivars) tuple; + for(const auto& ty : m_temp_ivars) + tuple.push_back(ty.clone()); + possible_type = ::HIR::TypeRef( ::std::move(tuple) ); } TU_ARM(pattern.m_data, SplitTuple, pe) { // Can't get type information, tuple size is unkown |