Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

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

Closed
wants to merge 1 commit into from
Closed

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

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 @@ -2,6 +2,7 @@ use super::ParseResult;
use crate::expect_token;
use crate::expected_token_err;
use crate::parser::precedence::Precedence;
use crate::peek_token;
use crate::ClassFlag;
use crate::Identifier;
use crate::MethodFlag;
Expand Down Expand Up @@ -34,16 +35,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!([
Copy link
Collaborator Author

@azjezz azjezz Nov 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

difference between peek_token and expect_token is that peek_token doesn't call self.next();.

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(crate) fn trait_statement(&mut self) -> ParseResult<Statement> {
Expand Down Expand Up @@ -87,14 +87,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
66 changes: 41 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::ParseError;
use crate::Parser;
use crate::TokenKind;

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

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

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

pub(crate) fn class_members_flags(&mut self) -> ParseResult<Vec<TokenKind>> {
self.collect(
vec![
Expand Down Expand Up @@ -92,34 +106,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