danog/parser
1
0
Fork 0
mirror of https://github.com/danog/parser.git synced 2025-01-22 13:01:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

parser: support unpacking array items

Browse Source
This commit is contained in:
Ryan Chandler 2022-09-16 11:21:18 +01:00
parent df92c31adf
commit 9ca03f5fdd
No known key found for this signature in database
GPG Key ID: F113BCADDB3B0CCA
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk_parser/src/ast.rs
View File

@ -591,6 +591,7 @@ pub enum MagicConst {
pub struct ArrayItem {
pub key: Option<Expression>,
pub value: Expression,
pub unpack: bool,
}
#[derive(Debug, Eq, PartialEq, Clone)]

71
trunk_parser/src/parser/mod.rs
View File

@ -1595,6 +1595,13 @@ impl Parser {
while self.current.kind != TokenKind::RightParen {
let mut key = None;
let unpack = if self.current.kind == TokenKind::Ellipsis {
self.next();
true
} else {
false
};
let mut value = self.expression(Precedence::Lowest)?;
if self.current.kind == TokenKind::DoubleArrow {
@ -1604,7 +1611,7 @@ impl Parser {
value = self.expression(Precedence::Lowest)?;
}
items.push(ArrayItem { key, value });
items.push(ArrayItem { key, value, unpack });
self.optional_comma()?;
@ -1626,12 +1633,19 @@ impl Parser {
items.push(ArrayItem {
key: None,
value: Expression::Empty,
unpack: false,
});
self.next();
continue;
}
let mut key = None;
let unpack = if self.current.kind == TokenKind::Ellipsis {
self.next();
true
} else {
false
};
let mut value = self.expression(Precedence::Lowest)?;
if self.current.kind == TokenKind::DoubleArrow {
@ -1641,7 +1655,7 @@ impl Parser {
value = self.expression(Precedence::Lowest)?;
}
items.push(ArrayItem { key, value });
items.push(ArrayItem { key, value, unpack });
self.optional_comma()?;
@ -3424,10 +3438,12 @@ mod tests {
ArrayItem {
key: None,
value: Expression::Variable { name: "baz".into() },
unpack: false,
},
ArrayItem {
key: None,
value: Expression::Variable { name: "car".into() },
unpack: false,
},
],
},
@ -3777,18 +3793,22 @@ mod tests {
ArrayItem {
key: None,
value: Expression::Int { i: 1 },
unpack: false,
},
ArrayItem {
key: None,
value: Expression::Int { i: 2 },
unpack: false,
},
ArrayItem {
key: None,
value: Expression::Empty,
unpack: false,
},
ArrayItem {
key: None,
value: Expression::Int { i: 4 },
unpack: false,
},
]
})],
@ -4339,6 +4359,53 @@ mod tests {
);
}
#[test]
fn unpack_array_items() {
assert_ast(
"<?php [...[]];",
&[expr!(Expression::Array {
items: vec![ArrayItem {
key: None,
unpack: true,
value: Expression::Array { items: vec![] }
}]
})],
);
}
#[test]
fn unpack_multiple_array_items() {
assert_ast(
"<?php [...[1], ...[2]];",
&[expr!(Expression::Array {
items: vec![
ArrayItem {
key: None,
unpack: true,
value: Expression::Array {
items: vec![ArrayItem {
key: None,
unpack: false,
value: Expression::Int { i: 1 }
}]
}
},
ArrayItem {
key: None,
unpack: true,
value: Expression::Array {
items: vec![ArrayItem {
key: None,
unpack: false,
value: Expression::Int { i: 2 }
}]
}
}
]
})],
);
}
fn assert_ast(source: &str, expected: &[Statement]) {
let mut lexer = Lexer::new(None);
let tokens = lexer.tokenize(source).unwrap();