chore(heap): Move BigIntHeapData to ecmascript/types/language/bigint

trynova · Oct 29, 2023 · b982dcc · b982dcc
1 parent 7e01c84
commit b982dcc
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git a/nova_vm/src/ecmascript/types.rs b/nova_vm/src/ecmascript/types.rs
@@ -1,6 +1,7 @@
 mod language;
 mod spec;
 
+pub(crate) use language::BigIntHeapData;
 pub(crate) use language::ObjectHeapData;
 pub(crate) use language::StringHeapData;
 pub use language::{Function, InternalMethods, Number, Object, PropertyKey, String, Value};

diff --git a/nova_vm/src/ecmascript/types/language.rs b/nova_vm/src/ecmascript/types/language.rs
@@ -5,7 +5,7 @@ mod object;
 mod string;
 mod value;
 
-pub use bigint::BigInt;
+pub use bigint::{BigInt, BigIntHeapData};
 pub use function::Function;
 pub use number::Number;
 pub use object::{InternalMethods, Object, ObjectHeapData, PropertyKey, PropertyStorage};

diff --git a/nova_vm/src/ecmascript/types/language/bigint.rs b/nova_vm/src/ecmascript/types/language/bigint.rs
@@ -1,6 +1,10 @@
+pub(crate) mod data;
+
 use super::value::{BIGINT_DISCRIMINANT, SMALL_BIGINT_DISCRIMINANT};
 use crate::{heap::indexes::BigIntIndex, SmallInteger};
 
+pub use data::BigIntHeapData;
+
 #[derive(Clone, Copy)]
 #[repr(u8)]
 pub enum BigInt {

diff --git a/nova_vm/src/ecmascript/types/language/bigint/data.rs b/nova_vm/src/ecmascript/types/language/bigint/data.rs
@@ -0,0 +1,17 @@
+use crate::ecmascript::execution::agent::JsError;
+use num_bigint_dig::BigInt;
+// use num_traits::cast::ToPrimitive;
+
+#[derive(Debug, Clone)]
+pub struct BigIntHeapData {
+    pub(super) data: BigInt,
+}
+
+impl TryInto<f64> for BigIntHeapData {
+    type Error = JsError;
+
+    fn try_into(self) -> Result<f64, Self::Error> {
+        // self.data.to_f64()
+        Err(JsError {})
+    }
+}
diff --git a/nova_vm/src/heap.rs b/nova_vm/src/heap.rs
@@ -21,7 +21,7 @@ pub use self::heap_constants::BuiltinObjectIndexes;
 use self::{
     array::initialize_array_heap,
     array_buffer::{initialize_array_buffer_heap, ArrayBufferHeapData},
-    bigint::{initialize_bigint_heap, BigIntHeapData},
+    bigint::initialize_bigint_heap,
     boolean::initialize_boolean_heap,
     date::{initialize_date_heap, DateHeapData},
     element_array::{
@@ -45,7 +45,10 @@ use self::{
 use crate::ecmascript::{
     builtins::ArrayHeapData,
     execution::{Environments, Realm, RealmIdentifier},
-    types::{Function, Number, Object, ObjectHeapData, PropertyKey, String, StringHeapData, Value},
+    types::{
+        BigIntHeapData, Function, Number, Object, ObjectHeapData, PropertyKey, String,
+        StringHeapData, Value,
+    },
 };
 use wtf8::{Wtf8, Wtf8Buf};
 

diff --git a/nova_vm/src/heap/bigint.rs b/nova_vm/src/heap/bigint.rs
@@ -9,18 +9,6 @@ use crate::{
         FunctionHeapData, Heap, ObjectEntry, PropertyDescriptor,
     },
 };
-use num_bigint_dig::BigInt;
-
-#[derive(Debug, Clone)]
-pub struct BigIntHeapData {
-    pub(super) data: BigInt,
-}
-
-impl BigIntHeapData {
-    pub fn try_into_f64(&self) -> Option<f64> {
-        None
-    }
-}
 
 pub fn initialize_bigint_heap(heap: &mut Heap) {
     let entries = vec![

diff --git a/nova_vm/src/heap/indexes.rs b/nova_vm/src/heap/indexes.rs
@@ -1,10 +1,10 @@
 use super::array_buffer::ArrayBufferHeapData;
 use super::{
-    bigint::BigIntHeapData, date::DateHeapData, error::ErrorHeapData, function::FunctionHeapData,
-    number::NumberHeapData, regexp::RegExpHeapData, symbol::SymbolHeapData,
+    date::DateHeapData, error::ErrorHeapData, function::FunctionHeapData, number::NumberHeapData,
+    regexp::RegExpHeapData, symbol::SymbolHeapData,
 };
 use crate::ecmascript::builtins::ArrayHeapData;
-use crate::ecmascript::types::{ObjectHeapData, StringHeapData, Value};
+use crate::ecmascript::types::{BigIntHeapData, ObjectHeapData, StringHeapData, Value};
 use crate::Heap;
 use core::fmt::Debug;
 use std::hash::{Hash, Hasher};