Skip to content

chore: don't use class member flags for interface member flags #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2022
Merged

chore: don't use class member flags for interface member flags #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/parser/classish_statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::parser::Parser;

use crate::expect_token;
use crate::expected_token_err;
use crate::peek_token;

#[derive(Debug)]
pub enum ClassishDefinitionType {
Expand Down Expand Up @@ -38,16 +39,15 @@ impl Parser {
return self.method(ClassishDefinitionType::Interface, vec![]);
}

let member_flags = self.class_members_flags()?;
let member_flags = self.interface_members_flags()?;

match &self.current.kind {
peek_token!([
TokenKind::Const => self.parse_classish_const(member_flags),
TokenKind::Function => self.method(
ClassishDefinitionType::Interface,
member_flags.iter().map(|t| t.clone().into()).collect(),
),
_ => expected_token_err!(["`const`", "`function`"], self),
}
)
], self, ["`const`", "`function`"])
}

pub(in crate::parser) fn trait_statement(&mut self) -> ParseResult<Statement> {
Expand Down Expand Up @@ -91,14 +91,13 @@ impl Parser {

let member_flags = self.enum_members_flags()?;

match &self.current.kind {
peek_token!([
TokenKind::Const => self.parse_classish_const(member_flags),
TokenKind::Function => self.method(
ClassishDefinitionType::Enum,
member_flags.iter().map(|t| t.clone().into()).collect(),
),
_ => expected_token_err!(["`const`", "`function`"], self),
}
)
], self, ["`const`", "`function`"])
}

fn complete_class_statement(
Expand Down
61 changes: 36 additions & 25 deletions src/parser/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ use crate::parser::error::ParseError;
use crate::parser::error::ParseResult;
use crate::parser::Parser;

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
enum FlagTarget {
Class,
EnumMember,
ClassMember,
InterfaceMember,
PromotedProperty,
}

Expand All @@ -18,6 +20,13 @@ impl Parser {
)
}

pub(in crate::parser) fn interface_members_flags(&mut self) -> ParseResult<Vec<TokenKind>> {
self.collect(
vec![TokenKind::Public, TokenKind::Static],
FlagTarget::InterfaceMember,
)
}

pub(in crate::parser) fn class_members_flags(&mut self) -> ParseResult<Vec<TokenKind>> {
self.collect(
vec![
Expand Down Expand Up @@ -92,34 +101,36 @@ impl Parser {
{
return Err(ParseError::MultipleAccessModifiers(self.current.span));
}
TokenKind::Final if collected.contains(&TokenKind::Abstract) => match target {
FlagTarget::Class => {
return Err(ParseError::FinalModifierOnAbstractClass(
self.current.span,
));
}
FlagTarget::ClassMember => {
return Err(ParseError::FinalModifierOnAbstractClassMember(
self.current.span,
));
}
_ => {}
},
TokenKind::Abstract if collected.contains(&TokenKind::Final) => match target {
FlagTarget::Class => {
return Err(ParseError::FinalModifierOnAbstractClass(
self.current.span,
));
_ => {}
};

if matches!(target, FlagTarget::ClassMember | FlagTarget::Class) {
match self.current.kind {
TokenKind::Final if collected.contains(&TokenKind::Abstract) => {
if target == FlagTarget::Class {
return Err(ParseError::FinalModifierOnAbstractClass(
self.current.span,
));
} else {
return Err(ParseError::FinalModifierOnAbstractClassMember(
self.current.span,
));
}
}
FlagTarget::ClassMember => {
return Err(ParseError::FinalModifierOnAbstractClassMember(
self.current.span,
));
TokenKind::Abstract if collected.contains(&TokenKind::Final) => {
if target == FlagTarget::Class {
return Err(ParseError::FinalModifierOnAbstractClass(
self.current.span,
));
} else {
return Err(ParseError::FinalModifierOnAbstractClassMember(
self.current.span,
));
}
}
_ => {}
},
_ => {}
};
};
}

collected.push(self.current.kind.clone());
self.next();
Expand Down
38 changes: 22 additions & 16 deletions src/parser/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#[macro_export]
macro_rules! expect_token {
macro_rules! peek_token {
([ $($expected:pat => $out:expr),+ $(,)? ], $parser:expr, [ $($message:literal),+ $(,)? ]) => {{
$parser.skip_comments();
match $parser.current.kind.clone() {
$(
$expected => {
$parser.next();
$out
}
$expected => $out,
)+
_ => {
return $crate::expected_token_err!([ $($message,)+ ], $parser);
Expand All @@ -16,22 +13,31 @@ macro_rules! expect_token {
}};
([ $($expected:pat),+ $(,)? ], $parser:expr, [ $($message:literal),+ $(,)? ]) => {{
$parser.skip_comments();
match $parser.current.kind.clone() {
$(
$expected => {
$parser.next();
}
)+
_ => {
return $crate::expected_token_err!([ $($message,)+ ], $parser);
}
if !matches!($parser.current.kind, $(| $expected )+) {
return $crate::expected_token_err!([ $($message,)+ ], $parser);
}
}};
([ $($expected:pat => $out:expr),+ $(,)? ], $parser:expr, $message:literal) => {
$crate::expect_token!([ $($expected => $out,)+ ], $parser, [$message])
$crate::peek_token!([ $($expected => $out,)+ ], $parser, [$message])
};
([ $($expected:pat),+ $(,)? ], $parser:expr, $message:literal) => {
$crate::peek_token!([ $($expected,)+ ], $parser, [$message])
};
}

#[macro_export]
macro_rules! expect_token {
([ $($expected:pat => $out:expr),+ $(,)? ], $parser:expr, [ $($message:literal),+ $(,)? ]) => {
$crate::peek_token!([ $($expected => { $parser.next(); $out },)+ ], $parser, [$($message,)+])
};
([ $($expected:pat),+ $(,)? ], $parser:expr, [ $($message:literal),+ $(,)? ]) => {
$crate::peek_token!([ $($expected => { $parser.next(); },)+ ], $parser, [$($message,)+])
};
([ $($expected:pat => $out:expr),+ $(,)? ], $parser:expr, $message:literal) => {
$crate::peek_token!([ $($expected => { $parser.next(); $out },)+ ], $parser, [$message])
};
([ $($expected:pat),+ $(,)? ], $parser:expr, $message:literal) => {
$crate::expect_token!([ $($expected,)+ ], $parser, [$message])
$crate::peek_token!([ $($expected => { $parser.next(); },)+ ], $parser, [$message])
};
}

Expand Down
5 changes: 5 additions & 0 deletions tests/0132/code.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

interface foo {
public abstract function foo(): void;
}
1 change: 1 addition & 0 deletions tests/0132/parser-error.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ExpectedToken(["`const`", "`function`"], Some("abstract"), (4, 12)) -> Parse error: unexpected token `abstract`, expecting `const`, or `function` on line 4 column 12
108 changes: 108 additions & 0 deletions tests/0132/tokens.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
[
Token {
kind: OpenTag(
Full,
),
span: (
1,
1,
),
},
Token {
kind: Interface,
span: (
3,
1,
),
},
Token {
kind: Identifier(
"foo",
),
span: (
3,
11,
),
},
Token {
kind: LeftBrace,
span: (
3,
15,
),
},
Token {
kind: Public,
span: (
4,
5,
),
},
Token {
kind: Abstract,
span: (
4,
12,
),
},
Token {
kind: Function,
span: (
4,
21,
),
},
Token {
kind: Identifier(
"foo",
),
span: (
4,
30,
),
},
Token {
kind: LeftParen,
span: (
4,
33,
),
},
Token {
kind: RightParen,
span: (
4,
34,
),
},
Token {
kind: Colon,
span: (
4,
35,
),
},
Token {
kind: Identifier(
"void",
),
span: (
4,
37,
),
},
Token {
kind: SemiColon,
span: (
4,
41,
),
},
Token {
kind: RightBrace,
span: (
5,
1,
),
},
]
5 changes: 5 additions & 0 deletions tests/0141/code.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

interface foo {
private function bar();
}
1 change: 1 addition & 0 deletions tests/0141/parser-error.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ExpectedToken(["`const`", "`function`"], Some("private"), (4, 5)) -> Parse error: unexpected token `private`, expecting `const`, or `function` on line 4 column 5
Loading