danog/parser
1
0
Fork 0
mirror of https://github.com/danog/parser.git synced 2024-11-30 04:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from ryangjchandler/feature/readonly-properties

Browse Source
This commit is contained in:
Ryan Chandler 2022-09-13 12:09:51 +01:00 committed by GitHub
commit 5eefe38ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk_parser/src/ast.rs
View File

@ -76,6 +76,7 @@ pub enum PropertyFlag {
Protected,
Private,
Static,
Readonly,
}
impl From<TokenKind> for PropertyFlag {
@ -85,6 +86,7 @@ impl From<TokenKind> for PropertyFlag {
TokenKind::Protected => Self::Protected,
TokenKind::Private => Self::Private,
TokenKind::Static => Self::Static,
TokenKind::Readonly => Self::Readonly,
_ => unreachable!("token {:?} can't be converted into property flag.", k),
}
}

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

@ -1177,7 +1177,8 @@ impl Parser {
| TokenKind::Public
| TokenKind::Private
| TokenKind::Protected
| TokenKind::Static => {
| TokenKind::Static
| TokenKind::Readonly => {
let mut flags = vec![self.current.kind.clone()];
self.next();
@ -1189,6 +1190,7 @@ impl Parser {
TokenKind::Private,
TokenKind::Protected,
TokenKind::Static,
TokenKind::Readonly,
]
.contains(&self.current.kind)
{
@ -3549,6 +3551,25 @@ mod tests {
);
}
#[test]
fn readonly_class_props() {
assert_ast(
"<?php class Foo { public readonly $bar; }",
&[Statement::Class {
name: "Foo".as_bytes().into(),
extends: None,
implements: vec![],
body: vec![Statement::Property {
var: "bar".as_bytes().into(),
value: None,
r#type: None,
flags: vec![PropertyFlag::Public, PropertyFlag::Readonly],
}],
flag: None,
}],
);
}
fn assert_ast(source: &str, expected: &[Statement]) {
let mut lexer = Lexer::new(None);
let tokens = lexer.tokenize(source).unwrap();