[Merged by Bors] - Implement async arrow functions

boa_ast/src/expression/mod.rs

@@ -19,8 +19,8 @@ use self::{
 };
 
 use super::{
-    function::FormalParameterList,
     function::{ArrowFunction, AsyncFunction, AsyncGenerator, Class, Function, Generator},
+    function::{AsyncArrowFunction, FormalParameterList},
     Statement,
 };
 
@@ -88,6 +88,9 @@ pub enum Expression {
     /// See [`ArrowFunction`].
     ArrowFunction(ArrowFunction),
 
+    /// See [`AsyncArrowFunction`].
+    AsyncArrowFunction(AsyncArrowFunction),
+
     /// See [`Generator`].
     Generator(Generator),
 
@@ -168,6 +171,7 @@ impl Expression {
             Self::ObjectLiteral(o) => o.to_indented_string(interner, indentation),
             Self::Spread(sp) => sp.to_interned_string(interner),
             Self::Function(f) => f.to_indented_string(interner, indentation),
+            Self::AsyncArrowFunction(f) => f.to_indented_string(interner, indentation),
             Self::ArrowFunction(arrf) => arrf.to_indented_string(interner, indentation),
             Self::Class(cl) => cl.to_indented_string(interner, indentation),
             Self::Generator(gen) => gen.to_indented_string(interner, indentation),
@@ -219,6 +223,7 @@ impl VisitWith for Expression {
             Expression::Spread(sp) => visitor.visit_spread(sp),
             Expression::Function(f) => visitor.visit_function(f),
             Expression::ArrowFunction(af) => visitor.visit_arrow_function(af),
+            Expression::AsyncArrowFunction(af) => visitor.visit_async_arrow_function(af),
             Expression::Generator(g) => visitor.visit_generator(g),
             Expression::AsyncFunction(af) => visitor.visit_async_function(af),
             Expression::AsyncGenerator(ag) => visitor.visit_async_generator(ag),
@@ -256,6 +261,7 @@ impl VisitWith for Expression {
             Expression::Spread(sp) => visitor.visit_spread_mut(sp),
             Expression::Function(f) => visitor.visit_function_mut(f),
             Expression::ArrowFunction(af) => visitor.visit_arrow_function_mut(af),
+            Expression::AsyncArrowFunction(af) => visitor.visit_async_arrow_function_mut(af),
             Expression::Generator(g) => visitor.visit_generator_mut(g),
             Expression::AsyncFunction(af) => visitor.visit_async_function_mut(af),
             Expression::AsyncGenerator(ag) => visitor.visit_async_generator_mut(ag),

boa_ast/src/function/async_arrow_function.rs

@@ -0,0 +1,118 @@
+use std::ops::ControlFlow;
+
+use super::FormalParameterList;
+use crate::try_break;
+use crate::visitor::{VisitWith, Visitor, VisitorMut};
+use crate::{
+    expression::{Expression, Identifier},
+    join_nodes, StatementList,
+};
+use boa_interner::{Interner, ToIndentedString};
+
+/// An async arrow function expression, as defined by the [spec].
+///
+/// An [async arrow function][mdn] expression is a syntactically compact alternative to a regular function
+/// expression. Arrow function expressions are ill suited as methods, and they cannot be used as
+/// constructors. Arrow functions cannot be used as constructors and will throw an error when
+/// used with new.
+///
+/// [spec]: https://tc39.es/ecma262/#prod-AsyncArrowFunction
+/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+pub struct AsyncArrowFunction {
+    name: Option<Identifier>,
+    parameters: FormalParameterList,
+    body: StatementList,
+}
+
+impl AsyncArrowFunction {
+    /// Creates a new `AsyncArrowFunction` AST Expression.
+    #[inline]
+    #[must_use]
+    pub fn new(
+        name: Option<Identifier>,
+        parameters: FormalParameterList,
+        body: StatementList,
+    ) -> Self {
+        Self {
+            name,
+            parameters,
+            body,
+        }
+    }
+
+    /// Gets the name of the function declaration.
+    #[inline]
+    #[must_use]
+    pub fn name(&self) -> Option<Identifier> {
+        self.name
+    }
+
+    /// Sets the name of the function declaration.
+    //#[inline]
+    //#[must_use]
+    //pub fn set_name(&mut self, name: Option<Identifier>) {
+    //    self.name = name;
+    //}
+
+    /// Gets the list of parameters of the arrow function.
+    #[inline]
+    #[must_use]
+    pub fn parameters(&self) -> &FormalParameterList {
+        &self.parameters
+    }
+
+    /// Gets the body of the arrow function.
+    #[inline]
+    #[must_use]
+    pub fn body(&self) -> &StatementList {
+        &self.body
+    }
+}
+
+impl ToIndentedString for AsyncArrowFunction {
+    fn to_indented_string(&self, interner: &Interner, indentation: usize) -> String {
+        let mut buf = format!("async ({}", join_nodes(interner, self.parameters.as_ref()));
+        if self.body().statements().is_empty() {
+            buf.push_str(") => {}");
+        } else {
+            buf.push_str(&format!(
+                ") => {{\n{}{}}}",
+                self.body.to_indented_string(interner, indentation + 1),
+                "    ".repeat(indentation)
+            ));
+        }
+        buf
+    }
+}
+
+impl From<AsyncArrowFunction> for Expression {
+    fn from(decl: AsyncArrowFunction) -> Self {
+        Self::AsyncArrowFunction(decl)
+    }
+}
+
+impl VisitWith for AsyncArrowFunction {
+    fn visit_with<'a, V>(&'a self, visitor: &mut V) -> ControlFlow<V::BreakTy>
+    where
+        V: Visitor<'a>,
+    {
+        if let Some(ident) = &self.name {
+            try_break!(visitor.visit_identifier(ident));
+        }
+        try_break!(visitor.visit_formal_parameter_list(&self.parameters));
+        visitor.visit_statement_list(&self.body)
+    }
+
+    fn visit_with_mut<'a, V>(&'a mut self, visitor: &mut V) -> ControlFlow<V::BreakTy>
+    where
+        V: VisitorMut<'a>,
+    {
+        if let Some(ident) = &mut self.name {
+            try_break!(visitor.visit_identifier_mut(ident));
+        }
+        try_break!(visitor.visit_formal_parameter_list_mut(&mut self.parameters));
+        visitor.visit_statement_list_mut(&mut self.body)
+    }
+}

boa_ast/src/function/async_function.rs

@@ -25,6 +25,7 @@ pub struct AsyncFunction {
     name: Option<Identifier>,
     parameters: FormalParameterList,
     body: StatementList,
+    has_binding_identifier: bool,
 }
 
 impl AsyncFunction {
@@ -35,11 +36,13 @@ impl AsyncFunction {
         name: Option<Identifier>,
         parameters: FormalParameterList,
         body: StatementList,
+        has_binding_identifier: bool,
     ) -> Self {
         Self {
             name,
             parameters,
             body,
+            has_binding_identifier,
         }
     }
 
@@ -63,6 +66,13 @@ impl AsyncFunction {
     pub fn body(&self) -> &StatementList {
         &self.body
     }
+
+    /// Returns whether the function expression has a binding identifier.
+    #[inline]
+    #[must_use]
+    pub fn has_binding_identifier(&self) -> bool {
+        self.has_binding_identifier
+    }
 }
 
 impl ToIndentedString for AsyncFunction {

boa_ast/src/function/async_generator.rs

@@ -24,6 +24,7 @@ pub struct AsyncGenerator {
     name: Option<Identifier>,
     parameters: FormalParameterList,
     body: StatementList,
+    has_binding_identifier: bool,
 }
 
 impl AsyncGenerator {
@@ -34,11 +35,13 @@ impl AsyncGenerator {
         name: Option<Identifier>,
         parameters: FormalParameterList,
         body: StatementList,
+        has_binding_identifier: bool,
     ) -> Self {
         Self {
             name,
             parameters,
             body,
+            has_binding_identifier,
         }
     }
 
@@ -62,6 +65,13 @@ impl AsyncGenerator {
     pub fn body(&self) -> &StatementList {
         &self.body
     }
+
+    /// Returns whether the function expression has a binding identifier.
+    #[inline]
+    #[must_use]
+    pub fn has_binding_identifier(&self) -> bool {
+        self.has_binding_identifier
+    }
 }
 
 impl ToIndentedString for AsyncGenerator {

boa_ast/src/function/generator.rs

@@ -26,6 +26,7 @@ pub struct Generator {
     name: Option<Identifier>,
     parameters: FormalParameterList,
     body: StatementList,
+    has_binding_identifier: bool,
 }
 
 impl Generator {
@@ -36,11 +37,13 @@ impl Generator {
         name: Option<Identifier>,
         parameters: FormalParameterList,
         body: StatementList,
+        has_binding_identifier: bool,
     ) -> Self {
         Self {
             name,
             parameters,
             body,
+            has_binding_identifier,
         }
     }
 
@@ -64,6 +67,13 @@ impl Generator {
     pub fn body(&self) -> &StatementList {
         &self.body
     }
+
+    /// Returns whether the function expression has a binding identifier.
+    #[inline]
+    #[must_use]
+    pub fn has_binding_identifier(&self) -> bool {
+        self.has_binding_identifier
+    }
 }
 
 impl ToIndentedString for Generator {

boa_ast/src/function/mod.rs

@@ -5,12 +5,13 @@
 //!
 //! - [`Function`]s.
 //! - [`ArrowFunction`]s.
+//! - [`AsyncArrowFunction`]s.
 //! - [`Generator`]s.
 //! - [`AsyncFunction`]s.
 //! - [`AsyncGenerator`]s.
 //!
 //! All of them can be declared in either [declaration][decl] form or [expression][expr] form,
-//! except from `ArrowFunction`s, which can only be declared in expression form.
+//! except from `ArrowFunction`s and `AsyncArrowFunction`s, which can only be declared in expression form.
 //!
 //! This module also contains [`Class`]es, which are templates for creating objects. Classes
 //! can also be declared in either declaration or expression form.
@@ -21,13 +22,15 @@
 //! [expr]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/function
 
 mod arrow_function;
+mod async_arrow_function;
 mod async_function;
 mod async_generator;
 mod class;
 mod generator;
 mod parameters;
 
 pub use arrow_function::ArrowFunction;
+pub use async_arrow_function::AsyncArrowFunction;
 pub use async_function::AsyncFunction;
 pub use async_generator::AsyncGenerator;
 pub use class::{Class, ClassElement};
@@ -59,10 +62,11 @@ pub struct Function {
     name: Option<Identifier>,
     parameters: FormalParameterList,
     body: StatementList,
+    has_binding_identifier: bool,
 }
 
 impl Function {
-    /// Creates a new function expression
+    /// Creates a new function expression.
     #[inline]
     #[must_use]
     pub fn new(
@@ -74,6 +78,24 @@ impl Function {
             name,
             parameters,
             body,
+            has_binding_identifier: false,
+        }
+    }
+
+    /// Creates a new function expression with an expression binding identifier.
+    #[inline]
+    #[must_use]
+    pub fn new_with_binding_identifier(
+        name: Option<Identifier>,
+        parameters: FormalParameterList,
+        body: StatementList,
+        has_binding_identifier: bool,
+    ) -> Self {
+        Self {
+            name,
+            parameters,
+            body,
+            has_binding_identifier,
         }
     }
 
@@ -97,6 +119,13 @@ impl Function {
     pub fn body(&self) -> &StatementList {
         &self.body
     }
+
+    /// Returns whether the function expression has a binding identifier.
+    #[inline]
+    #[must_use]
+    pub fn has_binding_identifier(&self) -> bool {
+        self.has_binding_identifier
+    }
 }
 
 impl ToIndentedString for Function {

boa_ast/src/operations.rs

@@ -9,7 +9,8 @@ use boa_interner::Sym;
 use crate::{
     expression::{access::SuperPropertyAccess, Await, Identifier, SuperCall, Yield},
     function::{
-        ArrowFunction, AsyncFunction, AsyncGenerator, Class, ClassElement, Function, Generator,
+        ArrowFunction, AsyncArrowFunction, AsyncFunction, AsyncGenerator, Class, ClassElement,
+        Function, Generator,
     },
     property::{MethodDefinition, PropertyDefinition},
     visitor::{VisitWith, Visitor},
@@ -133,6 +134,25 @@ where
             node.visit_with(self)
         }
 
+        fn visit_async_arrow_function(
+            &mut self,
+            node: &'ast AsyncArrowFunction,
+        ) -> ControlFlow<Self::BreakTy> {
+            if ![
+                ContainsSymbol::NewTarget,
+                ContainsSymbol::SuperProperty,
+                ContainsSymbol::SuperCall,
+                ContainsSymbol::Super,
+                ContainsSymbol::This,
+            ]
+            .contains(&self.0)
+            {
+                return ControlFlow::Continue(());
+            }
+
+            node.visit_with(self)
+        }
+
         fn visit_super_property_access(
             &mut self,
             node: &'ast SuperPropertyAccess,