Skip to content
Merged
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
36 changes: 1 addition & 35 deletions crates/oxc_regular_expression/src/ast.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use oxc_allocator::{Box, CloneIn, GetAddress, Vec};
use oxc_ast_macros::ast;
use oxc_estree::ESTree;
use oxc_span::{Atom, ContentEq, GetSpan, Span};
use oxc_span::{Atom, ContentEq, Span};

/// The root of the `PatternParser` result.
#[ast]
Expand Down Expand Up @@ -52,26 +52,6 @@ pub enum Term<'a> {
NamedReference(Box<'a, NamedReference<'a>>) = 11,
}

impl GetSpan for Term<'_> {
#[inline]
fn span(&self) -> Span {
match self {
Term::BoundaryAssertion(it) => it.span,
Term::LookAroundAssertion(it) => it.span,
Term::Quantifier(it) => it.span,
Term::Character(it) => it.span,
Term::Dot(it) => it.span,
Term::CharacterClassEscape(it) => it.span,
Term::UnicodePropertyEscape(it) => it.span,
Term::CharacterClass(it) => it.span,
Term::CapturingGroup(it) => it.span,
Term::IgnoreGroup(it) => it.span,
Term::IndexedReference(it) => it.span,
Term::NamedReference(it) => it.span,
}
}
}

/// Simple form of assertion.
/// e.g. `^`, `$`, `\b`, `\B`
#[ast]
Expand Down Expand Up @@ -241,20 +221,6 @@ pub enum CharacterClassContents<'a> {
ClassStringDisjunction(Box<'a, ClassStringDisjunction<'a>>) = 5,
}

impl GetSpan for CharacterClassContents<'_> {
#[inline]
fn span(&self) -> Span {
match self {
CharacterClassContents::CharacterClassRange(it) => it.span,
CharacterClassContents::CharacterClassEscape(it) => it.span,
CharacterClassContents::UnicodePropertyEscape(it) => it.span,
CharacterClassContents::Character(it) => it.span,
CharacterClassContents::NestedCharacterClass(it) => it.span,
CharacterClassContents::ClassStringDisjunction(it) => it.span,
}
}
}

/// `-` separated range of characters.
/// e.g. `a-z`, `A-Z`, `0-9`
#[ast]
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_regular_expression/src/ast_impl/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
mod display;
mod span;
pub mod visit;
40 changes: 40 additions & 0 deletions crates/oxc_regular_expression/src/ast_impl/span.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// NOTE: For now, this file is implemented by hand for convenience.
// But like `oxc_ast`, this should be generated by `tasks/ast_tools` in the future.

use oxc_span::{GetSpan, Span};

use crate::ast::{CharacterClassContents, Term};

impl GetSpan for Term<'_> {
#[inline]
fn span(&self) -> Span {
match self {
Term::BoundaryAssertion(it) => it.span,
Term::LookAroundAssertion(it) => it.span,
Term::Quantifier(it) => it.span,
Term::Character(it) => it.span,
Term::Dot(it) => it.span,
Term::CharacterClassEscape(it) => it.span,
Term::UnicodePropertyEscape(it) => it.span,
Term::CharacterClass(it) => it.span,
Term::CapturingGroup(it) => it.span,
Term::IgnoreGroup(it) => it.span,
Term::IndexedReference(it) => it.span,
Term::NamedReference(it) => it.span,
}
}
}

impl GetSpan for CharacterClassContents<'_> {
#[inline]
fn span(&self) -> Span {
match self {
CharacterClassContents::CharacterClassRange(it) => it.span,
CharacterClassContents::CharacterClassEscape(it) => it.span,
CharacterClassContents::UnicodePropertyEscape(it) => it.span,
CharacterClassContents::Character(it) => it.span,
CharacterClassContents::NestedCharacterClass(it) => it.span,
CharacterClassContents::ClassStringDisjunction(it) => it.span,
}
}
}
Loading