mirror-github-bspeice/qadapt
1
0
Fork 0
mirror of https://github.com/bspeice/qadapt synced 2025-10-31 09:30:37 -04:00
Code Issues Releases Wiki Activity

Handle return showing up in closures

Browse Source
This commit is contained in:
Bradlee Speice
2018-11-17 10:32:58 -05:00
parent eef377708b
commit 3341faeb91
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qadapt-macro/src/lib.rs
View File

@ -120,17 +120,26 @@ fn protected_body(fn_body: Group) -> TokenTree {
/// to `return` with an exit guard.
fn escape_return(ts: TokenStream) -> TokenStream {
let mut protected: Vec<TokenTree> = Vec::new();
let mut in_closure: bool = false;
let mut tt_iter = ts.into_iter();
while let Some(tt) = tt_iter.next() {
let mut tokens = match tt {
TokenTree::Group(ref g) if g.delimiter() == Delimiter::Brace => {
TokenTree::Group(ref g) if g.delimiter() == Delimiter::Brace && !in_closure => {
vec![group!(Delimiter::Brace, escape_return(g.stream()))]
}
TokenTree::Ident(ref i) if i.to_string() == "return" => vec![
TokenTree::Ident(ref i) if i.to_string() == "return" && !in_closure => vec![
group!(Delimiter::Brace, release_guard("exit_protected")),
tt.clone(),
],
TokenTree::Punct(ref p) if p.as_char() == '|' => {
in_closure = true;
vec![tt.clone()]
}
TokenTree::Punct(ref p) if p.as_char() == ';' => {
in_closure = false;
vec![tt.clone()]
}
t => vec![t],
};