refactor(ast): change the arguments order for some new functions

This commit is contained in:
Boshen 2023-09-16 16:07:05 +08:00
parent 419d5aa6ee
commit 70189f9758
No known key found for this signature in database
GPG key ID: 9C7A8C8AB22BEBD1
7 changed files with 10 additions and 10 deletions

View file

@ -282,8 +282,8 @@ impl Hash for IdentifierReference {
} }
impl IdentifierReference { impl IdentifierReference {
pub fn new(name: Atom, span: Span) -> Self { pub fn new(span: Span, name: Atom) -> Self {
Self { name, span, reference_id: Cell::default() } Self { span, name, reference_id: Cell::default() }
} }
} }
@ -306,8 +306,8 @@ impl Hash for BindingIdentifier {
} }
impl BindingIdentifier { impl BindingIdentifier {
pub fn new(name: Atom, span: Span) -> Self { pub fn new(span: Span, name: Atom) -> Self {
Self { name, span, symbol_id: Cell::default() } Self { span, name, symbol_id: Cell::default() }
} }
} }

View file

@ -90,7 +90,7 @@ impl<'a> Parser<'a> {
// ^ BindingIdentifier // ^ BindingIdentifier
if let PropertyKey::Identifier(ident) = &key { if let PropertyKey::Identifier(ident) = &key {
shorthand = true; shorthand = true;
let binding_identifier = BindingIdentifier::new(ident.name.clone(), ident.span); let binding_identifier = BindingIdentifier::new(ident.span, ident.name.clone());
let identifier = self.ast.binding_identifier(binding_identifier); let identifier = self.ast.binding_identifier(binding_identifier);
let left = self.ast.binding_pattern(identifier, None, false); let left = self.ast.binding_pattern(identifier, None, false);
self.with_context(Context::In, |p| p.parse_initializer(span, left))? self.with_context(Context::In, |p| p.parse_initializer(span, left))?

View file

@ -152,7 +152,7 @@ impl<'a> CoverGrammar<'a, ObjectProperty<'a>> for AssignmentTargetProperty<'a> {
let binding = match property.key { let binding = match property.key {
PropertyKey::Identifier(ident) => { PropertyKey::Identifier(ident) => {
let ident = ident.unbox(); let ident = ident.unbox();
IdentifierReference::new(ident.name, ident.span) IdentifierReference::new(ident.span, ident.name)
} }
_ => return Err(p.unexpected()), _ => return Err(p.unexpected()),
}; };

View file

@ -431,7 +431,7 @@ impl<'a> Parser<'a> {
let span = self.start_span(); let span = self.start_span();
let (ident_span, name) = self.parse_identifier_kind(Kind::This); let (ident_span, name) = self.parse_identifier_kind(Kind::This);
let type_annotation = self.parse_ts_type_annotation()?; let type_annotation = self.parse_ts_type_annotation()?;
let kind = self.ast.binding_identifier(BindingIdentifier::new(name, ident_span)); let kind = self.ast.binding_identifier(BindingIdentifier::new(ident_span, name));
let binding = self.ast.binding_pattern(kind, type_annotation, /* optional */ false); let binding = self.ast.binding_pattern(kind, type_annotation, /* optional */ false);
Ok(self.ast.formal_parameter( Ok(self.ast.formal_parameter(
self.end_span(span), self.end_span(span),

View file

@ -486,7 +486,7 @@ impl<'a> Parser<'a> {
pub(crate) fn parse_ts_type_name(&mut self) -> Result<TSTypeName<'a>> { pub(crate) fn parse_ts_type_name(&mut self) -> Result<TSTypeName<'a>> {
let span = self.start_span(); let span = self.start_span();
let ident = self.parse_identifier_name()?; let ident = self.parse_identifier_name()?;
let ident = IdentifierReference::new(ident.name, ident.span); let ident = IdentifierReference::new(ident.span, ident.name);
let mut left = TSTypeName::IdentifierReference(self.ast.alloc(ident)); let mut left = TSTypeName::IdentifierReference(self.ast.alloc(ident));
while self.eat(Kind::Dot) { while self.eat(Kind::Dot) {
let right = self.parse_identifier_name()?; let right = self.parse_identifier_name()?;

View file

@ -28,7 +28,7 @@ impl<'a> ExponentiationOperator<'a> {
let left = self.ast.move_expression(&mut binary_expression.left); let left = self.ast.move_expression(&mut binary_expression.left);
let right = self.ast.move_expression(&mut binary_expression.right); let right = self.ast.move_expression(&mut binary_expression.right);
// Math.pow // Math.pow
let ident_math = IdentifierReference::new("Math".into(), Span::default()); let ident_math = IdentifierReference::new(Span::default(), "Math".into());
let object = self.ast.identifier_expression(ident_math); let object = self.ast.identifier_expression(ident_math);
let property = IdentifierName::new(Span::default(), "pow".into()); let property = IdentifierName::new(Span::default(), "pow".into());
let callee = self.ast.static_member_expression(Span::default(), object, property, false); let callee = self.ast.static_member_expression(Span::default(), object, property, false);

View file

@ -21,7 +21,7 @@ impl<'a> OptionalCatchBinding<'a> {
if clause.param.is_some() { if clause.param.is_some() {
return; return;
} }
let binding_identifier = BindingIdentifier::new("unused".into(), Span::default()); let binding_identifier = BindingIdentifier::new(Span::default(), "unused".into());
let binding_pattern_kind = self.ast.binding_identifier(binding_identifier); let binding_pattern_kind = self.ast.binding_identifier(binding_identifier);
let binding_pattern = self.ast.binding_pattern(binding_pattern_kind, None, false); let binding_pattern = self.ast.binding_pattern(binding_pattern_kind, None, false);
clause.param = Some(binding_pattern); clause.param = Some(binding_pattern);