implementation of Temporal.Instant.compare

Author: lockels

nova_vm/Cargo.toml

@@ -52,7 +52,7 @@ default = [
     "regexp",
     "set",
     "annex-b",
-    "temporal", 
+    "temporal",
 ]
 array-buffer = []
 atomics = ["array-buffer", "shared-array-buffer"]
@@ -64,7 +64,7 @@ shared-array-buffer = ["array-buffer"]
 weak-refs = []
 set = []
 typescript = []
-temporal = ["temporal_rs"] 
+temporal = ["temporal_rs"]
 
 # Enables features defined by [Annex B](https://tc39.es/ecma262/#sec-additional-ecmascript-features-for-web-browsers)
 annex-b = ["annex-b-string", "annex-b-global", "annex-b-date", "annex-b-regexp"]

nova_vm/src/ecmascript/builtins/temporal.rs

@@ -7,7 +7,7 @@ pub mod instant;
 use crate::{
     ecmascript::{
         builders::ordinary_object_builder::OrdinaryObjectBuilder,
-        builtins::Builtin,
+        builtins::{Builtin, temporal::instant::TemporalInstantConstructor},
         execution::{Agent, Realm},
         types::{BUILTIN_STRING_MEMORY, IntoValue},
     },
@@ -40,8 +40,8 @@ impl TemporalObject {
                 builder
                     .with_key(BUILTIN_STRING_MEMORY.Instant.into())
                     .with_value(temporal_instant_constructor.into_value())
-                    .with_enumerable(instant::TemporalInstantConstructor::ENUMERABLE)
-                    .with_configurable(instant::TemporalInstantConstructor::CONFIGURABLE)
+                    .with_enumerable(TemporalInstantConstructor::ENUMERABLE)
+                    .with_configurable(TemporalInstantConstructor::CONFIGURABLE)
                     .build()
             })
             .build();

nova_vm/src/ecmascript/builtins/temporal/instant.rs

@@ -35,20 +35,61 @@ use crate::{
         IntrinsicConstructorIndexes, WorkQueues, indexes::BaseIndex,
     },
 };
+
 /// Constructor function object for %Temporal.Instant%.
 pub(crate) struct TemporalInstantConstructor;
+
 impl Builtin for TemporalInstantConstructor {
     const NAME: String<'static> = BUILTIN_STRING_MEMORY.Instant;
     const LENGTH: u8 = 1;
-    const BEHAVIOUR: Behaviour = Behaviour::Constructor(TemporalInstantConstructor::construct);
+    const BEHAVIOUR: Behaviour = Behaviour::Constructor(TemporalInstantConstructor::constructor);
 }
+
 impl BuiltinIntrinsicConstructor for TemporalInstantConstructor {
     const INDEX: IntrinsicConstructorIndexes = IntrinsicConstructorIndexes::TemporalInstant;
 }
 
+struct TemporalInstantFrom;
+impl Builtin for TemporalInstantFrom {
+    const NAME: String<'static> = BUILTIN_STRING_MEMORY.from;
+
+    const LENGTH: u8 = 1;
+
+    const BEHAVIOUR: Behaviour = Behaviour::Regular(TemporalInstantConstructor::from);
+}
+
+struct TemporalInstantFromEpochMilliseconds;
+impl Builtin for TemporalInstantFromEpochMilliseconds {
+    const NAME: String<'static> = BUILTIN_STRING_MEMORY.fromEpochMilliseconds;
+
+    const LENGTH: u8 = 1;
+
+    const BEHAVIOUR: Behaviour =
+        Behaviour::Regular(TemporalInstantConstructor::from_epoch_milliseconds);
+}
+
+struct TemporalInstantFromEpochNanoseconds;
+impl Builtin for TemporalInstantFromEpochNanoseconds {
+    const NAME: String<'static> = BUILTIN_STRING_MEMORY.fromEpochNanoseconds;
+
+    const LENGTH: u8 = 1;
+
+    const BEHAVIOUR: Behaviour =
+        Behaviour::Regular(TemporalInstantConstructor::from_epoch_nanoseconds);
+}
+
+struct TemporalInstantCompare;
+impl Builtin for TemporalInstantCompare {
+    const NAME: String<'static> = BUILTIN_STRING_MEMORY.compare;
+
+    const LENGTH: u8 = 2;
+
+    const BEHAVIOUR: Behaviour = Behaviour::Regular(TemporalInstantConstructor::compare);
+}
+
 impl TemporalInstantConstructor {
     /// ### [8.1.1 Temporal.Instant ( epochNanoseconds )](https://tc39.es/proposal-temporal/#sec-temporal.instant)
-    fn construct<'gc>(
+    fn constructor<'gc>(
         agent: &mut Agent,
         _: Value,
         args: ArgumentsList,
@@ -101,10 +142,10 @@ impl TemporalInstantConstructor {
     fn from<'gc>(
         agent: &mut Agent,
         _this_value: Value,
-        arguments: ArgumentsList,
+        args: ArgumentsList,
         gc: GcScope<'gc, '_>,
     ) -> JsResult<'gc, Value<'gc>> {
-        let item = arguments.get(0).bind(gc.nogc());
+        let item = args.get(0).bind(gc.nogc());
         // 1. Return ? ToTemporalInstant(item).
         let instant = to_temporal_instant(agent, item.unbind(), gc)?;
         let instant = agent.heap.create(InstantRecord {
@@ -118,10 +159,10 @@ impl TemporalInstantConstructor {
     fn from_epoch_milliseconds<'gc>(
         agent: &mut Agent,
         _this_value: Value,
-        arguments: ArgumentsList,
+        args: ArgumentsList,
         mut gc: GcScope<'gc, '_>,
     ) -> JsResult<'gc, Value<'gc>> {
-        let epoch_ms = arguments.get(0).bind(gc.nogc());
+        let epoch_ms = args.get(0).bind(gc.nogc());
         // 1. Set epochMilliseconds to ? ToNumber(epochMilliseconds).
         let epoch_ms_number = epoch_ms
             .unbind()
@@ -190,19 +231,23 @@ impl TemporalInstantConstructor {
         Ok(value)
     }
 
-    /// [8.2.5 Temporal.Instant.compare ( one, two )](https://tc39.es/proposal-temporal/#sec-temporal.instant.compare)
+    /// ### [8.2.5 Temporal.Instant.compare ( one, two )](https://tc39.es/proposal-temporal/#sec-temporal.instant.compare)
     fn compare<'gc>(
         agent: &mut Agent,
         _this_value: Value,
-        arguments: ArgumentsList,
+        args: ArgumentsList,
         mut gc: GcScope<'gc, '_>,
     ) -> JsResult<'gc, Value<'gc>> {
+        let one = args.get(0).bind(gc.nogc());
+        let two = args.get(0).bind(gc.nogc());
+        let two = two.scope(agent, gc.nogc());
         // 1. Set one to ? ToTemporalInstant(one).
-        let one = arguments.get(0).bind(gc.nogc());
+        let one_instant = to_temporal_instant(agent, one.unbind(), gc.reborrow()).unbind()?;
         // 2. Set two to ? ToTemporalInstant(two).
-        let two = arguments.get(1).bind(gc.nogc());
+        let two_value = two.get(agent).bind(gc.nogc());
+        let two_instant = to_temporal_instant(agent, two_value.unbind(), gc.reborrow()).unbind()?;
         // 3. Return 𝔽(CompareEpochNanoseconds(one.[[EpochNanoseconds]], two.[[EpochNanoseconds]])).
-        todo!()
+        Ok((one_instant.cmp(&two_instant) as i8).into())
     }
 
     pub(crate) fn create_intrinsic(agent: &mut Agent, realm: Realm<'static>, _gc: NoGcScope) {
@@ -308,44 +353,6 @@ fn to_temporal_instant<'gc>(
 /// %Temporal.Instant.Prototype%
 pub(crate) struct TemporalInstantPrototype;
 
-struct TemporalInstantFrom;
-impl Builtin for TemporalInstantFrom {
-    const NAME: String<'static> = BUILTIN_STRING_MEMORY.from;
-
-    const LENGTH: u8 = 1;
-
-    const BEHAVIOUR: Behaviour = Behaviour::Regular(TemporalInstantConstructor::from);
-}
-
-struct TemporalInstantFromEpochMilliseconds;
-impl Builtin for TemporalInstantFromEpochMilliseconds {
-    const NAME: String<'static> = BUILTIN_STRING_MEMORY.fromEpochMilliseconds;
-
-    const LENGTH: u8 = 1;
-
-    const BEHAVIOUR: Behaviour =
-        Behaviour::Regular(TemporalInstantConstructor::from_epoch_milliseconds);
-}
-
-struct TemporalInstantFromEpochNanoseconds;
-impl Builtin for TemporalInstantFromEpochNanoseconds {
-    const NAME: String<'static> = BUILTIN_STRING_MEMORY.fromEpochNanoseconds;
-
-    const LENGTH: u8 = 1;
-
-    const BEHAVIOUR: Behaviour =
-        Behaviour::Regular(TemporalInstantConstructor::from_epoch_nanoseconds);
-}
-
-struct TemporalInstantCompare;
-impl Builtin for TemporalInstantCompare {
-    const NAME: String<'static> = BUILTIN_STRING_MEMORY.compare;
-
-    const LENGTH: u8 = 2;
-
-    const BEHAVIOUR: Behaviour = Behaviour::Regular(TemporalInstantConstructor::compare);
-}
-
 impl TemporalInstantPrototype {
     pub fn create_intrinsic(agent: &mut Agent, realm: Realm<'static>, _: NoGcScope) {
         let intrinsics = agent.get_realm_record_by_id(realm).intrinsics();

nova_vm/src/ecmascript/builtins/temporal/instant/data.rs

@@ -2,9 +2,10 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use crate::engine::context::NoGcScope;
 use crate::{
     ecmascript::types::OrdinaryObject,
-    engine::context::bindable_handle,
+    engine::context::{bindable_handle, trivially_bindable},
     heap::{CompactionLists, HeapMarkAndSweep, WorkQueues},
 };
 
@@ -23,6 +24,7 @@ impl InstantRecord<'_> {
     }
 }
 
+trivially_bindable!(temporal_rs::Instant);
 bindable_handle!(InstantRecord);
 
 impl HeapMarkAndSweep for InstantRecord<'static> {

nova_vm/src/ecmascript/execution/realm/intrinsics.rs

@@ -1033,15 +1033,16 @@ impl Intrinsics {
         IntrinsicObjectIndexes::TemporalObject.get_backing_object(self.object_index_base)
     }
 
+    /// %Temporal.Instant.Prototype%
+    pub(crate) const fn temporal_instant_prototype(&self) -> OrdinaryObject<'static> {
+        IntrinsicObjectIndexes::TemporalInstantPrototype.get_backing_object(self.object_index_base)
+    }
+
     /// %Temporal.Instant%
     pub(crate) const fn temporal_instant(&self) -> BuiltinFunction<'static> {
         IntrinsicConstructorIndexes::TemporalInstant
             .get_builtin_function(self.builtin_function_index_base)
     }
-    /// %Temporal.Instant.Prototype%
-    pub(crate) const fn temporal_instant_prototype(&self) -> OrdinaryObject<'static> {
-        IntrinsicObjectIndexes::TemporalInstantPrototype.get_backing_object(self.object_index_base)
-    }
 
     /// %Number.prototype%
     pub(crate) fn number_prototype(&self) -> PrimitiveObject<'static> {