chore(heap): Move NumberHeapData to ecmascript/types/language/number

trynova · Oct 29, 2023 · cb35c79 · cb35c79
1 parent d98ec8f
commit cb35c79
Show file tree

Hide file tree

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

diff --git a/nova_vm/src/ecmascript/types/language.rs b/nova_vm/src/ecmascript/types/language.rs
@@ -7,7 +7,7 @@ mod value;
 
 pub use bigint::{BigInt, BigIntHeapData};
 pub use function::Function;
-pub use number::Number;
+pub use number::{Number, NumberHeapData};
 pub use object::{InternalMethods, Object, ObjectHeapData, PropertyKey, PropertyStorage};
 pub use string::{String, StringHeapData};
 pub use value::Value;
diff --git a/nova_vm/src/ecmascript/types/language/number.rs b/nova_vm/src/ecmascript/types/language/number.rs
@@ -1,3 +1,5 @@
+mod data;
+
 use super::{
     value::{FLOAT_DISCRIMINANT, INTEGER_DISCRIMINANT, NUMBER_DISCRIMINANT},
     Value,
@@ -8,6 +10,8 @@ use crate::{
     SmallInteger,
 };
 
+pub use data::NumberHeapData;
+
 /// 6.1.6.1 The Number Type
 /// https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type
 #[derive(Clone, Copy)]

diff --git a/nova_vm/src/ecmascript/types/language/number/data.rs b/nova_vm/src/ecmascript/types/language/number/data.rs
@@ -0,0 +1,17 @@
+#[derive(Debug, Clone, Copy)]
+pub struct NumberHeapData {
+    pub(crate) data: f64,
+}
+
+impl From<f64> for NumberHeapData {
+    #[inline(always)]
+    fn from(data: f64) -> Self {
+        Self { data }
+    }
+}
+
+impl From<NumberHeapData> for f64 {
+    fn from(value: NumberHeapData) -> Self {
+        value.data
+    }
+}
diff --git a/nova_vm/src/heap.rs b/nova_vm/src/heap.rs
@@ -36,7 +36,7 @@ use self::{
     },
     indexes::{BaseIndex, FunctionIndex, NumberIndex, ObjectIndex, StringIndex},
     math::initialize_math_object,
-    number::{initialize_number_heap, NumberHeapData},
+    number::initialize_number_heap,
     object::{initialize_object_heap, ObjectEntry, PropertyDescriptor},
     regexp::{initialize_regexp_heap, RegExpHeapData},
     string::initialize_string_heap,
@@ -46,8 +46,8 @@ use crate::ecmascript::{
     builtins::ArrayHeapData,
     execution::{Environments, Realm, RealmIdentifier},
     types::{
-        BigIntHeapData, Function, Number, Object, ObjectHeapData, PropertyKey, String,
-        StringHeapData, Value,
+        BigIntHeapData, Function, Number, NumberHeapData, Object, ObjectHeapData, PropertyKey,
+        String, StringHeapData, Value,
     },
 };
 use wtf8::{Wtf8, Wtf8Buf};
@@ -269,7 +269,7 @@ impl<'ctx, 'host> Heap<'ctx, 'host> {
     }
 
     pub fn alloc_number(&mut self, number: f64) -> NumberIndex {
-        self.numbers.push(Some(NumberHeapData::new(number)));
+        self.numbers.push(Some(number.into()));
         NumberIndex::last(&self.numbers)
     }
 

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

diff --git a/nova_vm/src/heap/number.rs b/nova_vm/src/heap/number.rs
@@ -10,21 +10,6 @@ use crate::{
     },
 };
 
-#[derive(Debug, Clone, Copy)]
-pub struct NumberHeapData {
-    pub(super) data: f64,
-}
-
-impl NumberHeapData {
-    pub(super) fn new(data: f64) -> NumberHeapData {
-        NumberHeapData { data }
-    }
-
-    pub fn value(&self) -> f64 {
-        self.data
-    }
-}
-
 pub fn initialize_number_heap(heap: &mut Heap) {
     let entries = vec![
         ObjectEntry::new(