Replace calls to get/unwrap_or with get_or_undefined

boa-dev · Aug 27, 2021 · 7984a92 · 7984a92
1 parent 10e8052
commit 7984a92
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 146 deletions.
diff --git a/boa/src/builtins/array/mod.rs b/boa/src/builtins/array/mod.rs
@@ -25,6 +25,8 @@ use crate::{
 };
 use std::cmp::{max, min, Ordering};
 
+use super::JsArgs;
+
 /// JavaScript `Array` built-in implementation.
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct Array;
@@ -687,7 +689,7 @@ impl Array {
                 // i. Let kValue be ? Get(O, Pk).
                 let k_value = o.get(pk, context)?;
                 // ii. Perform ? Call(callbackfn, thisArg, « kValue, 𝔽(k), O »).
-                let this_arg = args.get(1).cloned().unwrap_or_else(JsValue::undefined);
+                let this_arg = args.get_or_undefined(1);
                 callback.call(&this_arg, &[k_value, k.into(), o.clone().into()], context)?;
             }
             // d. Set k to k + 1.
@@ -1022,7 +1024,7 @@ impl Array {
             return context.throw_type_error("Array.prototype.every: callback is not callable");
         };
 
-        let this_arg = args.get(1).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(1);
 
         // 4. Let k be 0.
         // 5. Repeat, while k < len,
@@ -1070,15 +1072,15 @@ impl Array {
         // 2. Let len be ? LengthOfArrayLike(O).
         let len = o.length_of_array_like(context)?;
         // 3. If IsCallable(callbackfn) is false, throw a TypeError exception.
-        let callback = args.get(0).cloned().unwrap_or_default();
+        let callback = args.get_or_undefined(0);
         if !callback.is_function() {
             return context.throw_type_error("Array.prototype.map: Callbackfn is not callable");
         }
 
         // 4. Let A be ? ArraySpeciesCreate(O, len).
         let a = Self::array_species_create(&o, len, context)?;
 
-        let this_arg = args.get(1).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(1);
 
         // 5. Let k be 0.
         // 6. Repeat, while k < len,
@@ -1156,7 +1158,7 @@ impl Array {
             }
         };
 
-        let search_element = args.get(0).cloned().unwrap_or_default();
+        let search_element = args.get_or_undefined(0);
 
         // 10. Repeat, while k < len,
         while k < len {
@@ -1232,7 +1234,7 @@ impl Array {
             IntegerOrInfinity::Integer(n) => len + n,
         };
 
-        let search_element = args.get(0).cloned().unwrap_or_default();
+        let search_element = args.get_or_undefined(0);
 
         // 8. Repeat, while k ≥ 0,
         while k >= 0 {
@@ -1286,7 +1288,7 @@ impl Array {
             }
         };
 
-        let this_arg = args.get(1).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(1);
 
         // 4. Let k be 0.
         let mut k = 0;
@@ -1347,7 +1349,7 @@ impl Array {
             }
         };
 
-        let this_arg = args.get(1).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(1);
 
         // 4. Let k be 0.
         let mut k = 0;
@@ -1451,7 +1453,7 @@ impl Array {
         let source_len = o.length_of_array_like(context)?;
 
         // 3. If ! IsCallable(mapperFunction) is false, throw a TypeError exception.
-        let mapper_function = args.get(0).cloned().unwrap_or_default();
+        let mapper_function = args.get_or_undefined(0);
         if !mapper_function.is_function() {
             return context.throw_type_error("flatMap mapper function is not callable");
         }
@@ -1467,7 +1469,7 @@ impl Array {
             0,
             1,
             Some(mapper_function.as_object().unwrap()),
-            &args.get(1).cloned().unwrap_or_default(),
+            &args.get_or_undefined(1),
             context,
         )?;
 
@@ -1622,7 +1624,7 @@ impl Array {
         // 10. Else, let final be min(relativeEnd, len).
         let final_ = Self::get_relative_end(context, args.get(2), len)?;
 
-        let value = args.get(0).cloned().unwrap_or_default();
+        let value = args.get_or_undefined(0);
 
         // 11. Repeat, while k < final,
         while k < final_ {
@@ -1693,7 +1695,7 @@ impl Array {
             }
         }
 
-        let search_element = args.get(0).cloned().unwrap_or_default();
+        let search_element = args.get_or_undefined(0);
 
         // 10. Repeat, while k < len,
         while k < len {
@@ -1813,7 +1815,7 @@ impl Array {
                     "missing argument 0 when calling function Array.prototype.filter",
                 )
             })?;
-        let this_val = args.get(1).cloned().unwrap_or_else(JsValue::undefined);
+        let this_val = args.get_or_undefined(1);
 
         if !callback.is_callable() {
             return context.throw_type_error("the callback must be callable");
@@ -1899,7 +1901,7 @@ impl Array {
                 // i. Let kValue be ? Get(O, Pk).
                 let k_value = o.get(k, context)?;
                 // ii. Let testResult be ! ToBoolean(? Call(callbackfn, thisArg, « kValue, 𝔽(k), O »)).
-                let this_arg = args.get(1).cloned().unwrap_or_default();
+                let this_arg = args.get_or_undefined(1);
                 let test_result = callback
                     .call(&this_arg, &[k_value, k.into(), o.clone().into()], context)?
                     .to_boolean();

diff --git a/boa/src/builtins/bigint/mod.rs b/boa/src/builtins/bigint/mod.rs
@@ -13,8 +13,12 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt
 
 use crate::{
-    builtins::BuiltIn, object::ConstructorBuilder, property::Attribute, symbol::WellKnownSymbols,
-    value::IntegerOrInfinity, BoaProfiler, Context, JsBigInt, JsResult, JsValue,
+    builtins::{BuiltIn, JsArgs},
+    object::ConstructorBuilder,
+    property::Attribute,
+    symbol::WellKnownSymbols,
+    value::IntegerOrInfinity,
+    BoaProfiler, Context, JsBigInt, JsResult, JsValue,
 };
 #[cfg(test)]
 mod tests;
@@ -131,7 +135,7 @@ impl BigInt {
         // 1. Let x be ? thisBigIntValue(this value).
         let x = Self::this_bigint_value(this, context)?;
 
-        let radix = args.get(0).cloned().unwrap_or_default();
+        let radix = args.get_or_undefined(0);
 
         // 2. If radix is undefined, let radixMV be 10.
         let radix_mv = if radix.is_undefined() {
@@ -234,10 +238,8 @@ impl BigInt {
     fn calculate_as_uint_n(args: &[JsValue], context: &mut Context) -> JsResult<(JsBigInt, u32)> {
         use std::convert::TryFrom;
 
-        let undefined_value = JsValue::undefined();
-
-        let bits_arg = args.get(0).unwrap_or(&undefined_value);
-        let bigint_arg = args.get(1).unwrap_or(&undefined_value);
+        let bits_arg = args.get_or_undefined(0);
+        let bigint_arg = args.get_or_undefined(1);
 
         let bits = bits_arg.to_index(context)?;
         let bits = u32::try_from(bits).unwrap_or(u32::MAX);

diff --git a/boa/src/builtins/console/mod.rs b/boa/src/builtins/console/mod.rs
@@ -17,7 +17,7 @@
 mod tests;
 
 use crate::{
-    builtins::BuiltIn,
+    builtins::{BuiltIn, JsArgs},
     object::ObjectInitializer,
     property::Attribute,
     value::{display::display_obj, JsValue},
@@ -90,7 +90,7 @@ pub fn formatter(data: &[JsValue], context: &mut Context) -> JsResult<String> {
                         }
                         /* object, FIXME: how to render this properly? */
                         'o' | 'O' => {
-                            let arg = data.get(arg_index).cloned().unwrap_or_default();
+                            let arg = data.get_or_undefined(arg_index);
                             formatted.push_str(&format!("{}", arg.display()));
                             arg_index += 1
                         }
@@ -564,9 +564,8 @@ impl Console {
     /// [spec]: https://console.spec.whatwg.org/#dir
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/console/dir
     pub(crate) fn dir(_: &JsValue, args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        let undefined = JsValue::undefined();
         logger(
-            LogMessage::Info(display_obj(args.get(0).unwrap_or(&undefined), true)),
+            LogMessage::Info(display_obj(&args.get_or_undefined(0), true)),
             context.console(),
         );
 

diff --git a/boa/src/builtins/date/mod.rs b/boa/src/builtins/date/mod.rs
@@ -13,6 +13,8 @@ use crate::{
 use chrono::{prelude::*, Duration, LocalResult};
 use std::fmt::Display;
 
+use super::JsArgs;
+
 /// The number of nanoseconds in a millisecond.
 const NANOS_PER_MS: i64 = 1_000_000;
 /// The number of milliseconds in an hour.
@@ -523,7 +525,7 @@ impl Date {
             return context.throw_type_error("Date.prototype[@@toPrimitive] called on non object");
         };
 
-        let hint = args.get(0).cloned().unwrap_or_default();
+        let hint = args.get_or_undefined(0);
 
         let try_first = match hint.as_string().map(|s| s.as_str()) {
             // 3. If hint is "string" or "default", then

diff --git a/boa/src/builtins/function/mod.rs b/boa/src/builtins/function/mod.rs
@@ -26,6 +26,8 @@ use bitflags::bitflags;
 use std::fmt::{self, Debug};
 use std::rc::Rc;
 
+use super::JsArgs;
+
 #[cfg(test)]
 mod tests;
 
@@ -322,7 +324,7 @@ impl BuiltInFunctionObject {
         if !this.is_function() {
             return context.throw_type_error(format!("{} is not a function", this.display()));
         }
-        let this_arg: JsValue = args.get(0).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(0);
         // TODO?: 3. Perform PrepareForTailCall
         let start = if !args.is_empty() { 1 } else { 0 };
         context.call(this, &this_arg, &args[start..])
@@ -343,8 +345,8 @@ impl BuiltInFunctionObject {
         if !this.is_function() {
             return context.throw_type_error(format!("{} is not a function", this.display()));
         }
-        let this_arg = args.get(0).cloned().unwrap_or_default();
-        let arg_array = args.get(1).cloned().unwrap_or_default();
+        let this_arg = args.get_or_undefined(0);
+        let arg_array = args.get_or_undefined(1);
         if arg_array.is_null_or_undefined() {
             // TODO?: 3.a. PrepareForTailCall
             return context.call(this, &this_arg, &[]);

diff --git a/boa/src/builtins/json/mod.rs b/boa/src/builtins/json/mod.rs
@@ -28,6 +28,8 @@ use crate::{
 };
 use serde_json::{self, Value as JSONValue};
 
+use super::JsArgs;
+
 #[cfg(test)]
 mod tests;
 
@@ -158,7 +160,7 @@ impl Json {
         let mut property_list = None;
         let mut replacer_function = None;
 
-        let replacer = args.get(1).cloned().unwrap_or_default();
+        let replacer = args.get_or_undefined(1);
 
         // 4. If Type(replacer) is Object, then
         if let Some(replacer_obj) = replacer.as_object() {
@@ -214,7 +216,7 @@ impl Json {
             }
         }
 
-        let mut space = args.get(2).cloned().unwrap_or_default();
+        let mut space = args.get_or_undefined(2);
 
         // 5. If Type(space) is Object, then
         if let Some(space_obj) = space.as_object() {

diff --git a/boa/src/builtins/map/mod.rs b/boa/src/builtins/map/mod.rs
@@ -26,6 +26,8 @@ use map_iterator::MapIterator;
 
 use self::ordered_map::MapLock;
 
+use super::JsArgs;
+
 pub mod ordered_map;
 #[cfg(test)]
 mod tests;
@@ -245,11 +247,8 @@ impl Map {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        let (key, value) = match args.len() {
-            0 => (JsValue::undefined(), JsValue::undefined()),
-            1 => (args[0].clone(), JsValue::undefined()),
-            _ => (args[0].clone(), args[1].clone()),
-        };
+        let key = args.get_or_undefined(0);
+        let value = args.get_or_undefined(1);
 
         let size = if let Some(object) = this.as_object() {
             if let Some(map) = object.borrow_mut().as_map_mut() {
@@ -281,7 +280,7 @@ impl Map {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        let key = args.get(0).cloned().unwrap_or_default();
+        let key = args.get_or_undefined(0);
 
         let (deleted, size) = if let Some(object) = this.as_object() {
             if let Some(map) = object.borrow_mut().as_map_mut() {
@@ -312,7 +311,7 @@ impl Map {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        let key = args.get(0).cloned().unwrap_or_default();
+        let key = args.get_or_undefined(0);
 
         if let JsValue::Object(ref object) = this {
             let object = object.borrow();
@@ -361,7 +360,7 @@ impl Map {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        let key = args.get(0).cloned().unwrap_or_default();
+        let key = args.get_or_undefined(0);
 
         if let JsValue::Object(ref object) = this {
             let object = object.borrow();
@@ -393,7 +392,7 @@ impl Map {
         }
 
         let callback_arg = &args[0];
-        let this_arg = args.get(1).cloned().unwrap_or_else(JsValue::undefined);
+        let this_arg = args.get_or_undefined(1);
 
         let mut index = 0;
 

diff --git a/boa/src/builtins/mod.rs b/boa/src/builtins/mod.rs
@@ -113,7 +113,7 @@ pub fn init(context: &mut Context) {
     }
 }
 
-pub(crate) trait JsArgs {
+pub trait JsArgs {
     fn get_or_undefined(&self, index: usize) -> JsValue;
 }
 

diff --git a/boa/src/builtins/number/mod.rs b/boa/src/builtins/number/mod.rs
@@ -13,8 +13,8 @@
 //! [spec]: https://tc39.es/ecma262/#sec-number-object
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number
 
-use super::function::make_builtin_fn;
 use super::string::is_trimmable_whitespace;
+use super::{function::make_builtin_fn, JsArgs};
 use crate::{
     builtins::BuiltIn,
     object::{ConstructorBuilder, ObjectData, PROTOTYPE},
@@ -392,12 +392,12 @@ impl Number {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        let precision = args.get(0).cloned().unwrap_or_default();
+        let precision = args.get_or_undefined(0);
 
         // 1 & 6
         let mut this_num = Self::this_number_value(this, context)?;
         // 2
-        if precision == JsValue::undefined() {
+        if precision.is_undefined() {
             return Self::to_string(this, &[], context);
         }
 
@@ -720,7 +720,7 @@ impl Number {
         args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let (Some(val), radix) = (args.get(0), args.get(1)) {
+        if let (Some(val), radix) = (args.get(0), args.get_or_undefined(1)) {
             // 1. Let inputString be ? ToString(string).
             let input_string = val.to_string(context)?;
 
@@ -745,7 +745,7 @@ impl Number {
             }
 
             // 6. Let R be ℝ(? ToInt32(radix)).
-            let mut var_r = radix.cloned().unwrap_or_default().to_i32(context)?;
+            let mut var_r = radix.to_i32(context)?;
 
             // 7. Let stripPrefix be true.
             let mut strip_prefix = true;