Merge f6409f0 into 1c1132d

.vscode/launch.json

@@ -47,4 +47,4 @@
       "externalConsole": true
     },
   ]
-}
+}

boa/src/builtins/array/mod.rs

@@ -16,7 +16,7 @@ use super::function::{make_builtin_fn, make_constructor_fn};
 use crate::{
     builtins::{
         object::{ObjectData, INSTANCE_PROTOTYPE, PROTOTYPE},
-        property::Property,
+        property::{Attribute, Property},
         value::{same_value_zero, ResultValue, Value},
     },
     exec::Interpreter,
@@ -76,12 +76,10 @@ impl Array {
         }
 
         // Create length
-        let length = Property::new()
-            .value(Value::from(array_contents.len() as i32))
-            .writable(true)
-            .configurable(false)
-            .enumerable(false);
-
+        let length = Property::data_descriptor(
+            array_contents.len().into(),
+            Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+        );
         array_obj_ptr.set_property("length".to_string(), length);
 
         for (n, value) in array_contents.iter().enumerate() {
@@ -142,11 +140,10 @@ impl Array {
         }
 
         // finally create length property
-        let length = Property::new()
-            .value(Value::from(length))
-            .writable(true)
-            .configurable(false)
-            .enumerable(false);
+        let length = Property::data_descriptor(
+            length.into(),
+            Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+        );
 
         this.set_property("length".to_string(), length);
 

boa/src/builtins/function/mod.rs

@@ -15,7 +15,7 @@ use crate::{
     builtins::{
         array::Array,
         object::{Object, ObjectData, INSTANCE_PROTOTYPE, PROTOTYPE},
-        property::Property,
+        property::{Attribute, Property},
         value::{RcString, ResultValue, Value},
     },
     environment::function_environment_record::BindingStatus,
@@ -411,19 +411,19 @@ pub fn create_unmapped_arguments_object(arguments_list: &[Value]) -> Value {
     let mut obj = Object::default();
     obj.set_internal_slot("ParameterMap", Value::undefined());
     // Set length
-    let mut length = Property::default();
-    length = length.writable(true).value(Value::from(len));
+    let length = Property::data_descriptor(
+        len.into(),
+        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+    );
     // Define length as a property
     obj.define_own_property("length".to_string(), length);
     let mut index: usize = 0;
     while index < len {
         let val = arguments_list.get(index).expect("Could not get argument");
-        let mut prop = Property::default();
-        prop = prop
-            .value(val.clone())
-            .enumerable(true)
-            .writable(true)
-            .configurable(true);
+        let prop = Property::data_descriptor(
+            val.clone(),
+            Attribute::WRITABLE | Attribute::ENUMERABLE | Attribute::CONFIGURABLE,
+        );
 
         obj.properties_mut()
             .insert(RcString::from(index.to_string()), prop);
@@ -473,18 +473,16 @@ pub fn make_constructor_fn(
         global.get_field("Function").get_field(PROTOTYPE),
     );
 
-    let length = Property::new()
-        .value(Value::from(length))
-        .writable(false)
-        .configurable(false)
-        .enumerable(false);
+    let length = Property::data_descriptor(
+        length.into(),
+        Attribute::READONLY | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+    );
     constructor.insert_property("length", length);
 
-    let name = Property::new()
-        .value(Value::from(name))
-        .writable(false)
-        .configurable(false)
-        .enumerable(false);
+    let name = Property::data_descriptor(
+        name.into(),
+        Attribute::READONLY | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+    );
     constructor.insert_property("name", name);
 
     let constructor = Value::from(constructor);

boa/src/builtins/map/mod.rs

@@ -4,7 +4,7 @@ use super::function::{make_builtin_fn, make_constructor_fn};
 use crate::{
     builtins::{
         object::{ObjectData, INSTANCE_PROTOTYPE, PROTOTYPE},
-        property::Property,
+        property::{Attribute, Property},
         value::{ResultValue, Value},
     },
     exec::Interpreter,
@@ -26,11 +26,10 @@ impl Map {
 
     /// Helper function to set the size property.
     fn set_size(this: &Value, size: usize) {
-        let size = Property::new()
-            .value(Value::from(size))
-            .writable(false)
-            .configurable(false)
-            .enumerable(false);
+        let size = Property::data_descriptor(
+            size.into(),
+            Attribute::READONLY | Attribute::NON_ENUMERABLE | Attribute::PERMANENT,
+        );
 
         this.set_property("size".to_string(), size);
     }