language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Changed token order

Browse source
This commit is contained in:
J.Teeuwissen 2023-06-19 19:55:01 +02:00
parent 78c1855b66
commit efe91da38c
No known key found for this signature in database
GPG key ID: DB5F7A1ED8D478AD
1 changed files with 21 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

58
crates/compiler/mono/src/reset_reuse.rs
View file

@ -749,18 +749,12 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
}); });
} }
let layouts_for_reuse = { let layouts_for_reuse = Vec::from_iter_in(
let mut layouts = Vec::from_iter_in( used_reuse_tokens.iter().flat_map(|(layout, tokens)| {
used_reuse_tokens.iter().flat_map(|(layout, tokens)| { tokens.iter().map(|token| (token.inlayout, *layout))
tokens.iter().map(|token| (token.inlayout, *layout)) }),
}), arena,
arena, );
);
// Make sure the layouts are sorted, so that we can provide them from the jump.
// In the same order as we consume them from the join point.
layouts.sort();
layouts
};
let second_pass_remainder = { let second_pass_remainder = {
environment.add_joinpoint_reuse_tokens( environment.add_joinpoint_reuse_tokens(
@ -784,18 +778,12 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
}; };
let extended_parameters = { let extended_parameters = {
let layouts_for_reuse_with_token = { let layouts_for_reuse_with_token = Vec::from_iter_in(
let mut layout_with_tokens = Vec::from_iter_in( used_reuse_tokens
used_reuse_tokens.iter().flat_map(|(layout, tokens)| { .iter()
tokens.iter().map(|token| (*layout, *token)) .flat_map(|(layout, tokens)| tokens.iter().map(|token| (*layout, *token))),
}), arena,
arena, );
);
// Make sure the layouts are sorted, so that we can provide them from the jump.
// In the same order as we consume them from the join point.
layout_with_tokens.sort_by_key(|(layout, _)| *layout);
layout_with_tokens
};
let token_params = let token_params =
layouts_for_reuse_with_token layouts_for_reuse_with_token
@ -806,7 +794,7 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
layout: *token.inlayout, layout: *token.inlayout,
}); });
// Add the void tokens to the jump arguments to match the expected arguments of the join point. // Add the reuse tokens to the join arguments to match the expected arguments of the jump.
let extended_parameters = let extended_parameters =
Vec::from_iter_in(parameters.iter().copied().chain(token_params), arena) Vec::from_iter_in(parameters.iter().copied().chain(token_params), arena)
.into_bump_slice(); .into_bump_slice();
@ -901,8 +889,10 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
let mut void_pointer_layout_symbols = Vec::new_in(arena); let mut void_pointer_layout_symbols = Vec::new_in(arena);
// See what tokens we can get from the env, if none are available, use a void pointer. // See what tokens we can get from the env, if none are available, use a void pointer.
// We process the tokens in reverse order, so that when we consume the tokens we last added, we consume the tokens that are most likely not to be null.
let tokens = token_layouts_clone let tokens = token_layouts_clone
.iter() .iter()
.rev()
.map(|(param_layout, token_layout)| { .map(|(param_layout, token_layout)| {
match environment.pop_reuse_token(token_layout) { match environment.pop_reuse_token(token_layout) {
Some(reuse_token) => { Some(reuse_token) => {
@ -931,7 +921,8 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
} }
}, },
} }
}); })
.rev();
// Add the void tokens to the jump arguments to match the expected arguments of the join point. // Add the void tokens to the jump arguments to match the expected arguments of the join point.
let extended_arguments = let extended_arguments =
@ -1162,17 +1153,10 @@ impl<'a> ReuseEnvironment<'a> {
token: reuse_token, token: reuse_token,
inlayout: layout, inlayout: layout,
}; };
match self.reuse_tokens.get_mut(&token_layout) { self.reuse_tokens
Some(reuse_tokens) => { .entry(token_layout)
// If the layout is already in the map, push the token on the stack. .and_modify(|reuse_tokens| reuse_tokens.push(with_info))
reuse_tokens.push(with_info); .or_insert(Vec::from_iter_in([with_info], arena));
}
None => {
// If the layout is not in the map, create a new stack with the token.
self.reuse_tokens
.insert(token_layout, Vec::from_iter_in([with_info], arena));
}
};
} }
/** /**