Merge f34a290 into 24f4155

boa-dev · Sep 16, 2022 · f7ecaa4 · f7ecaa4
2 parents 24f4155 + f34a290
commit f7ecaa4
Show file tree

Hide file tree

Showing 94 changed files with 3,314 additions and 2,004 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/boa_cli/src/main.rs b/boa_cli/src/main.rs
@@ -112,7 +112,6 @@ impl Opt {
 #[derive(Debug, Clone, ArgEnum)]
 enum DumpFormat {
     /// The different types of format available for dumping.
-    ///
     // NOTE: This can easily support other formats just by
     // adding a field to this enum and adding the necessary
     // implementation. Example: Toml, Html, etc.
@@ -198,7 +197,7 @@ pub fn main() -> Result<(), io::Error> {
         } else {
             match context.eval(&buffer) {
                 Ok(v) => println!("{}", v.display()),
-                Err(v) => eprintln!("Uncaught {}", v.display()),
+                Err(v) => eprintln!("Uncaught {v}"),
             }
         }
     }
@@ -245,11 +244,7 @@ pub fn main() -> Result<(), io::Error> {
                         match context.eval(line.trim_end()) {
                             Ok(v) => println!("{}", v.display()),
                             Err(v) => {
-                                eprintln!(
-                                    "{}: {}",
-                                    "Uncaught".red(),
-                                    v.display().to_string().red()
-                                );
+                                eprintln!("{}: {}", "Uncaught".red(), v.to_string().red());
                             }
                         }
                     }

diff --git a/boa_engine/Cargo.toml b/boa_engine/Cargo.toml
@@ -50,6 +50,7 @@ unicode-normalization = "0.1.21"
 dyn-clone = "1.0.9"
 once_cell = "1.14.0"
 tap = "1.0.1"
+thiserror = "1.0.35"
 icu_locale_canonicalizer = { version = "0.6.0", features = ["serde"], optional = true }
 icu_locid = { version = "0.6.0", features = ["serde"], optional = true }
 icu_datetime = { version = "0.6.0", features = ["serde"], optional = true }

diff --git a/boa_engine/src/bigint.rs b/boa_engine/src/bigint.rs
@@ -1,6 +1,6 @@
 //! This module implements the JavaScript bigint primitive rust type.
 
-use crate::{builtins::Number, Context, JsValue};
+use crate::{builtins::Number, error::JsNativeError, JsResult};
 use num_integer::Integer;
 use num_traits::{pow::Pow, FromPrimitive, One, ToPrimitive, Zero};
 use std::{
@@ -148,11 +148,13 @@ impl JsBigInt {
     }
 
     #[inline]
-    pub fn pow(x: &Self, y: &Self, context: &mut Context) -> Result<Self, JsValue> {
+    pub fn pow(x: &Self, y: &Self) -> JsResult<Self> {
         let y = if let Some(y) = y.inner.to_biguint() {
             y
         } else {
-            return context.throw_range_error("BigInt negative exponent");
+            return Err(JsNativeError::range()
+                .with_message("BigInt negative exponent")
+                .into());
         };
 
         let num_bits = (x.inner.bits() as f64
@@ -161,14 +163,16 @@ impl JsBigInt {
             + 1f64;
 
         if num_bits > 1_000_000_000f64 {
-            return context.throw_range_error("Maximum BigInt size exceeded");
+            return Err(JsNativeError::range()
+                .with_message("Maximum BigInt size exceeded")
+                .into());
         }
 
         Ok(Self::new(x.inner.as_ref().clone().pow(y)))
     }
 
     #[inline]
-    pub fn shift_right(x: &Self, y: &Self, context: &mut Context) -> Result<Self, JsValue> {
+    pub fn shift_right(x: &Self, y: &Self) -> JsResult<Self> {
         if let Some(n) = y.inner.to_i32() {
             let inner = if n > 0 {
                 x.inner.as_ref().clone().shr(n as usize)
@@ -178,12 +182,14 @@ impl JsBigInt {
 
             Ok(Self::new(inner))
         } else {
-            context.throw_range_error("Maximum BigInt size exceeded")
+            Err(JsNativeError::range()
+                .with_message("Maximum BigInt size exceeded")
+                .into())
         }
     }
 
     #[inline]
-    pub fn shift_left(x: &Self, y: &Self, context: &mut Context) -> Result<Self, JsValue> {
+    pub fn shift_left(x: &Self, y: &Self) -> JsResult<Self> {
         if let Some(n) = y.inner.to_i32() {
             let inner = if n > 0 {
                 x.inner.as_ref().clone().shl(n as usize)
@@ -193,7 +199,9 @@ impl JsBigInt {
 
             Ok(Self::new(inner))
         } else {
-            context.throw_range_error("Maximum BigInt size exceeded")
+            Err(JsNativeError::range()
+                .with_message("Maximum BigInt size exceeded")
+                .into())
         }
     }
 

diff --git a/boa_engine/src/builtins/array/array_iterator.rs b/boa_engine/src/builtins/array/array_iterator.rs
@@ -1,5 +1,6 @@
 use crate::{
     builtins::{function::make_builtin_fn, iterable::create_iter_result_object, Array, JsValue},
+    error::JsNativeError,
     object::{JsObject, ObjectData},
     property::{PropertyDescriptor, PropertyNameKind},
     symbol::WellKnownSymbols,
@@ -72,7 +73,7 @@ impl ArrayIterator {
         let array_iterator = array_iterator
             .as_mut()
             .and_then(|obj| obj.as_array_iterator_mut())
-            .ok_or_else(|| context.construct_type_error("`this` is not an ArrayIterator"))?;
+            .ok_or_else(|| JsNativeError::typ().with_message("`this` is not an ArrayIterator"))?;
         let index = array_iterator.next_index;
         if array_iterator.done {
             return Ok(create_iter_result_object(
@@ -84,9 +85,11 @@ impl ArrayIterator {
 
         let len = if let Some(f) = array_iterator.array.borrow().as_typed_array() {
             if f.is_detached() {
-                return context.throw_type_error(
-                    "Cannot get value from typed array that has a detached array buffer",
-                );
+                return Err(JsNativeError::typ()
+                    .with_message(
+                        "Cannot get value from typed array that has a detached array buffer",
+                    )
+                    .into());
             }
 
             f.array_length()