Skip to content

Commit

Permalink
Use explicit names
Browse files Browse the repository at this point in the history
  • Loading branch information
@leaysgur
leaysgur committed Jul 3, 2024
1 parent 13273fa commit 362ed78
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
40 changes: 20 additions & 20 deletions crates/oxc_regexp_parser/src/parser/body_parser/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl<'a> PatternParser<'a> {
// ```
// <https://tc39.es/ecma262/#prod-Pattern>
fn consume_pattern(&mut self) -> Result<ast::Pattern<'a>> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();
// TODO: Read only constants
// this._numCapturingParens = this.countCapturingParens();
// TODO: Define state, use later somewhere
Expand Down Expand Up @@ -79,7 +79,7 @@ impl<'a> PatternParser<'a> {
// }

let pattern = ast::Pattern {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
alternatives,
};

Expand Down Expand Up @@ -129,7 +129,7 @@ impl<'a> PatternParser<'a> {
// ```
// <https://tc39.es/ecma262/#prod-Alternative>
fn consume_alternative(&mut self, i: usize) -> Result<ast::Alternative<'a>> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();

// TODO: Implement
let _ = i;
Expand All @@ -147,7 +147,7 @@ impl<'a> PatternParser<'a> {
}

Ok(ast::Alternative {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
elements,
})
}
Expand All @@ -164,15 +164,15 @@ impl<'a> PatternParser<'a> {
return Ok(Some(ast::Element::Assertion(Box::new_in(assertion, self.allocator))));
}

let start = self.reader.span_position();
let span_start = self.reader.span_position();
match (self.consume_atom()?, self.consume_quantifier()?) {
(Some(atom), None) => {
Ok(Some(ast::Element::QuantifiableElement(Box::new_in(atom, self.allocator))))
}
(Some(atom), Some(((min, max), greedy))) => {
return Ok(Some(ast::Element::Quantifier(Box::new_in(
ast::Quantifier {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
min,
max,
greedy,
Expand All @@ -197,13 +197,13 @@ impl<'a> PatternParser<'a> {
// (?<! Disjunction[?UnicodeMode, ?UnicodeSetsMode, ?NamedCaptureGroups] )
// <https://tc39.es/ecma262/#prod-Assertion>
fn consume_assertion(&mut self) -> Result<Option<ast::Assertion<'a>>> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();

if self.reader.eat('^') {
return Ok(Some(ast::Assertion::BoundaryAssertion(Box::new_in(
ast::BoundaryAssertion::EdgeAssertion(Box::new_in(
ast::EdgeAssertion {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
kind: ast::EdgeAssertionKind::Start,
},
self.allocator,
Expand All @@ -215,7 +215,7 @@ impl<'a> PatternParser<'a> {
return Ok(Some(ast::Assertion::BoundaryAssertion(Box::new_in(
ast::BoundaryAssertion::EdgeAssertion(Box::new_in(
ast::EdgeAssertion {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
kind: ast::EdgeAssertionKind::End,
},
self.allocator,
Expand All @@ -227,7 +227,7 @@ impl<'a> PatternParser<'a> {
return Ok(Some(ast::Assertion::BoundaryAssertion(Box::new_in(
ast::BoundaryAssertion::WordBoundaryAssertion(Box::new_in(
ast::WordBoundaryAssertion {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
negate: false,
},
self.allocator,
Expand All @@ -239,7 +239,7 @@ impl<'a> PatternParser<'a> {
return Ok(Some(ast::Assertion::BoundaryAssertion(Box::new_in(
ast::BoundaryAssertion::WordBoundaryAssertion(Box::new_in(
ast::WordBoundaryAssertion {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
negate: true,
},
self.allocator,
Expand All @@ -249,7 +249,7 @@ impl<'a> PatternParser<'a> {
}

// Lookaround
let rewind_start = self.reader.checkpoint();
let checkpoint = self.reader.checkpoint();
if self.reader.eat2('(', '?') {
let lookaround = {
let is_lookbehind = self.reader.eat('<');
Expand All @@ -269,7 +269,7 @@ impl<'a> PatternParser<'a> {
return Err(OxcDiagnostic::error("Unterminated group"));
}

let span = self.span_factory.create(start, self.reader.span_position());
let span = self.span_factory.create(span_start, self.reader.span_position());
let lookaround_assertion = if is_lookbehind {
ast::LookaroundAssertion::LookbehindAssertion(Box::new_in(
ast::LookbehindAssertion { span, negate, alternatives },
Expand All @@ -288,7 +288,7 @@ impl<'a> PatternParser<'a> {
))));
}

self.reader.rewind(rewind_start);
self.reader.rewind(checkpoint);
}

Ok(None)
Expand Down Expand Up @@ -403,7 +403,7 @@ impl<'a> PatternParser<'a> {
// ```
// <https://tc39.es/ecma262/#prod-SyntaxCharacter>
fn consume_pattern_character(&mut self) -> Option<ast::Character> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();

let cp = self.reader.peek()?;
if unicode::is_syntax_character(cp) {
Expand All @@ -412,25 +412,25 @@ impl<'a> PatternParser<'a> {

self.reader.advance();
Some(ast::Character {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
value: cp,
})
}

fn consume_dot(&mut self) -> Option<ast::AnyCharacterSet> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();

if !self.reader.eat('.') {
return None;
}

Some(ast::AnyCharacterSet {
span: self.span_factory.create(start, self.reader.span_position()),
span: self.span_factory.create(span_start, self.reader.span_position()),
})
}

fn consume_decimal_digits(&mut self) -> Option<usize> {
let start = self.reader.span_position();
let span_start = self.reader.span_position();

let mut value = 0;
while let Some(cp) = self.reader.peek() {
Expand All @@ -443,7 +443,7 @@ impl<'a> PatternParser<'a> {
self.reader.advance();
}

if self.reader.span_position() != start {
if self.reader.span_position() != span_start {
return Some(value);
}

Expand Down
14 changes: 7 additions & 7 deletions crates/oxc_regexp_parser/src/parser/body_parser/reader.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ mod test {
assert!(!reader.eat3('E', 'x', 'p'));
assert!(reader.eat2('x', 'p'));

let start = reader.index;
assert_eq!(start, 7);
let checkpoint = reader.checkpoint();
assert_eq!(checkpoint, 7);
assert_eq!(reader.peek(), Some('✨' as u32));

reader.advance();
Expand All @@ -140,7 +140,7 @@ mod test {
reader.advance();
assert_eq!(reader.peek(), None);

reader.rewind(start);
reader.rewind(checkpoint);
assert_eq!(reader.peek(), Some('✨' as u32));
}
}
Expand All @@ -153,7 +153,7 @@ mod test {

assert!(unicode_reader.eat('𠮷')); // Can eat
assert!(unicode_reader.eat2('野', '家'));
let start = unicode_reader.index;
let checkpoint = unicode_reader.checkpoint();
assert!(unicode_reader.eat('は'));

// Emoji + Skin tone
Expand All @@ -165,7 +165,7 @@ mod test {
assert_eq!(unicode_reader.peek2(), Some('ち' as u32));
assert_eq!(unicode_reader.peek3(), None);

unicode_reader.rewind(start);
unicode_reader.rewind(checkpoint);
assert!(unicode_reader.eat('は'));

let mut legacy_reader = Reader::new(source_text, false);
Expand All @@ -177,7 +177,7 @@ mod test {

assert!(legacy_reader.eat('野'));
assert!(legacy_reader.eat('家'));
let start = unicode_reader.index;
let checkpoint = unicode_reader.checkpoint();
assert!(legacy_reader.eat('は'));

legacy_reader.advance();
Expand All @@ -190,7 +190,7 @@ mod test {
assert_eq!(legacy_reader.peek3(), Some('ち' as u32));
assert!(legacy_reader.eat3('あ', 'っ', 'ち'));

legacy_reader.rewind(start);
legacy_reader.rewind(checkpoint);
assert!(legacy_reader.eat('は'));
}

Expand Down

0 comments on commit 362ed78

Please sign in to comment.