aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/grammar
diff options
context:
space:
mode:
authorDJMcNab <[email protected]>2018-12-18 22:59:34 +0000
committerDJMcNab <[email protected]>2018-12-19 20:12:18 +0000
commit97e70bf50f15007f5782f7f96d19da342b7c9505 (patch)
tree081f401eb9fb1d5a9d2563f9ffca5e6871edd69a /crates/ra_syntax/src/grammar
parent29bf389034db9a0de4ec2dbd7492c1f75caf4a60 (diff)
Possibly fix #225
Diffstat (limited to 'crates/ra_syntax/src/grammar')
-rw-r--r--crates/ra_syntax/src/grammar/expressions.rs45
-rw-r--r--crates/ra_syntax/src/grammar/expressions/atom.rs16
2 files changed, 40 insertions, 21 deletions
diff --git a/crates/ra_syntax/src/grammar/expressions.rs b/crates/ra_syntax/src/grammar/expressions.rs
index 512823ddf..043f41b98 100644
--- a/crates/ra_syntax/src/grammar/expressions.rs
+++ b/crates/ra_syntax/src/grammar/expressions.rs
@@ -158,18 +158,18 @@ fn current_op(p: &Parser) -> (u8, Op) {
158// Parses expression with binding power of at least bp. 158// Parses expression with binding power of at least bp.
159fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) -> BlockLike { 159fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) -> BlockLike {
160 let mut lhs = match lhs(p, r) { 160 let mut lhs = match lhs(p, r) {
161 Some(lhs) => { 161 (Some(lhs), blocklike) => {
162 // test stmt_bin_expr_ambiguity 162 // test stmt_bin_expr_ambiguity
163 // fn foo() { 163 // fn foo() {
164 // let _ = {1} & 2; 164 // let _ = {1} & 2;
165 // {1} &2; 165 // {1} &2;
166 // } 166 // }
167 if r.prefer_stmt && is_block(lhs.kind()) { 167 if r.prefer_stmt && (is_block(lhs.kind()) || blocklike == Some(BlockLike::Block)) {
168 return BlockLike::Block; 168 return BlockLike::Block;
169 } 169 }
170 lhs 170 lhs
171 } 171 }
172 None => return BlockLike::NotBlock, 172 (None, _) => return BlockLike::NotBlock,
173 }; 173 };
174 174
175 loop { 175 loop {
@@ -213,7 +213,7 @@ const LHS_FIRST: TokenSet = token_set_union![
213 atom::ATOM_EXPR_FIRST, 213 atom::ATOM_EXPR_FIRST,
214]; 214];
215 215
216fn lhs(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> { 216fn lhs(p: &mut Parser, r: Restrictions) -> (Option<CompletedMarker>, Option<BlockLike>) {
217 let m; 217 let m;
218 let kind = match p.current() { 218 let kind = match p.current() {
219 // test ref_expr 219 // test ref_expr
@@ -246,19 +246,33 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> {
246 if p.at_ts(EXPR_FIRST) { 246 if p.at_ts(EXPR_FIRST) {
247 expr_bp(p, r, 2); 247 expr_bp(p, r, 2);
248 } 248 }
249 return Some(m.complete(p, RANGE_EXPR)); 249 return (Some(m.complete(p, RANGE_EXPR)), None);
250 } 250 }
251 _ => { 251 _ => {
252 let lhs = atom::atom_expr(p, r)?; 252 let (lhs_marker, macro_block_like) = atom::atom_expr(p, r);
253 return Some(postfix_expr(p, r, lhs)); 253
254 if let Some(lhs_marker) = lhs_marker {
255 return (
256 Some(postfix_expr(p, r, lhs_marker, macro_block_like)),
257 macro_block_like,
258 );
259 } else {
260 return (None, None);
261 }
254 } 262 }
255 }; 263 };
256 expr_bp(p, r, 255); 264 expr_bp(p, r, 255);
257 Some(m.complete(p, kind)) 265 (Some(m.complete(p, kind)), None)
258} 266}
259 267
260fn postfix_expr(p: &mut Parser, r: Restrictions, mut lhs: CompletedMarker) -> CompletedMarker { 268fn postfix_expr(
261 let mut allow_calls = !r.prefer_stmt || !is_block(lhs.kind()); 269 p: &mut Parser,
270 r: Restrictions,
271 mut lhs: CompletedMarker,
272 macro_block_like: Option<BlockLike>,
273) -> CompletedMarker {
274 let mut allow_calls =
275 !r.prefer_stmt || !is_block(lhs.kind()) || macro_block_like != Some(BlockLike::Block);
262 loop { 276 loop {
263 lhs = match p.current() { 277 lhs = match p.current() {
264 // test stmt_postfix_expr_ambiguity 278 // test stmt_postfix_expr_ambiguity
@@ -406,21 +420,22 @@ fn arg_list(p: &mut Parser) {
406// let _ = ::a::<b>; 420// let _ = ::a::<b>;
407// let _ = format!(); 421// let _ = format!();
408// } 422// }
409fn path_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker { 423fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, Option<BlockLike>) {
410 assert!(paths::is_path_start(p) || p.at(L_ANGLE)); 424 assert!(paths::is_path_start(p) || p.at(L_ANGLE));
411 let m = p.start(); 425 let m = p.start();
412 paths::expr_path(p); 426 paths::expr_path(p);
413 match p.current() { 427 let res = match p.current() {
414 L_CURLY if !r.forbid_structs => { 428 L_CURLY if !r.forbid_structs => {
415 named_field_list(p); 429 named_field_list(p);
416 m.complete(p, STRUCT_LIT) 430 m.complete(p, STRUCT_LIT)
417 } 431 }
418 EXCL => { 432 EXCL => {
419 items::macro_call_after_excl(p); // TODO: Use return type (BlockLike) 433 let block_like = items::macro_call_after_excl(p); // TODO: Use return type (BlockLike)
420 m.complete(p, MACRO_CALL) 434 return (m.complete(p, MACRO_CALL), Some(block_like));
421 } 435 }
422 _ => m.complete(p, PATH_EXPR), 436 _ => m.complete(p, PATH_EXPR),
423 } 437 };
438 (res, None)
424} 439}
425 440
426// test struct_lit 441// test struct_lit
diff --git a/crates/ra_syntax/src/grammar/expressions/atom.rs b/crates/ra_syntax/src/grammar/expressions/atom.rs
index 04087fd60..e86a33090 100644
--- a/crates/ra_syntax/src/grammar/expressions/atom.rs
+++ b/crates/ra_syntax/src/grammar/expressions/atom.rs
@@ -61,12 +61,16 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = token_set_union![
61 61
62const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW]; 62const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
63 63
64pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> { 64pub(super) fn atom_expr(
65 p: &mut Parser,
66 r: Restrictions,
67) -> (Option<CompletedMarker>, Option<BlockLike>) {
65 if let Some(m) = literal(p) { 68 if let Some(m) = literal(p) {
66 return Some(m); 69 return (Some(m), None);
67 } 70 }
68 if paths::is_path_start(p) || p.at(L_ANGLE) { 71 if paths::is_path_start(p) || p.at(L_ANGLE) {
69 return Some(path_expr(p, r)); 72 let path_expr = path_expr(p, r);
73 return (Some(path_expr.0), path_expr.1);
70 } 74 }
71 let la = p.nth(1); 75 let la = p.nth(1);
72 let done = match p.current() { 76 let done = match p.current() {
@@ -94,7 +98,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMark
94 // } 98 // }
95 p.error("expected a loop"); 99 p.error("expected a loop");
96 m.complete(p, ERROR); 100 m.complete(p, ERROR);
97 return None; 101 return (None, None);
98 } 102 }
99 } 103 }
100 } 104 }
@@ -111,10 +115,10 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMark
111 BREAK_KW => break_expr(p), 115 BREAK_KW => break_expr(p),
112 _ => { 116 _ => {
113 p.err_recover("expected expression", EXPR_RECOVERY_SET); 117 p.err_recover("expected expression", EXPR_RECOVERY_SET);
114 return None; 118 return (None, None);
115 } 119 }
116 }; 120 };
117 Some(done) 121 (Some(done), None)
118} 122}
119 123
120// test tuple_expr 124// test tuple_expr