Match multiple patterns
This commit is contained in:
@@ -34,7 +34,7 @@ pub enum Statement {
|
||||
iterator: Expression,
|
||||
body: Box<Statement>,
|
||||
},
|
||||
Match(Expression, Vec<(Pattern, Block)>),
|
||||
Match(Expression, Vec<(Vec<Pattern>, Block)>),
|
||||
|
||||
Return(Option<Expression>),
|
||||
Break,
|
||||
|
||||
@@ -446,8 +446,10 @@ for_stmt = {
|
||||
// MATCH
|
||||
// ------------------------------------------------------
|
||||
|
||||
pattern_list = { pattern ~ ("|" ~ pattern)* }
|
||||
|
||||
match_item = {
|
||||
pattern ~ "=>" ~ block
|
||||
pattern_list ~ "=>" ~ block
|
||||
}
|
||||
|
||||
match_stmt = {
|
||||
|
||||
@@ -100,7 +100,7 @@ impl<'a> TryFrom<pest::iterators::Pair<'a, Rule>> for Statement {
|
||||
.map(|match_itms| {
|
||||
let mut match_inner = match_itms.into_inner();
|
||||
Ok((
|
||||
Pattern::try_from(match_inner.next().unwrap()).get()?,
|
||||
collect_recovered(match_inner.next().unwrap().into_inner()).get()?,
|
||||
Block::try_from(match_inner.next().unwrap()).get()?,
|
||||
))
|
||||
})
|
||||
|
||||
+8
-1
@@ -646,7 +646,14 @@ impl ToRust for Statement {
|
||||
cg.indent += 1;
|
||||
|
||||
for itm in match_items {
|
||||
cg.add_indentedln(&format!("{} =>", itm.0.get_rust()));
|
||||
cg.add_indentedln(&format!(
|
||||
"{} =>",
|
||||
itm.0
|
||||
.into_iter()
|
||||
.map(Pattern::get_rust)
|
||||
.collect::<Vec<_>>()
|
||||
.join(" | ")
|
||||
));
|
||||
cg.add_indentedln("{");
|
||||
cg.indent += 1;
|
||||
itm.1.to_rust(cg);
|
||||
|
||||
Reference in New Issue
Block a user