Skip to content

Parse function parameters attributes #1661

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 5 commits into from
Aug 8, 2019
Merged

Parse function parameters attributes #1661

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fb58c6
Add function parameters attributes
eupn Aug 7, 2019
9ea3670
Fix variadic arg inline test
eupn Aug 7, 2019
79d4202
Fix parser to correctly consume outer attrs before ellipsis param
eupn Aug 7, 2019
77f4ab3
Deduplicate while loop break condition
eupn Aug 8, 2019
6fa2d82
Fix parser tests according to review
eupn Aug 8, 2019
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
20 changes: 20 additions & 0 deletions crates/ra_parser/src/grammar/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ use super::*;
// fn b(x: i32) {}
// fn c(x: i32, ) {}
// fn d(x: i32, y: ()) {}
// fn g1(#[attr1] #[attr2] pat: Type) {}
// fn g2(#[attr1] x: u8) {}
pub(super) fn param_list(p: &mut Parser) {
list_(p, Flavor::Normal)
}

// test param_list_opt_patterns
// fn foo<F: FnMut(&mut Foo<'a>)>(){}
// fn foo<F: FnMut(#[attr] &mut Foo<'a>)>(){}
pub(super) fn param_list_opt_patterns(p: &mut Parser) {
list_(p, Flavor::OptionalPattern)
}
Expand Down Expand Up @@ -41,9 +44,16 @@ fn list_(p: &mut Parser, flavor: Flavor) {
let m = p.start();
p.bump();
if flavor.type_required() {
attributes::outer_attributes(p);
opt_self_param(p);
}
while !p.at(EOF) && !p.at(ket) && !(flavor.type_required() && p.at(T![...])) {
attributes::outer_attributes(p);

if p.at(T![...]) {
break;
}

if !p.at_ts(VALUE_PARAMETER_FIRST) {
p.error("expected value parameter");
break;
Expand All @@ -55,6 +65,7 @@ fn list_(p: &mut Parser, flavor: Flavor) {
}
// test param_list_vararg
// extern "C" { fn printf(format: *const i8, ...) -> i32; }
// extern "C" { fn printf(format: *const i8, #[attr] ...) -> i32; }
if flavor.type_required() {
p.eat(T![...]);
}
Expand Down Expand Up @@ -84,6 +95,7 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
// test trait_fn_placeholder_parameter
// trait Foo {
// fn bar(_: u64, mut x: i32);
// fn bar(#[attr] _: u64, #[attr] mut x: i32);
// }
if (la0 == IDENT || la0 == T![_]) && la1 == T![:]
|| la0 == T![mut] && la1 == IDENT && la2 == T![:]
Expand All @@ -107,6 +119,12 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
// fn c(&'a self,) {}
// fn d(&'a mut self, x: i32) {}
// fn e(mut self) {}
// fn f(#[must_use] self) {}
// fn g1(#[attr] self) {}
// fn g2(#[attr] &self) {}
// fn g3<'a>(#[attr] &mut self) {}
// fn g4<'a>(#[attr] &'a self) {}
// fn g5<'a>(#[attr] &'a mut self) {}
// }
fn opt_self_param(p: &mut Parser) {
let m;
Expand All @@ -118,6 +136,8 @@ fn opt_self_param(p: &mut Parser) {
// impl S {
// fn a(self: &Self) {}
// fn b(mut self: Box<Self>) {}
// fn c(#[attr] self: Self) {}
// fn d(#[attr] self: Rc<Self>) {}
// }
if p.at(T![:]) {
types::ascription(p);
Expand Down
2 changes: 2 additions & 0 deletions crates/ra_syntax/src/ast/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,6 +2013,7 @@ impl AstNode for Param {


impl ast::TypeAscriptionOwner for Param {}
impl ast::AttrsOwner for Param {}
impl Param {
pub fn pat(&self) -> Option<Pat> {
super::child_opt(self)
Expand Down Expand Up @@ -2667,6 +2668,7 @@ impl AstNode for SelfParam {


impl ast::TypeAscriptionOwner for SelfParam {}
impl ast::AttrsOwner for SelfParam {}
impl SelfParam {}

// SlicePat
Expand Down
2 changes: 2 additions & 0 deletions crates/ra_syntax/src/grammar.ron
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,12 +642,14 @@ Grammar(
"SelfParam": (
traits: [
"TypeAscriptionOwner",
"AttrsOwner",
]
),
"Param": (
options: [ "Pat" ],
traits: [
"TypeAscriptionOwner",
"AttrsOwner",
]
),
"UseItem": (
Expand Down
6 changes: 6 additions & 0 deletions crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@ impl S {
fn c(&'a self,) {}
fn d(&'a mut self, x: i32) {}
fn e(mut self) {}
fn f(#[must_use] self) {}
fn g1(#[attr] self) {}
fn g2(#[attr] &self) {}
fn g3<'a>(#[attr] &mut self) {}
fn g4<'a>(#[attr] &'a self) {}
fn g5<'a>(#[attr] &'a mut self) {}
}
171 changes: 165 additions & 6 deletions crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SOURCE_FILE@[0; 128)
IMPL_BLOCK@[0; 127)
SOURCE_FILE@[0; 323)
IMPL_BLOCK@[0; 322)
IMPL_KW@[0; 4) "impl"
WHITESPACE@[4; 5) " "
PATH_TYPE@[5; 6)
Expand All @@ -8,7 +8,7 @@ SOURCE_FILE@[0; 128)
NAME_REF@[5; 6)
IDENT@[5; 6) "S"
WHITESPACE@[6; 7) " "
ITEM_LIST@[7; 127)
ITEM_LIST@[7; 322)
L_CURLY@[7; 8) "{"
WHITESPACE@[8; 13) "\n "
FN_DEF@[13; 26)
Expand Down Expand Up @@ -111,6 +111,165 @@ SOURCE_FILE@[0; 128)
BLOCK@[123; 125)
L_CURLY@[123; 124) "{"
R_CURLY@[124; 125) "}"
WHITESPACE@[125; 126) "\n"
R_CURLY@[126; 127) "}"
WHITESPACE@[127; 128) "\n"
WHITESPACE@[125; 130) "\n "
FN_DEF@[130; 155)
FN_KW@[130; 132) "fn"
WHITESPACE@[132; 133) " "
NAME@[133; 134)
IDENT@[133; 134) "f"
PARAM_LIST@[134; 152)
L_PAREN@[134; 135) "("
ATTR@[135; 146)
POUND@[135; 136) "#"
TOKEN_TREE@[136; 146)
L_BRACK@[136; 137) "["
IDENT@[137; 145) "must_use"
R_BRACK@[145; 146) "]"
WHITESPACE@[146; 147) " "
SELF_PARAM@[147; 151)
SELF_KW@[147; 151) "self"
R_PAREN@[151; 152) ")"
WHITESPACE@[152; 153) " "
BLOCK@[153; 155)
L_CURLY@[153; 154) "{"
R_CURLY@[154; 155) "}"
WHITESPACE@[155; 160) "\n "
FN_DEF@[160; 182)
FN_KW@[160; 162) "fn"
WHITESPACE@[162; 163) " "
NAME@[163; 165)
IDENT@[163; 165) "g1"
PARAM_LIST@[165; 179)
L_PAREN@[165; 166) "("
ATTR@[166; 173)
POUND@[166; 167) "#"
TOKEN_TREE@[167; 173)
L_BRACK@[167; 168) "["
IDENT@[168; 172) "attr"
R_BRACK@[172; 173) "]"
WHITESPACE@[173; 174) " "
SELF_PARAM@[174; 178)
SELF_KW@[174; 178) "self"
R_PAREN@[178; 179) ")"
WHITESPACE@[179; 180) " "
BLOCK@[180; 182)
L_CURLY@[180; 181) "{"
R_CURLY@[181; 182) "}"
WHITESPACE@[182; 187) "\n "
FN_DEF@[187; 210)
FN_KW@[187; 189) "fn"
WHITESPACE@[189; 190) " "
NAME@[190; 192)
IDENT@[190; 192) "g2"
PARAM_LIST@[192; 207)
L_PAREN@[192; 193) "("
ATTR@[193; 200)
POUND@[193; 194) "#"
TOKEN_TREE@[194; 200)
L_BRACK@[194; 195) "["
IDENT@[195; 199) "attr"
R_BRACK@[199; 200) "]"
WHITESPACE@[200; 201) " "
SELF_PARAM@[201; 206)
AMP@[201; 202) "&"
SELF_KW@[202; 206) "self"
R_PAREN@[206; 207) ")"
WHITESPACE@[207; 208) " "
BLOCK@[208; 210)
L_CURLY@[208; 209) "{"
R_CURLY@[209; 210) "}"
WHITESPACE@[210; 215) "\n "
FN_DEF@[215; 246)
FN_KW@[215; 217) "fn"
WHITESPACE@[217; 218) " "
NAME@[218; 220)
IDENT@[218; 220) "g3"
TYPE_PARAM_LIST@[220; 224)
L_ANGLE@[220; 221) "<"
LIFETIME_PARAM@[221; 223)
LIFETIME@[221; 223) "\'a"
R_ANGLE@[223; 224) ">"
PARAM_LIST@[224; 243)
L_PAREN@[224; 225) "("
ATTR@[225; 232)
POUND@[225; 226) "#"
TOKEN_TREE@[226; 232)
L_BRACK@[226; 227) "["
IDENT@[227; 231) "attr"
R_BRACK@[231; 232) "]"
WHITESPACE@[232; 233) " "
SELF_PARAM@[233; 242)
AMP@[233; 234) "&"
MUT_KW@[234; 237) "mut"
WHITESPACE@[237; 238) " "
SELF_KW@[238; 242) "self"
R_PAREN@[242; 243) ")"
WHITESPACE@[243; 244) " "
BLOCK@[244; 246)
L_CURLY@[244; 245) "{"
R_CURLY@[245; 246) "}"
WHITESPACE@[246; 251) "\n "
FN_DEF@[251; 281)
FN_KW@[251; 253) "fn"
WHITESPACE@[253; 254) " "
NAME@[254; 256)
IDENT@[254; 256) "g4"
TYPE_PARAM_LIST@[256; 260)
L_ANGLE@[256; 257) "<"
LIFETIME_PARAM@[257; 259)
LIFETIME@[257; 259) "\'a"
R_ANGLE@[259; 260) ">"
PARAM_LIST@[260; 278)
L_PAREN@[260; 261) "("
ATTR@[261; 268)
POUND@[261; 262) "#"
TOKEN_TREE@[262; 268)
L_BRACK@[262; 263) "["
IDENT@[263; 267) "attr"
R_BRACK@[267; 268) "]"
WHITESPACE@[268; 269) " "
SELF_PARAM@[269; 277)
AMP@[269; 270) "&"
LIFETIME@[270; 272) "\'a"
WHITESPACE@[272; 273) " "
SELF_KW@[273; 277) "self"
R_PAREN@[277; 278) ")"
WHITESPACE@[278; 279) " "
BLOCK@[279; 281)
L_CURLY@[279; 280) "{"
R_CURLY@[280; 281) "}"
WHITESPACE@[281; 286) "\n "
FN_DEF@[286; 320)
FN_KW@[286; 288) "fn"
WHITESPACE@[288; 289) " "
NAME@[289; 291)
IDENT@[289; 291) "g5"
TYPE_PARAM_LIST@[291; 295)
L_ANGLE@[291; 292) "<"
LIFETIME_PARAM@[292; 294)
LIFETIME@[292; 294) "\'a"
R_ANGLE@[294; 295) ">"
PARAM_LIST@[295; 317)
L_PAREN@[295; 296) "("
ATTR@[296; 303)
POUND@[296; 297) "#"
TOKEN_TREE@[297; 303)
L_BRACK@[297; 298) "["
IDENT@[298; 302) "attr"
R_BRACK@[302; 303) "]"
WHITESPACE@[303; 304) " "
SELF_PARAM@[304; 316)
AMP@[304; 305) "&"
LIFETIME@[305; 307) "\'a"
WHITESPACE@[307; 308) " "
MUT_KW@[308; 311) "mut"
WHITESPACE@[311; 312) " "
SELF_KW@[312; 316) "self"
R_PAREN@[316; 317) ")"
WHITESPACE@[317; 318) " "
BLOCK@[318; 320)
L_CURLY@[318; 319) "{"
R_CURLY@[319; 320) "}"
WHITESPACE@[320; 321) "\n"
R_CURLY@[321; 322) "}"
WHITESPACE@[322; 323) "\n"
2 changes: 2 additions & 0 deletions crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
impl S {
fn a(self: &Self) {}
fn b(mut self: Box<Self>) {}
fn c(#[attr] self: Self) {}
fn d(#[attr] self: Rc<Self>) {}
}
79 changes: 73 additions & 6 deletions crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SOURCE_FILE@[0; 69)
IMPL_BLOCK@[0; 68)
SOURCE_FILE@[0; 137)
IMPL_BLOCK@[0; 136)
IMPL_KW@[0; 4) "impl"
WHITESPACE@[4; 5) " "
PATH_TYPE@[5; 6)
Expand All @@ -8,7 +8,7 @@ SOURCE_FILE@[0; 69)
NAME_REF@[5; 6)
IDENT@[5; 6) "S"
WHITESPACE@[6; 7) " "
ITEM_LIST@[7; 68)
ITEM_LIST@[7; 136)
L_CURLY@[7; 8) "{"
WHITESPACE@[8; 13) "\n "
FN_DEF@[13; 33)
Expand Down Expand Up @@ -67,6 +67,73 @@ SOURCE_FILE@[0; 69)
BLOCK@[64; 66)
L_CURLY@[64; 65) "{"
R_CURLY@[65; 66) "}"
WHITESPACE@[66; 67) "\n"
R_CURLY@[67; 68) "}"
WHITESPACE@[68; 69) "\n"
WHITESPACE@[66; 71) "\n "
FN_DEF@[71; 98)
FN_KW@[71; 73) "fn"
WHITESPACE@[73; 74) " "
NAME@[74; 75)
IDENT@[74; 75) "c"
PARAM_LIST@[75; 95)
L_PAREN@[75; 76) "("
ATTR@[76; 83)
POUND@[76; 77) "#"
TOKEN_TREE@[77; 83)
L_BRACK@[77; 78) "["
IDENT@[78; 82) "attr"
R_BRACK@[82; 83) "]"
WHITESPACE@[83; 84) " "
SELF_PARAM@[84; 94)
SELF_KW@[84; 88) "self"
COLON@[88; 89) ":"
WHITESPACE@[89; 90) " "
PATH_TYPE@[90; 94)
PATH@[90; 94)
PATH_SEGMENT@[90; 94)
NAME_REF@[90; 94)
IDENT@[90; 94) "Self"
R_PAREN@[94; 95) ")"
WHITESPACE@[95; 96) " "
BLOCK@[96; 98)
L_CURLY@[96; 97) "{"
R_CURLY@[97; 98) "}"
WHITESPACE@[98; 103) "\n "
FN_DEF@[103; 134)
FN_KW@[103; 105) "fn"
WHITESPACE@[105; 106) " "
NAME@[106; 107)
IDENT@[106; 107) "d"
PARAM_LIST@[107; 131)
L_PAREN@[107; 108) "("
ATTR@[108; 115)
POUND@[108; 109) "#"
TOKEN_TREE@[109; 115)
L_BRACK@[109; 110) "["
IDENT@[110; 114) "attr"
R_BRACK@[114; 115) "]"
WHITESPACE@[115; 116) " "
SELF_PARAM@[116; 130)
SELF_KW@[116; 120) "self"
COLON@[120; 121) ":"
WHITESPACE@[121; 122) " "
PATH_TYPE@[122; 130)
PATH@[122; 130)
PATH_SEGMENT@[122; 130)
NAME_REF@[122; 124)
IDENT@[122; 124) "Rc"
TYPE_ARG_LIST@[124; 130)
L_ANGLE@[124; 125) "<"
TYPE_ARG@[125; 129)
PATH_TYPE@[125; 129)
PATH@[125; 129)
PATH_SEGMENT@[125; 129)
NAME_REF@[125; 129)
IDENT@[125; 129) "Self"
R_ANGLE@[129; 130) ">"
R_PAREN@[130; 131) ")"
WHITESPACE@[131; 132) " "
BLOCK@[132; 134)
L_CURLY@[132; 133) "{"
R_CURLY@[133; 134) "}"
WHITESPACE@[134; 135) "\n"
R_CURLY@[135; 136) "}"
WHITESPACE@[136; 137) "\n"
Loading