Skip to content

fix: Fix Immovable generator syntax (static ||) not recognized #11448 #11458

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 7 commits into from
Feb 14, 2022
Merged

fix: Fix Immovable generator syntax (static ||) not recognized #11448 #11458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccab6af
Fix Immovable generator syntax (static ||) not recognized #11448
bellau Feb 12, 2022
1284bc0
Fix styles
bellau Feb 12, 2022
2008607
support static move too
bellau Feb 12, 2022
3ed19d5
Fix style
bellau Feb 12, 2022
0a18a05
fix handle static async and static async move
bellau Feb 13, 2022
dc68b89
oops, remove println
bellau Feb 13, 2022
06452cd
Fix style
bellau Feb 14, 2022
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: 18 additions & 2 deletions crates/parser/src/grammar/expressions/atom.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
T!['('] => tuple_expr(p),
T!['['] => array_expr(p),
T![|] => closure_expr(p),
T![move] if la == T![|] => closure_expr(p),
T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
T![static] | T![async] | T![move] if la == T![|] => closure_expr(p),
T![static] | T![async] if la == T![move] && p.nth(2) == T![|] => closure_expr(p),
T![static] if la == T![async] && p.nth(2) == T![|] => closure_expr(p),
T![static] if la == T![async] && p.nth(2) == T![move] && p.nth(3) == T![|] => {
closure_expr(p)
}
T![if] => if_expr(p),

T![loop] => loop_expr(p, None),
Expand Down Expand Up @@ -234,15 +238,27 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
// async || {};
// move || {};
// async move || {};
// static || {};
// static move || {};
// static async || {};
// static async move || {};
// }
fn closure_expr(p: &mut Parser) -> CompletedMarker {
assert!(
p.at(T![|])
|| (p.at(T![move]) && p.nth(1) == T![|])
|| (p.at(T![async]) && p.nth(1) == T![|])
|| (p.at(T![async]) && p.nth(1) == T![move] && p.nth(2) == T![|])
|| (p.at(T![static]) && p.nth(1) == T![|])
|| (p.at(T![static]) && p.nth(1) == T![move] && p.nth(2) == T![|])
|| (p.at(T![static]) && p.nth(1) == T![async] && p.nth(2) == T![|])
|| (p.at(T![static])
&& p.nth(1) == T![async]
&& p.nth(2) == T![move]
&& p.nth(3) == T![|])
);
let m = p.start();
p.eat(T![static]);
p.eat(T![async]);
p.eat(T![move]);
params::param_list_closure(p);
Expand Down
2 changes: 1 addition & 1 deletion crates/parser/src/grammar/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ fn opt_item_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
IDENT if p.at_contextual_kw(T![macro_rules]) && p.nth(1) == BANG => macro_rules(p, m),

T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m),
T![static] => consts::static_(p, m),
T![static] if (la == IDENT || la == T![_] || la == T![mut]) => consts::static_(p, m),
Copy link
Member

@Veykril Veykril Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
T![static] if (la == IDENT || la == T![_] || la == T![mut]) => consts::static_(p, m),
T![static] if (la == IDENT || la == T![mut]) => consts::static_(p, m),

underscore as name is not valid for statics

Copy link
Contributor Author

@bellau bellau Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without test '_' i have a regression on tests :
tests::parse_inline_err for the file 0013_anonymous_static.rs
the error is not the expected one

Copy link
Member

@Veykril Veykril Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah we recover in static_ from this, ye I guess this is fine then.


_ => return Err(m),
};
Expand Down
4 changes: 4 additions & 0 deletions crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ fn foo() {
async || {};
move || {};
async move || {};
static || {};
Copy link
Member

@lnicola lnicola Feb 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also include static move || {};?

Copy link
Contributor

@edwin0cheng edwin0cheng Feb 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And also static async move ?

https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=48be355aed75f9e83f240e578f410c69

Copy link
Contributor Author

@bellau bellau Feb 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I am going to had it too

static move || {};
static async || {};
static async move || {};
}
64 changes: 64 additions & 0 deletions crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,70 @@ SOURCE_FILE
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
CLOSURE_EXPR
STATIC_KW "static"
WHITESPACE " "
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
CLOSURE_EXPR
STATIC_KW "static"
WHITESPACE " "
MOVE_KW "move"
WHITESPACE " "
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
CLOSURE_EXPR
STATIC_KW "static"
WHITESPACE " "
ASYNC_KW "async"
WHITESPACE " "
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
CLOSURE_EXPR
STATIC_KW "static"
WHITESPACE " "
ASYNC_KW "async"
WHITESPACE " "
MOVE_KW "move"
WHITESPACE " "
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n"
R_CURLY "}"
WHITESPACE "\n"