Separate native and JavaScript functions (#3322)

boa-dev · Oct 3, 2023 · 7445367 · 7445367
1 parent ceaaec7
commit 7445367
Show file tree

Hide file tree

Showing 15 changed files with 662 additions and 703 deletions.
diff --git a/boa_cli/src/debug/function.rs b/boa_cli/src/debug/function.rs
@@ -85,13 +85,11 @@ fn flowgraph(_this: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> Js
 
     let Some(function) = object.as_function() else {
         return Err(JsNativeError::typ()
-            .with_message("expected function object")
+            .with_message("expected an ordinary function object")
             .into());
     };
 
-    let code = function.codeblock().ok_or_else(|| {
-        JsNativeError::typ().with_message("native functions do not have bytecode")
-    })?;
+    let code = function.codeblock();
 
     let mut graph = Graph::new(direction);
     code.to_graph(context.interner(), graph.subgraph(String::default()));
@@ -118,12 +116,10 @@ fn bytecode(_: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> JsResul
     let object = object.borrow();
     let Some(function) = object.as_function() else {
         return Err(JsNativeError::typ()
-            .with_message("expected function object")
+            .with_message("expected an ordinary function object")
             .into());
     };
-    let code = function.codeblock().ok_or_else(|| {
-        JsNativeError::typ().with_message("native functions do not have bytecode")
-    })?;
+    let code = function.codeblock();
 
     Ok(js_string!(code.to_interned_string(context.interner())).into())
 }
@@ -132,12 +128,10 @@ fn set_trace_flag_in_function_object(object: &JsObject, value: bool) -> JsResult
     let object = object.borrow();
     let Some(function) = object.as_function() else {
         return Err(JsNativeError::typ()
-            .with_message("expected function object")
+            .with_message("expected an ordinary function object")
             .into());
     };
-    let code = function.codeblock().ok_or_else(|| {
-        JsNativeError::typ().with_message("native functions do not have bytecode")
-    })?;
+    let code = function.codeblock();
     code.set_traceable(value);
     Ok(())
 }

diff --git a/boa_engine/src/builtins/error/type.rs b/boa_engine/src/builtins/error/type.rs
@@ -16,10 +16,7 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypeError
 
 use crate::{
-    builtins::{
-        function::{Function, FunctionKind},
-        BuiltInBuilder, BuiltInConstructor, BuiltInObject, IntrinsicObject,
-    },
+    builtins::{BuiltInBuilder, BuiltInConstructor, BuiltInObject, IntrinsicObject},
     context::intrinsics::{Intrinsics, StandardConstructor, StandardConstructors},
     error::JsNativeError,
     js_string,
@@ -136,13 +133,11 @@ impl IntrinsicObject for ThrowTypeError {
         let mut obj = obj.borrow_mut();
 
         obj.extensible = false;
-        *obj.kind_mut() = ObjectKind::Function(Function::new(
-            FunctionKind::Native {
-                function: NativeFunction::from_fn_ptr(throw_type_error),
-                constructor: None,
-            },
-            realm.clone(),
-        ));
+        *obj.kind_mut() = ObjectKind::NativeFunction {
+            function: NativeFunction::from_fn_ptr(throw_type_error),
+            constructor: None,
+            realm: realm.clone(),
+        }
     }
 
     fn get(intrinsics: &Intrinsics) -> JsObject {