mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-08-26 21:34:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dict spreading in dict literal

Browse source
This commit is contained in:
harupy 2023-01-15 13:01:59 +09:00
parent ac4d3c076c
commit 581f6e176c
4 changed files with 124 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

72
parser/python.lalrpop
View file

@ -1138,42 +1138,42 @@ Atom<Goal>: ast::Expr = {
<location:@L> "{" <e:DictLiteralValues?> "}" <end_location:@R> => {
let pairs = e.unwrap_or_default();
let (keys, values) = match pairs.iter().position(|(k,_)| k.is_none()) {
Some(unpack_idx) => {
let mut pairs = pairs;
let (keys, mut values): (_, Vec<_>) = pairs.drain(..unpack_idx).map(|(k, v)| (*k.unwrap(), v)).unzip();
fn build_map(items: &mut Vec<(ast::Expr, ast::Expr)>) -> ast::Expr {
let location = items[0].0.location;
let end_location = items[0].0.end_location;
let (keys, values) = items.drain(..).unzip();
ast::Expr {
location,
end_location,
custom: (),
node: ast::ExprKind::Dict { keys, values }
}
}
let mut items = Vec::new();
for (key, value) in pairs.into_iter() {
if let Some(key) = key {
items.push((*key, value));
continue;
}
if !items.is_empty() {
values.push(build_map(&mut items));
}
values.push(value);
}
if !items.is_empty() {
values.push(build_map(&mut items));
}
(keys, values)
},
None => pairs.into_iter().map(|(k, v)| (*k.unwrap(), v)).unzip()
};
// let (keys, values) = match pairs.iter().position(|(k,_)| k.is_none()) {
// Some(unpack_idx) => {
// let mut pairs = pairs;
// let (keys, mut values): (_, Vec<_>) = pairs.drain(..unpack_idx).map(|(k, v)| (*k.unwrap(), v)).unzip();
//
// fn build_map(items: &mut Vec<(ast::Expr, ast::Expr)>) -> ast::Expr {
// let location = items[0].0.location;
// let end_location = items[0].0.end_location;
// let (keys, values) = items.drain(..).unzip();
// ast::Expr {
// location,
// end_location,
// custom: (),
// node: ast::ExprKind::Dict { keys, values }
// }
// }
//
// let mut items = Vec::new();
// for (key, value) in pairs.into_iter() {
// if let Some(key) = key {
// items.push((*key, value));
// continue;
// }
// if !items.is_empty() {
// values.push(build_map(&mut items));
// }
// values.push(value);
// }
// if !items.is_empty() {
// values.push(build_map(&mut items));
// }
// (keys, values)
// },
// None => pairs.into_iter().map(|(k, v)| (k, v)).unzip()
// };
let (keys, values) = pairs.into_iter().map(|(k, v)| (k.map(|x| *x), v)).unzip();
ast::Expr {
location,
end_location: Some(end_location),