mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move parsing a single TYPE_BOUND to a separate function

Browse Source
This commit is contained in:
Ville Penttinen 2019-03-30 17:23:54 +02:00
parent bfc2ac90c8
commit e3f9d6555b
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
crates/ra_parser/src/grammar/type_params.rs
View File

@ -80,29 +80,36 @@ fn lifetime_bounds(p: &mut Parser) {
}
pub(super) fn bounds_without_colon(p: &mut Parser) {
let outer = p.start();
loop {
let inner = p.start();
let has_paren = p.eat(L_PAREN);
p.eat(QUESTION);
match p.current() {
LIFETIME => p.bump(),
FOR_KW => types::for_type(p),
_ if paths::is_path_start(p) => types::path_type_(p, false),
_ => {
inner.abandon(p);
break;
}
}
if has_paren {
p.expect(R_PAREN);
}
inner.complete(p, TYPE_BOUND);
let m = p.start();
while type_bound(p) {
if !p.eat(PLUS) {
break;
}
}
outer.complete(p, TYPE_BOUND_LIST);
m.complete(p, TYPE_BOUND_LIST);
}
fn type_bound(p: &mut Parser) -> bool {
let m = p.start();
let has_paren = p.eat(L_PAREN);
p.eat(QUESTION);
match p.current() {
LIFETIME => p.bump(),
FOR_KW => types::for_type(p),
_ if paths::is_path_start(p) => types::path_type_(p, false),
_ => {
m.abandon(p);
return false;
}
}
if has_paren {
p.expect(R_PAREN);
}
m.complete(p, TYPE_BOUND);
true
}
// test where_clause