diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-11 21:46:36 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-11 21:46:36 +0000 |
commit | 759100fb0dcb41518f2a593dae5de5bbedd07776 (patch) | |
tree | 1889a546fdec52286157c2a1d8e11eca2c4883dc /crates/ra_hir_def/src/body | |
parent | af5042bd61877383398c17d941cf4f93f1c2d6be (diff) | |
parent | a3b104aa6df205e74c116d8c9e41900807924e70 (diff) |
Merge #3062
3062: Implement slice pattern AST > HIR lowering r=jplatte a=jplatte
WIP. The necessary changes for parsing are implemented, but actual inference is not yet. Just wanted to upload what I've got so far so it doesn't get duplicated :)
Will fix #3043
Co-authored-by: Jonas Platte <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/body')
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index fe0973fc7..1fc892362 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -8,7 +8,7 @@ use ra_arena::Arena; | |||
8 | use ra_syntax::{ | 8 | use ra_syntax::{ |
9 | ast::{ | 9 | ast::{ |
10 | self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, ModuleItemOwner, NameOwner, | 10 | self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, ModuleItemOwner, NameOwner, |
11 | TypeAscriptionOwner, | 11 | SlicePatComponents, TypeAscriptionOwner, |
12 | }, | 12 | }, |
13 | AstNode, AstPtr, | 13 | AstNode, AstPtr, |
14 | }; | 14 | }; |
@@ -596,7 +596,7 @@ where | |||
596 | let args = p.args().map(|p| self.collect_pat(p)).collect(); | 596 | let args = p.args().map(|p| self.collect_pat(p)).collect(); |
597 | Pat::Tuple(args) | 597 | Pat::Tuple(args) |
598 | } | 598 | } |
599 | ast::Pat::PlaceholderPat(_) => Pat::Wild, | 599 | ast::Pat::PlaceholderPat(_) | ast::Pat::DotDotPat(_) => Pat::Wild, |
600 | ast::Pat::RecordPat(p) => { | 600 | ast::Pat::RecordPat(p) => { |
601 | let path = p.path().and_then(|path| self.expander.parse_path(path)); | 601 | let path = p.path().and_then(|path| self.expander.parse_path(path)); |
602 | let record_field_pat_list = | 602 | let record_field_pat_list = |
@@ -621,12 +621,20 @@ where | |||
621 | 621 | ||
622 | Pat::Record { path, args: fields } | 622 | Pat::Record { path, args: fields } |
623 | } | 623 | } |
624 | ast::Pat::SlicePat(p) => { | ||
625 | let SlicePatComponents { prefix, slice, suffix } = p.components(); | ||
626 | |||
627 | Pat::Slice { | ||
628 | prefix: prefix.into_iter().map(|p| self.collect_pat(p)).collect(), | ||
629 | slice: slice.map(|p| self.collect_pat(p)), | ||
630 | suffix: suffix.into_iter().map(|p| self.collect_pat(p)).collect(), | ||
631 | } | ||
632 | } | ||
624 | 633 | ||
625 | // FIXME: implement | 634 | // FIXME: implement |
626 | ast::Pat::DotDotPat(_) => Pat::Missing, | ||
627 | ast::Pat::BoxPat(_) => Pat::Missing, | 635 | ast::Pat::BoxPat(_) => Pat::Missing, |
628 | ast::Pat::LiteralPat(_) => Pat::Missing, | 636 | ast::Pat::LiteralPat(_) => Pat::Missing, |
629 | ast::Pat::SlicePat(_) | ast::Pat::RangePat(_) => Pat::Missing, | 637 | ast::Pat::RangePat(_) => Pat::Missing, |
630 | }; | 638 | }; |
631 | let ptr = AstPtr::new(&pat); | 639 | let ptr = AstPtr::new(&pat); |
632 | self.alloc_pat(pattern, Either::Left(ptr)) | 640 | self.alloc_pat(pattern, Either::Left(ptr)) |