aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/grammar/expressions.rs
diff options
context:
space:
mode:
authorRoland Ruckerbauer <[email protected]>2018-12-17 16:10:05 +0000
committerRoland Ruckerbauer <[email protected]>2018-12-17 16:26:24 +0000
commitd0f1334226fc25a8c00ecccd64c0021e4aef9ca5 (patch)
tree273bdffe892f2eeef1850e2d3f7b1ca9ed228285 /crates/ra_syntax/src/grammar/expressions.rs
parent8d42deeac354d1f8297d6c4d52b2707fb8d7a771 (diff)
Fixed cast expression parsing in ra_syntax.
The cast expression expected any type via types::type_() function, but the language spec does only allow TypeNoBounds (types without direct extra bounds via `+`). **Example:** ```rust fn test() { 6i8 as i32 + 5; } ``` This fails, because the types::type_() function which should parse the type after the as keyword is greedy, and takes all plus sign after path types as extra. My proposed fix is to replace the not implemented `type_no_plus()` just calls (`type_()`) function, which is used at several places. The replacement is `type_with_bounds_cond(p: &mut Parser, allow_bounds: bool)`, which passes the condition to relevant sub-parsers. This function is then called by `type_()` and the new public `type_no_bounds()`.
Diffstat (limited to 'crates/ra_syntax/src/grammar/expressions.rs')
-rw-r--r--crates/ra_syntax/src/grammar/expressions.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/grammar/expressions.rs b/crates/ra_syntax/src/grammar/expressions.rs
index 60c8602f9..a9449c7bf 100644
--- a/crates/ra_syntax/src/grammar/expressions.rs
+++ b/crates/ra_syntax/src/grammar/expressions.rs
@@ -368,12 +368,16 @@ fn try_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
368// test cast_expr 368// test cast_expr
369// fn foo() { 369// fn foo() {
370// 82 as i32; 370// 82 as i32;
371// 81 as i8 + 1;
372// 79 as i16 - 1;
371// } 373// }
372fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { 374fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
373 assert!(p.at(AS_KW)); 375 assert!(p.at(AS_KW));
374 let m = lhs.precede(p); 376 let m = lhs.precede(p);
375 p.bump(); 377 p.bump();
376 types::type_(p); 378 // Use type_no_bounds(), because cast expressions are not
379 // allowed to have bounds.
380 types::type_no_bounds(p);
377 m.complete(p, CAST_EXPR) 381 m.complete(p, CAST_EXPR)
378} 382}
379 383