Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_class_declaration(
&mut self,
start_span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, Class<'a>>> {
self.parse_class(start_span, ClassType::ClassDeclaration, modifiers)
}
Expand All @@ -59,7 +59,7 @@ impl<'a> ParserImpl<'a> {
&mut self,
start_span: Span,
r#type: ClassType,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, Class<'a>>> {
self.bump_any(); // advance `class`

Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_parser/src/js/declaration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl<'a> ParserImpl<'a> {
&mut self,
start_span: Span,
decl_ctx: VariableDeclarationContext,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, VariableDeclaration<'a>>> {
let kind = match self.cur_kind() {
Kind::Var => VariableDeclarationKind::Var,
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl<'a> ParserImpl<'a> {
r#async: bool,
generator: bool,
func_kind: FunctionKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, Function<'a>>> {
let ctx = self.ctx;
self.ctx = self.ctx.and_in(true).and_await(r#async).and_yield(generator);
Expand Down Expand Up @@ -176,7 +176,7 @@ impl<'a> ParserImpl<'a> {
&mut self,
start_span: Span,
func_kind: FunctionKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, Function<'a>>> {
let r#async = modifiers.contains(ModifierKind::Async);
self.expect(Kind::Function)?;
Expand Down
11 changes: 5 additions & 6 deletions crates/oxc_parser/src/modifiers.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use bitflags::bitflags;

use oxc_allocator::Vec;
use oxc_ast::ast::TSAccessibility;
use oxc_span::Span;

Expand Down Expand Up @@ -103,10 +102,10 @@ pub struct Modifier {
}

#[derive(Debug, Default, Hash)]
pub struct Modifiers<'a>(Option<Vec<'a, Modifier>>);
pub struct Modifiers(Option<Vec<Modifier>>);

impl<'a> Modifiers<'a> {
pub fn new(modifiers: Vec<'a, Modifier>) -> Self {
impl Modifiers {
pub fn new(modifiers: Vec<Modifier>) -> Self {
Self(Some(modifiers))
}

Expand Down Expand Up @@ -179,9 +178,9 @@ impl ModifierKind {
}

impl<'a> ParserImpl<'a> {
pub(crate) fn eat_modifiers_before_declaration(&mut self) -> (ModifierFlags, Modifiers<'a>) {
pub(crate) fn eat_modifiers_before_declaration(&mut self) -> (ModifierFlags, Modifiers) {
let mut flags = ModifierFlags::empty();
let mut modifiers = self.ast.new_vec();
let mut modifiers = vec![];
while self.at_modifier() {
let span = self.start_span();
let modifier_flag = self.cur_kind().into();
Expand Down
12 changes: 6 additions & 6 deletions crates/oxc_parser/src/ts/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_ts_enum_declaration(
&mut self,
span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Declaration<'a>> {
self.bump_any(); // bump `enum`

Expand Down Expand Up @@ -104,7 +104,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_ts_type_alias_declaration(
&mut self,
span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Declaration<'a>> {
self.expect(Kind::Type)?;

Expand Down Expand Up @@ -140,7 +140,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_ts_interface_declaration(
&mut self,
span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Declaration<'a>> {
self.expect(Kind::Interface)?; // bump interface
let id = self.parse_binding_identifier()?;
Expand Down Expand Up @@ -269,7 +269,7 @@ impl<'a> ParserImpl<'a> {
&mut self,
span: Span,
kind: TSModuleDeclarationKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, TSModuleDeclaration<'a>>> {
let id = match self.cur_kind() {
Kind::Str => self.parse_literal_string().map(TSModuleDeclarationName::StringLiteral),
Expand Down Expand Up @@ -325,7 +325,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_declaration(
&mut self,
start_span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Declaration<'a>> {
match self.cur_kind() {
Kind::Namespace => {
Expand Down Expand Up @@ -385,7 +385,7 @@ impl<'a> ParserImpl<'a> {
pub(crate) fn parse_ts_declare_function(
&mut self,
start_span: Span,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Result<Box<'a, Function<'a>>> {
let r#async = modifiers.contains(ModifierKind::Async);
self.expect(Kind::Function)?;
Expand Down