Refactor internal methods and make some builtins spec compliant (#1422)

boa-dev · Jul 22, 2021 · f6d5733 · f6d5733
1 parent 65473b5
commit f6d5733
Show file tree

Hide file tree

Showing 37 changed files with 1,129 additions and 680 deletions.
diff --git a/boa/src/builtins/array/array_iterator.rs b/boa/src/builtins/array/array_iterator.rs
@@ -123,7 +123,7 @@ impl ArrayIterator {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         // Create prototype
-        let mut array_iterator = context.construct_object();
+        let array_iterator = context.construct_object();
         make_builtin_fn(Self::next, "next", &array_iterator, 0, context);
         array_iterator.set_prototype_instance(iterator_prototype);
 

diff --git a/boa/src/builtins/array/mod.rs b/boa/src/builtins/array/mod.rs
diff --git a/boa/src/builtins/array/tests.rs b/boa/src/builtins/array/tests.rs
@@ -711,7 +711,7 @@ fn fill() {
 
     assert_eq!(
         forward(&mut context, "a.fill().join()"),
-        String::from("\"undefined,undefined,undefined\"")
+        String::from("\",,\"")
     );
 
     // test object reference

diff --git a/boa/src/builtins/boolean/mod.rs b/boa/src/builtins/boolean/mod.rs
@@ -69,7 +69,7 @@ impl Boolean {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })

diff --git a/boa/src/builtins/console/mod.rs b/boa/src/builtins/console/mod.rs
@@ -35,14 +35,6 @@ pub enum LogMessage {
     Error(String),
 }
 
-/// Helper function that returns the argument at a specified index.
-fn get_arg_at_index<'a, T>(args: &'a [Value], index: usize) -> Option<T>
-where
-    T: From<&'a Value> + Default,
-{
-    args.get(index).map(|s| T::from(s))
-}
-
 /// Helper function for logging messages.
 pub(crate) fn logger(msg: LogMessage, console_state: &Console) {
     let indent = 2 * console_state.groups.len();
@@ -193,7 +185,7 @@ impl Console {
     /// [spec]: https://console.spec.whatwg.org/#assert
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/console/assert
     pub(crate) fn assert(_: &Value, args: &[Value], context: &mut Context) -> Result<Value> {
-        let assertion = get_arg_at_index::<bool>(args, 0).unwrap_or_default();
+        let assertion = args.get(0).map(Value::to_boolean).unwrap_or(false);
 
         if !assertion {
             let mut args: Vec<Value> = args.iter().skip(1).cloned().collect();

diff --git a/boa/src/builtins/date/mod.rs b/boa/src/builtins/date/mod.rs
@@ -376,13 +376,13 @@ impl Date {
             let prototype = new_target
                 .as_object()
                 .and_then(|obj| {
-                    obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                    obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                         .map(|o| o.as_object())
                         .transpose()
                 })
                 .transpose()?
                 .unwrap_or_else(|| context.standard_objects().object_object().prototype());
-            let mut obj = context.construct_object();
+            let obj = context.construct_object();
             obj.set_prototype_instance(prototype.into());
             let this = obj.into();
             if args.is_empty() {

diff --git a/boa/src/builtins/error/eval.rs b/boa/src/builtins/error/eval.rs
@@ -65,13 +65,13 @@ impl EvalError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/mod.rs b/boa/src/builtins/error/mod.rs
@@ -81,13 +81,13 @@ impl Error {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/range.rs b/boa/src/builtins/error/range.rs
@@ -62,13 +62,13 @@ impl RangeError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/reference.rs b/boa/src/builtins/error/reference.rs
@@ -61,13 +61,13 @@ impl ReferenceError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/syntax.rs b/boa/src/builtins/error/syntax.rs
@@ -64,13 +64,13 @@ impl SyntaxError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/type.rs b/boa/src/builtins/error/type.rs
@@ -67,13 +67,13 @@ impl TypeError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/error/uri.rs b/boa/src/builtins/error/uri.rs
@@ -63,13 +63,13 @@ impl UriError {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or_else(|| context.standard_objects().error_object().prototype());
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
         if let Some(message) = args.get(0) {

diff --git a/boa/src/builtins/function/mod.rs b/boa/src/builtins/function/mod.rs
@@ -176,14 +176,14 @@ impl Function {
 /// <https://tc39.es/ecma262/#sec-createunmappedargumentsobject>
 pub fn create_unmapped_arguments_object(arguments_list: &[Value]) -> Value {
     let len = arguments_list.len();
-    let mut obj = GcObject::new(Object::default());
+    let obj = GcObject::new(Object::default());
     // Set length
     let length = DataDescriptor::new(
         len,
         Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
     );
     // Define length as a property
-    obj.ordinary_define_own_property("length", length.into());
+    obj.ordinary_define_own_property("length".into(), length.into());
     let mut index: usize = 0;
     while index < len {
         let val = arguments_list.get(index).expect("Could not get argument");
@@ -258,7 +258,7 @@ impl BuiltInFunctionObject {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })

diff --git a/boa/src/builtins/json/mod.rs b/boa/src/builtins/json/mod.rs
@@ -197,7 +197,7 @@ impl Json {
                 .map(|obj| {
                     let object_to_return = Value::object(Object::default());
                     for key in obj.borrow().keys() {
-                        let val = obj.get(&key, obj.clone().into(), context)?;
+                        let val = obj.__get__(&key, obj.clone().into(), context)?;
                         let this_arg = object.clone();
                         object_to_return.set_property(
                             key.to_owned(),

diff --git a/boa/src/builtins/map/map_iterator.rs b/boa/src/builtins/map/map_iterator.rs
@@ -149,7 +149,7 @@ impl MapIterator {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         // Create prototype
-        let mut map_iterator = context.construct_object();
+        let map_iterator = context.construct_object();
         make_builtin_fn(Self::next, "next", &map_iterator, 0, context);
         map_iterator.set_prototype_instance(iterator_prototype);
 

diff --git a/boa/src/builtins/map/mod.rs b/boa/src/builtins/map/mod.rs
@@ -118,14 +118,14 @@ impl Map {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })
             .transpose()?
             .unwrap_or(map_prototype);
 
-        let mut obj = context.construct_object();
+        let obj = context.construct_object();
         obj.set_prototype_instance(prototype.into());
         let this = Value::from(obj);
 

diff --git a/boa/src/builtins/number/mod.rs b/boa/src/builtins/number/mod.rs
@@ -169,7 +169,7 @@ impl Number {
         let prototype = new_target
             .as_object()
             .and_then(|obj| {
-                obj.get(&PROTOTYPE.into(), obj.clone().into(), context)
+                obj.__get__(&PROTOTYPE.into(), obj.clone().into(), context)
                     .map(|o| o.as_object())
                     .transpose()
             })

diff --git a/boa/src/builtins/object/for_in_iterator.rs b/boa/src/builtins/object/for_in_iterator.rs
@@ -87,7 +87,7 @@ impl ForInIterator {
                     while let Some(r) = iterator.remaining_keys.pop_front() {
                         if !iterator.visited_keys.contains(&r) {
                             if let Some(desc) =
-                                object.get_own_property(&PropertyKey::from(r.clone()))
+                                object.__get_own_property__(&PropertyKey::from(r.clone()))
                             {
                                 iterator.visited_keys.insert(r.clone());
                                 if desc.enumerable() {
@@ -129,7 +129,7 @@ impl ForInIterator {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         // Create prototype
-        let mut for_in_iterator = context.construct_object();
+        let for_in_iterator = context.construct_object();
         make_builtin_fn(Self::next, "next", &for_in_iterator, 0, context);
         for_in_iterator.set_prototype_instance(iterator_prototype);