Merge 868301a into a5bc7dd

boa-dev · Feb 6, 2021 · c12c36a · c12c36a
2 parents a5bc7dd + 868301a
commit c12c36a
Show file tree

Hide file tree

Showing 11 changed files with 946 additions and 15 deletions.
diff --git a/boa/src/builtins/iterable/mod.rs b/boa/src/builtins/iterable/mod.rs
@@ -3,6 +3,7 @@ use crate::{
     builtins::ArrayIterator,
     builtins::ForInIterator,
     builtins::MapIterator,
+    builtins::SetIterator,
     object::{GcObject, ObjectInitializer},
     property::{Attribute, DataDescriptor},
     BoaProfiler, Context, Result, Value,
@@ -12,6 +13,7 @@ use crate::{
 pub struct IteratorPrototypes {
     iterator_prototype: GcObject,
     array_iterator: GcObject,
+    set_iterator: GcObject,
     string_iterator: GcObject,
     map_iterator: GcObject,
     for_in_iterator: GcObject,
@@ -25,6 +27,7 @@ impl IteratorPrototypes {
                 context,
                 iterator_prototype.clone().into(),
             ),
+            set_iterator: SetIterator::create_prototype(context, iterator_prototype.clone().into()),
             string_iterator: StringIterator::create_prototype(
                 context,
                 iterator_prototype.clone().into(),
@@ -48,6 +51,11 @@ impl IteratorPrototypes {
         self.iterator_prototype.clone()
     }
 
+    #[inline]
+    pub fn set_iterator(&self) -> GcObject {
+        self.set_iterator.clone()
+    }
+
     #[inline]
     pub fn string_iterator(&self) -> GcObject {
         self.string_iterator.clone()

diff --git a/boa/src/builtins/map/mod.rs b/boa/src/builtins/map/mod.rs
@@ -58,15 +58,14 @@ impl BuiltIn for Map {
             .method(Self::has, "has", 1)
             .method(Self::for_each, "forEach", 1)
             .method(Self::values, "values", 0)
-            .callable(false)
             .build();
 
         (Self::NAME, map_object.into(), Self::attribute())
     }
 }
 
 impl Map {
-    pub(crate) const LENGTH: usize = 1;
+    pub(crate) const LENGTH: usize = 0;
 
     /// Create a new map
     pub(crate) fn constructor(
@@ -75,7 +74,7 @@ impl Map {
         context: &mut Context,
     ) -> Result<Value> {
         if new_target.is_undefined() {
-            return context.throw_type_error("Map requires new");
+            return context.throw_type_error("Constructor Map requires 'new'");
         }
         let map_prototype = context
             .global_object()

diff --git a/boa/src/builtins/map/tests.rs b/boa/src/builtins/map/tests.rs
@@ -351,6 +351,6 @@ fn not_a_function() {
     ";
     assert_eq!(
         forward(&mut context, init),
-        "\"TypeError: function object is not callable\""
+        "\"TypeError: Constructor Map requires 'new'\""
     );
 }
diff --git a/boa/src/builtins/mod.rs b/boa/src/builtins/mod.rs
@@ -18,6 +18,7 @@ pub mod nan;
 pub mod number;
 pub mod object;
 pub mod regexp;
+pub mod set;
 pub mod string;
 pub mod symbol;
 pub mod undefined;
@@ -40,6 +41,8 @@ pub(crate) use self::{
     object::for_in_iterator::ForInIterator,
     object::Object as BuiltInObjectObject,
     regexp::RegExp,
+    set::set_iterator::SetIterator,
+    set::Set,
     string::String,
     symbol::Symbol,
     undefined::Undefined,
@@ -76,6 +79,7 @@ pub fn init(context: &mut Context) {
         Date::init,
         Map::init,
         Number::init,
+        Set::init,
         String::init,
         RegExp::init,
         Symbol::init,