robin/php-literal-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/php-literal-parser.git synced 2026-06-03 18:44:07 +02:00
Code Issues Projects Releases Wiki Activity

fix deserializing nested arrays with implicit keys into map

Browse source
This commit is contained in:
Robin Appelman 2021-08-29 20:45:45 +02:00
commit 189a19d631
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/serde_impl.rs
View file

@ -595,6 +595,9 @@ impl<'de, 'a> MapAccess<'de> for ArrayWalker<'de, 'a> {
Token::LiteralString,
Token::Null,
self.syntax.close_bracket(),
// below is only when this token is a value with implicit key, not a when the token is a key
Token::Array,
Token::SquareOpen,
],
self.source(),
)?;
@ -604,13 +607,29 @@ impl<'de, 'a> MapAccess<'de> for ArrayWalker<'de, 'a> {
return Ok(None);
}
let next = self.de.next_token().expect_token(
&[Token::Arrow, Token::Comma, self.syntax.close_bracket()],
self.source(),
)?;
let next = self.de.next_token().ok_or_else(|| {
Option::<SpannedToken>::None
.expect_token(
&[Token::Arrow, Token::Comma, self.syntax.close_bracket()],
self.source(),
)
.unwrap_err()
})?;
match next.token {
Token::Arrow => {
// now we know it's a map key, the expected token is a bit more strict
let token = token.expect_token(
&[
Token::Bool,
Token::Integer,
Token::Float,
Token::LiteralString,
Token::Null,
self.syntax.close_bracket(),
],
self.source(),
)?;
// Deserialize a map key.
if let Key::Int(int_key) = self.de.parser.parse_array_key(token.clone())? {
self.next_int_key = int_key + 1;