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

Merge #11458

Browse Source 
11458: Fix  Immovable generator syntax (static ||) not recognized #11448 r=Veykril a=bellau



Co-authored-by: bellau <laurent.belmonte@gmail.com>
This commit is contained in:
bors[bot] 2022-02-14 17:35:12 +00:00 committed by GitHub
commit 014d3ef1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 87 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/parser/src/grammar/expressions/atom.rs
View File

@ -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),
@ -234,6 +238,10 @@ 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!(
@ -241,8 +249,16 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
|| (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);

2
crates/parser/src/grammar/items.rs
View File

@ -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),
_ => return Err(m),
};

4
crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
View File

@ -6,4 +6,8 @@ fn foo() {
async || {};
move || {};
async move || {};
static || {};
static move || {};
static async || {};
static async move || {};
}

64
crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
View File

@ -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"