[Merged by Bors] - Implement with and object environments

boa_ast/src/operations.rs

@@ -945,6 +945,7 @@ where
                 Statement::Try(node) => self.visit_try(node),
                 Statement::Continue(node) => self.visit_continue(node),
                 Statement::Break(node) => self.visit_break(node),
+                Statement::With(with) => self.visit_with(with),
             }
         }
 

boa_ast/src/statement/mod.rs

@@ -14,6 +14,7 @@ mod r#return;
 mod switch;
 mod throw;
 mod r#try;
+mod with;
 
 pub mod iteration;
 
@@ -26,6 +27,7 @@ pub use self::{
     r#try::{Catch, ErrorHandler, Finally, Try},
     switch::{Case, Switch},
     throw::Throw,
+    with::With,
 };
 use core::ops::ControlFlow;
 
@@ -92,7 +94,6 @@ pub enum Statement {
     /// See [`Return`].
     Return(Return),
 
-    // TODO: Possibly add `with` statements.
     /// See [`Labelled`].
     Labelled(Labelled),
 
@@ -101,6 +102,9 @@ pub enum Statement {
 
     /// See [`Try`].
     Try(Try),
+
+    /// See [`With`].
+    With(With),
 }
 
 impl Statement {
@@ -129,6 +133,7 @@ impl Statement {
             Self::Labelled(labelled) => return labelled.to_interned_string(interner),
             Self::Throw(throw) => throw.to_interned_string(interner),
             Self::Try(try_catch) => return try_catch.to_indented_string(interner, indentation),
+            Self::With(with) => return with.to_interned_string(interner),
         };
         s.push(';');
         s
@@ -208,6 +213,7 @@ impl VisitWith for Statement {
             Self::Labelled(l) => visitor.visit_labelled(l),
             Self::Throw(th) => visitor.visit_throw(th),
             Self::Try(tr) => visitor.visit_try(tr),
+            Self::With(with) => visitor.visit_with(with),
         }
     }
 
@@ -236,6 +242,7 @@ impl VisitWith for Statement {
             Self::Labelled(l) => visitor.visit_labelled_mut(l),
             Self::Throw(th) => visitor.visit_throw_mut(th),
             Self::Try(tr) => visitor.visit_try_mut(tr),
+            Self::With(with) => visitor.visit_with_mut(with),
         }
     }
 }

boa_ast/src/statement/with.rs

@@ -0,0 +1,81 @@
+use crate::{
+    expression::Expression,
+    statement::Statement,
+    try_break,
+    visitor::{VisitWith, Visitor, VisitorMut},
+};
+use boa_interner::{Interner, ToInternedString};
+use core::ops::ControlFlow;
+
+/// The `with` statement extends the scope chain for a statement.
+///
+/// More information:
+///  - [ECMAScript reference][spec]
+///  - [MDN documentation][mdn]
+///
+/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/with
+/// [spec]: https://tc39.es/ecma262/#prod-WithStatement
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[derive(Clone, Debug, PartialEq)]
+pub struct With {
+    expression: Expression,
+    statement: Box<Statement>,
+}
+
+impl With {
+    /// Creates a `With` AST node.
+    #[must_use]
+    pub fn new(expression: Expression, statement: Statement) -> Self {
+        Self {
+            expression,
+            statement: Box::new(statement),
+        }
+    }
+
+    /// Gets the expression value of this `With` statement.
+    #[must_use]
+    pub const fn expression(&self) -> &Expression {
+        &self.expression
+    }
+
+    /// Gets the statement value of this `With` statement.
+    #[must_use]
+    pub const fn statement(&self) -> &Statement {
+        &self.statement
+    }
+}
+
+impl From<With> for Statement {
+    fn from(with: With) -> Self {
+        Self::With(with)
+    }
+}
+
+impl ToInternedString for With {
+    fn to_interned_string(&self, interner: &Interner) -> String {
+        format!(
+            "with ({}) {{{}}}",
+            self.expression.to_interned_string(interner),
+            self.statement.to_interned_string(interner)
+        )
+    }
+}
+
+impl VisitWith for With {
+    fn visit_with<'a, V>(&'a self, visitor: &mut V) -> ControlFlow<V::BreakTy>
+    where
+        V: Visitor<'a>,
+    {
+        try_break!(visitor.visit_expression(&self.expression));
+        visitor.visit_statement(&self.statement)
+    }
+
+    fn visit_with_mut<'a, V>(&'a mut self, visitor: &mut V) -> ControlFlow<V::BreakTy>
+    where
+        V: VisitorMut<'a>,
+    {
+        try_break!(visitor.visit_expression_mut(&mut self.expression));
+        visitor.visit_statement_mut(&mut self.statement)
+    }
+}

boa_ast/src/visitor.rs

@@ -36,7 +36,7 @@ use crate::{
             IterableLoopInitializer, WhileLoop,
         },
         Block, Case, Catch, Finally, If, Labelled, LabelledItem, Return, Statement, Switch, Throw,
-        Try,
+        Try, With,
     },
     ModuleItem, ModuleItemList, StatementList, StatementListItem,
 };
@@ -241,6 +241,7 @@ pub trait Visitor<'ast>: Sized {
     define_visit!(visit_labelled, Labelled);
     define_visit!(visit_throw, Throw);
     define_visit!(visit_try, Try);
+    define_visit!(visit_with, With);
     define_visit!(visit_identifier, Identifier);
     define_visit!(visit_formal_parameter_list, FormalParameterList);
     define_visit!(visit_class_element, ClassElement);
@@ -434,6 +435,7 @@ pub trait VisitorMut<'ast>: Sized {
     define_visit_mut!(visit_labelled_mut, Labelled);
     define_visit_mut!(visit_throw_mut, Throw);
     define_visit_mut!(visit_try_mut, Try);
+    define_visit_mut!(visit_with_mut, With);
     define_visit_mut!(visit_identifier_mut, Identifier);
     define_visit_mut!(visit_formal_parameter_list_mut, FormalParameterList);
     define_visit_mut!(visit_class_element_mut, ClassElement);

boa_engine/src/builtins/eval/mod.rs

@@ -10,13 +10,12 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/eval
 
 use crate::{
-    builtins::BuiltInObject, context::intrinsics::Intrinsics, environments::DeclarativeEnvironment,
+    builtins::BuiltInObject, context::intrinsics::Intrinsics, environments::Environment,
     error::JsNativeError, object::JsObject, Context, JsArgs, JsResult, JsString, JsValue,
 };
 use boa_ast::operations::{
     contains, contains_arguments, top_level_var_declared_names, ContainsSymbol,
 };
-use boa_gc::Gc;
 use boa_parser::{Parser, Source};
 use boa_profiler::Profiler;
 
@@ -85,7 +84,7 @@ impl Eval {
         #[derive(Debug)]
         enum EnvStackAction {
             Truncate(usize),
-            Restore(Vec<Gc<DeclarativeEnvironment>>),
+            Restore(Vec<Environment>),
         }
 
         /// Restores the environment after calling `eval` or after throwing an error.

boa_engine/src/bytecompiler/statement/mod.rs

@@ -10,6 +10,7 @@ mod labelled;
 mod r#loop;
 mod switch;
 mod r#try;
+mod with;
 
 impl ByteCompiler<'_, '_> {
     /// Compiles a [`Statement`] `boa_ast` node.
@@ -56,8 +57,9 @@ impl ByteCompiler<'_, '_> {
                 self.emit(Opcode::Return, &[]);
             }
             Statement::Try(t) => self.compile_try(t, use_expr, configurable_globals),
-            Statement::Empty => {}
             Statement::Expression(expr) => self.compile_expr(expr, use_expr),
+            Statement::With(with) => self.compile_with(with, configurable_globals),
+            Statement::Empty => {}
         }
     }
 }

boa_engine/src/bytecompiler/statement/with.rs

@@ -0,0 +1,14 @@
+use crate::{bytecompiler::ByteCompiler, vm::Opcode};
+use boa_ast::statement::With;
+
+impl ByteCompiler<'_, '_> {
+    /// Compile a [`With`] `boa_ast` node
+    pub(crate) fn compile_with(&mut self, with: &With, configurable_globals: bool) {
+        self.compile_expr(with.expression(), true);
+        self.context.push_compile_time_environment(false);
+        self.emit_opcode(Opcode::PushObjectEnvironment);
+        self.compile_stmt(with.statement(), false, configurable_globals);
+        self.context.pop_compile_time_environment();
+        self.emit_opcode(Opcode::PopEnvironment);
+    }
+}

boa_engine/src/environments/mod.rs

@@ -30,7 +30,8 @@ mod runtime;
 pub(crate) use {
     compile::CompileTimeEnvironment,
     runtime::{
-        BindingLocator, DeclarativeEnvironment, DeclarativeEnvironmentStack, EnvironmentSlots,
+        BindingLocator, DeclarativeEnvironment, DeclarativeEnvironmentStack, Environment,
+        EnvironmentSlots,
     },
 };