improve map conformance without losing perf

boa-dev · Sep 9, 2021 · dc2a4fa · dc2a4fa
1 parent 59659a6
commit dc2a4fa
Showing 1 changed file with 57 additions and 2 deletions.
diff --git a/boa/src/builtins/map/mod.rs b/boa/src/builtins/map/mod.rs
@@ -21,7 +21,7 @@ use crate::{
     },
     property::{Attribute, PropertyDescriptor, PropertyNameKind},
     symbol::WellKnownSymbols,
-    BoaProfiler, Context, JsResult, JsValue,
+    BoaProfiler, Context, JsBigInt, JsResult, JsValue,
 };
 use ordered_map::OrderedMap;
 
@@ -31,6 +31,7 @@ use map_iterator::MapIterator;
 use self::ordered_map::MapLock;
 
 use super::JsArgs;
+use num_traits::Zero;
 
 pub mod ordered_map;
 #[cfg(test)]
@@ -248,7 +249,31 @@ impl Map {
 
         let size = if let Some(object) = this.as_object() {
             if let Some(map) = object.borrow_mut().as_map_mut() {
-                map.insert(key.clone(), value.clone());
+                let key = match key {
+                    JsValue::Rational(r) => {
+                        if r.is_zero() {
+                            JsValue::Rational(0f64)
+                        } else {
+                            key.into()
+                        }
+                    }
+                    JsValue::Integer(i) => {
+                        if i.is_zero() {
+                            JsValue::Integer(0)
+                        } else {
+                            key.into()
+                        }
+                    }
+                    JsValue::BigInt(b) => {
+                        if b.is_zero() {
+                            JsValue::BigInt(JsBigInt::from(0))
+                        } else {
+                            key.into()
+                        }
+                    }
+                    _ => key.into(),
+                };
+                map.insert(key, value.into());
                 map.len()
             } else {
                 return Err(context.construct_type_error("'this' is not a Map"));
@@ -309,6 +334,36 @@ impl Map {
     ) -> JsResult<JsValue> {
         let key = args.get_or_undefined(0);
 
+        let temp_v;
+
+        let key = match key {
+            JsValue::Rational(r) => {
+                if r.is_zero() {
+                    temp_v = JsValue::Rational(0f64);
+                    &temp_v
+                } else {
+                    key
+                }
+            }
+            JsValue::Integer(i) => {
+                if i.is_zero() {
+                    temp_v = JsValue::Integer(0);
+                    &temp_v
+                } else {
+                    key
+                }
+            }
+            JsValue::BigInt(b) => {
+                if b.is_zero() {
+                    temp_v = JsValue::BigInt(JsBigInt::from(0));
+                    &temp_v
+                } else {
+                    key
+                }
+            }
+            _ => key,
+        };
+
         if let JsValue::Object(ref object) = this {
             let object = object.borrow();
             if let Some(map) = object.as_map_ref() {