Skip to content

internal: cleanup item parsing #10269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2021
Merged

internal: cleanup item parsing #10269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2043a
minor: parser cleanup
matklad Sep 17, 2021
d890c76
internal: cleanup item parsing
matklad Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ fn opt_visibility(p: &mut Parser) -> bool {
}
}
m.complete(p, VISIBILITY);
true
}
// test crate_keyword_vis
// crate fn main() { }
Expand All @@ -197,10 +198,10 @@ fn opt_visibility(p: &mut Parser) -> bool {
let m = p.start();
p.bump(T![crate]);
m.complete(p, VISIBILITY);
true
}
_ => return false,
_ => false,
}
true
}

fn opt_rename(p: &mut Parser) {
Expand Down
132 changes: 56 additions & 76 deletions crates/parser/src/grammar/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,27 +135,25 @@ pub(super) fn opt_item(p: &mut Parser, m: Marker) -> Result<(), Marker> {
p.bump_remap(T![default]);
has_mods = true;
}
T![unsafe] => {
// test default_unsafe_item
// default unsafe impl T for Foo {
// default unsafe fn foo() {}
// }
if matches!(p.nth(2), T![impl] | T![fn]) {
p.bump_remap(T![default]);
p.bump(T![unsafe]);
has_mods = true;
}
// test default_unsafe_item
// default unsafe impl T for Foo {
// default unsafe fn foo() {}
// }
T![unsafe] if matches!(p.nth(2), T![impl] | T![fn]) => {
p.bump_remap(T![default]);
p.bump(T![unsafe]);
has_mods = true;
}
// test default_async_fn
// impl T for Foo {
// default async fn foo() {}
// }

// test default_async_unsafe_fn
// impl T for Foo {
// default async unsafe fn foo() {}
// }
T![async] => {
// test default_async_fn
// impl T for Foo {
// default async fn foo() {}
// }

// test default_async_unsafe_fn
// impl T for Foo {
// default async unsafe fn foo() {}
// }
let mut maybe_fn = p.nth(2);
let is_unsafe = if matches!(maybe_fn, T![unsafe]) {
maybe_fn = p.nth(3);
Expand Down Expand Up @@ -186,34 +184,14 @@ pub(super) fn opt_item(p: &mut Parser, m: Marker) -> Result<(), Marker> {

// items
match p.current() {
// test fn
// fn foo() {}
T![fn] => {
fn_(p);
m.complete(p, FN);
}
T![fn] => fn_(p, m),

// test trait
// trait T {}
T![trait] => {
traits::trait_(p);
m.complete(p, TRAIT);
}
T![const] if p.nth(1) != T!['{'] => consts::konst(p, m),

T![const] if p.nth(1) != T!['{'] => {
consts::konst(p, m);
}

// test impl
// impl T for S {}
T![impl] => {
traits::impl_(p);
m.complete(p, IMPL);
}
T![trait] => traits::trait_(p, m),
T![impl] => traits::impl_(p, m),

T![type] => {
type_alias(p, m);
}
T![type] => type_alias(p, m),

// test extern_block
// unsafe extern "C" {}
Expand Down Expand Up @@ -341,38 +319,6 @@ pub(crate) fn extern_item_list(p: &mut Parser) {
m.complete(p, EXTERN_ITEM_LIST);
}

fn fn_(p: &mut Parser) {
assert!(p.at(T![fn]));
p.bump(T![fn]);

name_r(p, ITEM_RECOVERY_SET);
// test function_type_params
// fn foo<T: Clone + Copy>(){}
type_params::opt_generic_param_list(p);

if p.at(T!['(']) {
params::param_list_fn_def(p);
} else {
p.error("expected function arguments");
}
// test function_ret_type
// fn foo() {}
// fn bar() -> () {}
opt_ret_type(p);

// test function_where_clause
// fn foo<T>() where T: Copy {}
type_params::opt_where_clause(p);

// test fn_decl
// trait T { fn foo(); }
if p.at(T![;]) {
p.bump(T![;]);
} else {
expressions::block_expr(p)
}
}

fn macro_rules(p: &mut Parser, m: Marker) {
assert!(p.at_contextual_kw("macro_rules"));
p.bump_remap(T![macro_rules]);
Expand Down Expand Up @@ -430,6 +376,40 @@ fn macro_def(p: &mut Parser, m: Marker) {
m.complete(p, MACRO_DEF);
}

// test fn
// fn foo() {}
fn fn_(p: &mut Parser, m: Marker) {
p.bump(T![fn]);

name_r(p, ITEM_RECOVERY_SET);
// test function_type_params
// fn foo<T: Clone + Copy>(){}
type_params::opt_generic_param_list(p);

if p.at(T!['(']) {
params::param_list_fn_def(p);
} else {
p.error("expected function arguments");
}
// test function_ret_type
// fn foo() {}
// fn bar() -> () {}
opt_ret_type(p);

// test function_where_clause
// fn foo<T>() where T: Copy {}
type_params::opt_where_clause(p);

// test fn_decl
// trait T { fn foo(); }
if p.at(T![;]) {
p.bump(T![;]);
} else {
expressions::block_expr(p)
}
m.complete(p, FN);
}

fn macro_call(p: &mut Parser) -> BlockLike {
assert!(paths::is_use_path_start(p));
paths::use_path(p);
Expand Down
7 changes: 5 additions & 2 deletions crates/parser/src/grammar/items/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use super::*;
// test trait_item
// trait T<U>: Hash + Clone where U: Copy {}
// trait X<U: Debug + Display>: Hash + Clone where U: Copy {}
pub(super) fn trait_(p: &mut Parser) {
pub(super) fn trait_(p: &mut Parser, m: Marker) {
assert!(p.at(T![trait]));
p.bump(T![trait]);
name_r(p, ITEM_RECOVERY_SET);
Expand All @@ -16,6 +16,7 @@ pub(super) fn trait_(p: &mut Parser) {
type_params::bounds_without_colon(p);
type_params::opt_where_clause(p);
p.expect(T![;]);
m.complete(p, TRAIT);
return;
}
if p.at(T![:]) {
Expand All @@ -27,11 +28,12 @@ pub(super) fn trait_(p: &mut Parser) {
} else {
p.error("expected `{`");
}
m.complete(p, TRAIT);
}

// test impl_def
// impl Foo {}
pub(super) fn impl_(p: &mut Parser) {
pub(super) fn impl_(p: &mut Parser, m: Marker) {
assert!(p.at(T![impl]));
p.bump(T![impl]);
if choose_type_params_over_qpath(p) {
Expand All @@ -58,6 +60,7 @@ pub(super) fn impl_(p: &mut Parser) {
} else {
p.error("expected `{`");
}
m.complete(p, IMPL);
}

// test impl_item_list
Expand Down
22 changes: 0 additions & 22 deletions crates/syntax/test_data/parser/inline/ok/0152_impl.rast
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion crates/syntax/test_data/parser/inline/ok/0152_impl.rs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions crates/syntax/test_data/parser/inline/ok/0153_trait.rast
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion crates/syntax/test_data/parser/inline/ok/0153_trait.rs
View file
Open in desktop

This file was deleted.