Fix Function.prototype.toString()

boa-dev · Oct 11, 2023 · 5dea5ea · 5dea5ea
1 parent f654ad1
commit 5dea5ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/boa_engine/src/builtins/function/mod.rs b/boa_engine/src/builtins/function/mod.rs
@@ -859,11 +859,12 @@ impl BuiltInFunctionObject {
         // 4. If func is an Object and IsCallable(func) is true, return an implementation-defined String source code representation of func.
         //    The representation must have the syntax of a NativeFunction.
         // 5. Throw a TypeError exception.
-        let Some(object) = func.as_object() else {
+        let Some(object) = func.as_callable() else {
             return Err(JsNativeError::typ().with_message("not a function").into());
         };
 
-        if object.borrow().is_native_function() {
+        let object = object.borrow();
+        if object.is_native_function() {
             let name = {
                 // Is there a case here where if there is no name field on a value
                 // name should default to None? Do all functions have names set?
@@ -880,29 +881,22 @@ impl BuiltInFunctionObject {
             return Ok(
                 js_string!(utf16!("function "), &name, utf16!("() { [native code] }")).into(),
             );
+        } else if object.is_proxy() || object.is_bound_function() {
+            return Ok(js_string!(utf16!("function () { [native code] }")).into());
         }
 
-        let object = object.borrow();
         let function = object
             .as_function()
             .ok_or_else(|| JsNativeError::typ().with_message("not a function"))?;
 
         let code = function.codeblock();
 
-        let prefix = match function.kind {
-            FunctionKind::Ordinary { .. } => {
-                utf16!("function ")
-            }
-            FunctionKind::Async { .. } => {
-                utf16!("async function ")
-            }
-            FunctionKind::Generator { .. } => {
-                utf16!("function* ")
-            }
-            FunctionKind::AsyncGenerator { .. } => utf16!("async function* "),
-        };
-
-        Ok(js_string!(prefix, code.name(), utf16!("() { [native code] }")).into())
+        Ok(js_string!(
+            utf16!("function "),
+            code.name(),
+            utf16!("() { [native code] }")
+        )
+        .into())
     }
 
     /// `Function.prototype [ @@hasInstance ] ( V )`

diff --git a/boa_engine/src/object/mod.rs b/boa_engine/src/object/mod.rs
@@ -1336,6 +1336,13 @@ impl Object {
         }
     }
 
+    /// Checks if the object is a `BoundFunction` object.
+    #[inline]
+    #[must_use]
+    pub const fn is_bound_function(&self) -> bool {
+        matches!(self.kind, ObjectKind::BoundFunction(_))
+    }
+
     /// Gets the bound function data if the object is a `BoundFunction`.
     #[inline]
     #[must_use]