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

parser: fix comments at end of class not being skipped

Browse Source 
Closes #29.
This commit is contained in:
Ryan Chandler 2022-09-12 00:24:04 +01:00
parent a7457dd9df
commit cd6efc57bb
No known key found for this signature in database
GPG Key ID: F113BCADDB3B0CCA
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -971,11 +971,16 @@ impl Parser {
self.lbrace()?;
let mut body = Vec::new();
self.gather_comments();
while self.current.kind != TokenKind::RightBrace && !self.is_eof() {
body.push(self.class_statement()?);
self.gather_comments();
if self.current.kind == TokenKind::RightBrace {
self.clear_comments();
break;
}
body.push(self.class_statement()?);
}
self.rbrace()?;
Ok(Statement::Class {
@ -988,8 +993,6 @@ impl Parser {
}
fn class_statement(&mut self) -> ParseResult<Statement> {
self.gather_comments();
match self.current.kind {
TokenKind::Use => {
self.next();
@ -2086,7 +2089,7 @@ impl Display for ParseError {
mod tests {
use super::Parser;
use crate::{
ast::{Arg, ArrayItem, ElseIf, InfixOp, MethodFlag},
ast::{Arg, ArrayItem, ElseIf, InfixOp, MethodFlag, PropertyFlag},
Expression, Identifier, Param, Statement, Type,
};
use trunk_lexer::Lexer;
@ -2981,6 +2984,19 @@ mod tests {
assert_ast("<?php ;", &[Statement::Noop]);
}
#[test]
fn comment_at_end_of_class() {
assert_ast("<?php
class MyClass {
protected $a;
// my comment
}", &[
Statement::Class { name: "MyClass".into(), extends: None, implements: vec![], body: vec![
Statement::Property { var: "a".into(), value: None, r#type: None, flags: vec![PropertyFlag::Protected] }
], flag: None }
]);
}
fn assert_ast(source: &str, expected: &[Statement]) {
let mut lexer = Lexer::new(None);
let tokens = lexer.tokenize(source).unwrap();