Caching for observational islamic calendar (#4770)

unicode-org · Apr 5, 2024 · 4044096 · 4044096
1 parent b8da443
commit 4044096
Show file tree

Hide file tree

Showing 22 changed files with 1,835 additions and 107 deletions.
diff --git a/components/calendar/src/any_calendar.rs b/components/calendar/src/any_calendar.rs
@@ -587,7 +587,7 @@ impl AnyCalendar {
             AnyCalendarKind::Indian => AnyCalendar::Indian(Indian),
             AnyCalendarKind::IslamicCivil => AnyCalendar::IslamicCivil(IslamicCivil),
             AnyCalendarKind::IslamicObservational => {
-                AnyCalendar::IslamicObservational(IslamicObservational)
+                AnyCalendar::IslamicObservational(IslamicObservational::new())
             }
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
             AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
@@ -628,9 +628,9 @@ impl AnyCalendar {
             AnyCalendarKind::Hebrew => AnyCalendar::Hebrew(Hebrew),
             AnyCalendarKind::Indian => AnyCalendar::Indian(Indian),
             AnyCalendarKind::IslamicCivil => AnyCalendar::IslamicCivil(IslamicCivil),
-            AnyCalendarKind::IslamicObservational => {
-                AnyCalendar::IslamicObservational(IslamicObservational)
-            }
+            AnyCalendarKind::IslamicObservational => AnyCalendar::IslamicObservational(
+                IslamicObservational::try_new_with_any_provider(provider)?,
+            ),
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
             AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
@@ -673,9 +673,9 @@ impl AnyCalendar {
             AnyCalendarKind::Hebrew => AnyCalendar::Hebrew(Hebrew),
             AnyCalendarKind::Indian => AnyCalendar::Indian(Indian),
             AnyCalendarKind::IslamicCivil => AnyCalendar::IslamicCivil(IslamicCivil),
-            AnyCalendarKind::IslamicObservational => {
-                AnyCalendar::IslamicObservational(IslamicObservational)
-            }
+            AnyCalendarKind::IslamicObservational => AnyCalendar::IslamicObservational(
+                IslamicObservational::try_new_with_buffer_provider(provider)?,
+            ),
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
             AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
@@ -697,6 +697,7 @@ impl AnyCalendar {
             + DataProvider<crate::provider::JapaneseExtendedErasV1Marker>
             + DataProvider<crate::provider::ChineseCacheV1Marker>
             + DataProvider<crate::provider::DangiCacheV1Marker>
+            + DataProvider<crate::provider::IslamicObservationalCacheV1Marker>
             + ?Sized,
     {
         Ok(match kind {
@@ -715,7 +716,7 @@ impl AnyCalendar {
             AnyCalendarKind::Indian => AnyCalendar::Indian(Indian),
             AnyCalendarKind::IslamicCivil => AnyCalendar::IslamicCivil(IslamicCivil),
             AnyCalendarKind::IslamicObservational => {
-                AnyCalendar::IslamicObservational(IslamicObservational)
+                AnyCalendar::IslamicObservational(IslamicObservational::try_new_unstable(provider)?)
             }
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
             AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
@@ -769,6 +770,7 @@ impl AnyCalendar {
             + DataProvider<crate::provider::JapaneseExtendedErasV1Marker>
             + DataProvider<crate::provider::ChineseCacheV1Marker>
             + DataProvider<crate::provider::DangiCacheV1Marker>
+            + DataProvider<crate::provider::IslamicObservationalCacheV1Marker>
             + ?Sized,
     {
         let kind = AnyCalendarKind::from_data_locale_with_fallback(locale);
@@ -1038,7 +1040,7 @@ impl AnyCalendarKind {
             AnyCalendarKind::Hebrew => Hebrew.debug_name(),
             AnyCalendarKind::Indian => Indian.debug_name(),
             AnyCalendarKind::IslamicCivil => IslamicCivil.debug_name(),
-            AnyCalendarKind::IslamicObservational => IslamicObservational.debug_name(),
+            AnyCalendarKind::IslamicObservational => IslamicObservational::DEBUG_NAME,
             AnyCalendarKind::IslamicTabular => IslamicTabular.debug_name(),
             AnyCalendarKind::IslamicUmmAlQura => IslamicUmmAlQura.debug_name(),
             AnyCalendarKind::Iso => Iso.debug_name(),
@@ -1231,10 +1233,10 @@ impl IntoAnyCalendar for IslamicCivil {
 
 impl IntoAnyCalendar for IslamicObservational {
     fn to_any(self) -> AnyCalendar {
-        AnyCalendar::IslamicObservational(IslamicObservational)
+        AnyCalendar::IslamicObservational(self)
     }
     fn to_any_cloned(&self) -> AnyCalendar {
-        AnyCalendar::IslamicObservational(IslamicObservational)
+        AnyCalendar::IslamicObservational(self.clone())
     }
     fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
         AnyDateInner::IslamicObservational(*d)

diff --git a/components/calendar/src/date.rs b/components/calendar/src/date.rs
@@ -322,6 +322,11 @@ impl<A: AsCalendar> Date<A> {
     pub fn calendar_wrapper(&self) -> &A {
         &self.calendar
     }
+
+    #[cfg(test)]
+    pub(crate) fn to_fixed(&self) -> calendrical_calculations::rata_die::RataDie {
+        Iso::fixed_from_iso(self.to_iso().inner)
+    }
 }
 
 impl<C: IntoAnyCalendar, A: AsCalendar<Calendar = C>> Date<A> {