diff options
| author | Aleksey Kladov <[email protected]> | 2019-03-17 10:14:17 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2019-03-17 10:14:17 +0000 |
| commit | a8271cb31f3b16f64a5720f0cc317b8d1cb8fcd8 (patch) | |
| tree | ad0b025ab9385578ee0fb8d0a7bacf9b80967f87 /crates | |
| parent | 7d3f48cdaf20d718e711f999573adf3303e9396a (diff) | |
simplify parsing blocks a bit
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ra_parser/src/grammar/expressions.rs | 113 |
1 files changed, 56 insertions, 57 deletions
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs index 70c71a8e1..d1f27dadf 100644 --- a/crates/ra_parser/src/grammar/expressions.rs +++ b/crates/ra_parser/src/grammar/expressions.rs | |||
| @@ -43,65 +43,64 @@ pub(crate) fn expr_block_contents(p: &mut Parser) { | |||
| 43 | attributes::inner_attributes(p); | 43 | attributes::inner_attributes(p); |
| 44 | 44 | ||
| 45 | while !p.at(EOF) && !p.at(R_CURLY) { | 45 | while !p.at(EOF) && !p.at(R_CURLY) { |
| 46 | match p.current() { | 46 | // test nocontentexpr |
| 47 | // test nocontentexpr | 47 | // fn foo(){ |
| 48 | // fn foo(){ | 48 | // ;;;some_expr();;;;{;;;};;;;Ok(()) |
| 49 | // ;;;some_expr();;;;{;;;};;;;Ok(()) | 49 | // } |
| 50 | // } | 50 | if p.current() == SEMI { |
| 51 | SEMI => p.bump(), | 51 | p.bump(); |
| 52 | _ => { | 52 | continue; |
| 53 | // test block_items | 53 | } |
| 54 | // fn a() { fn b() {} } | 54 | |
| 55 | let m = p.start(); | 55 | // test block_items |
| 56 | let has_attrs = p.at(POUND); | 56 | // fn a() { fn b() {} } |
| 57 | attributes::outer_attributes(p); | 57 | let m = p.start(); |
| 58 | if p.at(LET_KW) { | 58 | let has_attrs = p.at(POUND); |
| 59 | let_stmt(p, m); | 59 | attributes::outer_attributes(p); |
| 60 | if p.at(LET_KW) { | ||
| 61 | let_stmt(p, m); | ||
| 62 | continue; | ||
| 63 | } | ||
| 64 | |||
| 65 | match items::maybe_item(p, items::ItemFlavor::Mod) { | ||
| 66 | items::MaybeItem::Item(kind) => { | ||
| 67 | m.complete(p, kind); | ||
| 68 | } | ||
| 69 | items::MaybeItem::Modifiers => { | ||
| 70 | m.abandon(p); | ||
| 71 | p.error("expected an item"); | ||
| 72 | } | ||
| 73 | // test pub_expr | ||
| 74 | // fn foo() { pub 92; } //FIXME | ||
| 75 | items::MaybeItem::None => { | ||
| 76 | if has_attrs { | ||
| 77 | m.abandon(p); | ||
| 78 | p.error("expected a let statement or an item after attributes in block"); | ||
| 60 | } else { | 79 | } else { |
| 61 | match items::maybe_item(p, items::ItemFlavor::Mod) { | 80 | let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block; |
| 62 | items::MaybeItem::Item(kind) => { | 81 | if p.at(R_CURLY) { |
| 63 | m.complete(p, kind); | 82 | m.abandon(p); |
| 64 | } | 83 | } else { |
| 65 | items::MaybeItem::Modifiers => { | 84 | // test no_semi_after_block |
| 66 | m.abandon(p); | 85 | // fn foo() { |
| 67 | p.error("expected an item"); | 86 | // if true {} |
| 68 | } | 87 | // loop {} |
| 69 | // test pub_expr | 88 | // match () {} |
| 70 | // fn foo() { pub 92; } //FIXME | 89 | // while true {} |
| 71 | items::MaybeItem::None => { | 90 | // for _ in () {} |
| 72 | if has_attrs { | 91 | // {} |
| 73 | m.abandon(p); | 92 | // {} |
| 74 | p.error( | 93 | // macro_rules! test { |
| 75 | "expected a let statement or an item after attributes in block", | 94 | // () => {} |
| 76 | ); | 95 | // } |
| 77 | } else { | 96 | // test!{} |
| 78 | let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block; | 97 | // } |
| 79 | if p.at(R_CURLY) { | 98 | if is_blocklike { |
| 80 | m.abandon(p); | 99 | p.eat(SEMI); |
| 81 | } else { | 100 | } else { |
| 82 | // test no_semi_after_block | 101 | p.expect(SEMI); |
| 83 | // fn foo() { | ||
| 84 | // if true {} | ||
| 85 | // loop {} | ||
| 86 | // match () {} | ||
| 87 | // while true {} | ||
| 88 | // for _ in () {} | ||
| 89 | // {} | ||
| 90 | // {} | ||
| 91 | // macro_rules! test { | ||
| 92 | // () => {} | ||
| 93 | // } | ||
| 94 | // test!{} | ||
| 95 | // } | ||
| 96 | if is_blocklike { | ||
| 97 | p.eat(SEMI); | ||
| 98 | } else { | ||
| 99 | p.expect(SEMI); | ||
| 100 | } | ||
| 101 | m.complete(p, EXPR_STMT); | ||
| 102 | } | ||
| 103 | } | ||
| 104 | } | 102 | } |
| 103 | m.complete(p, EXPR_STMT); | ||
| 105 | } | 104 | } |
| 106 | } | 105 | } |
| 107 | } | 106 | } |