Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor TemporalFields interface and add FieldsKey enum #87

Merged
merged 6 commits into from
Jul 20, 2024
Merged

Refactor TemporalFields interface and add FieldsKey enum #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9207a8c
Refactor TemporalFields
nekevss Jul 20, 2024
8d242c2
Remove bitflags dependency
nekevss Jul 20, 2024
5895719
Revert to original struct and update interface
nekevss Jul 20, 2024
8846982
Add docs and hopefully clean up the diff a tad
nekevss Jul 20, 2024
8c2dad0
Add an updated version of missing fn
nekevss Jul 20, 2024
c5b03c2
Change name to be more explicit
nekevss Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 37 additions & 18 deletions src/components/calendar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ use crate::{
duration::{DateDuration, TimeDuration},
Date, DateTime, Duration, MonthDay, YearMonth,
},
fields::{TemporalFieldKey, TemporalFields},
iso::{IsoDate, IsoDateSlots},
options::{ArithmeticOverflow, TemporalUnit},
TemporalError, TemporalFields, TemporalResult,
TemporalError, TemporalResult,
};

use icu_calendar::{
Expand Down Expand Up @@ -290,21 +291,28 @@ impl Calendar {
// Resolve month and monthCode;
fields.iso_resolve_month()?;
return Date::new(
fields.year().unwrap_or(0),
fields.month().unwrap_or(0),
fields.day().unwrap_or(0),
fields.year.unwrap_or(0),
fields.month.unwrap_or(0),
fields.day.unwrap_or(0),
self.clone(),
overflow,
);
}

let era = Era::from_str(&fields.era.map_or(String::default(), |s| s.to_string()))
.map_err(|e| TemporalError::general(format!("{e:?}")))?;
let month_code = MonthCode(
fields
.month_code
.ok_or(TemporalError::range().with_message("No MonthCode provided."))?,
);
// NOTE: This might preemptively throw as `ICU4X` does not support constraining.
// Resolve month and monthCode;
let calendar_date = self.0.date_from_codes(
Era::from(fields.era()),
fields.year().unwrap_or(0),
MonthCode(fields.month_code()),
fields.day().unwrap_or(0) as u8,
era,
fields.year.unwrap_or(0),
month_code,
fields.day.unwrap_or(0) as u8,
)?;
let iso = self.0.date_to_iso(&calendar_date);
Date::new(
Expand All @@ -325,8 +333,8 @@ impl Calendar {
if self.is_iso() {
fields.iso_resolve_month()?;
return MonthDay::new(
fields.month().unwrap_or(0),
fields.day().unwrap_or(0),
fields.month.unwrap_or(0),
fields.day.unwrap_or(0),
self.clone(),
overflow,
);
Expand All @@ -346,20 +354,28 @@ impl Calendar {
if self.is_iso() {
fields.iso_resolve_month()?;
return YearMonth::new(
fields.year().unwrap_or(0),
fields.month().unwrap_or(0),
fields.day(),
fields.year.unwrap_or(0),
fields.month.unwrap_or(0),
fields.day,
self.clone(),
overflow,
);
}

let era = Era::from_str(&fields.era.map_or(String::default(), |s| s.to_string()))
.map_err(|e| TemporalError::general(format!("{e:?}")))?;
let month_code = MonthCode(
fields
.month_code
.ok_or(TemporalError::range().with_message("No MonthCode provided."))?,
);

// NOTE: This might preemptively throw as `ICU4X` does not support regulating.
let calendar_date = self.0.date_from_codes(
Era::from(fields.era()),
fields.year().unwrap_or(0),
MonthCode(fields.month_code()),
fields.day().unwrap_or(1) as u8,
era,
fields.year.unwrap_or(0),
month_code,
fields.day.unwrap_or(1) as u8,
)?;
let iso = self.0.date_to_iso(&calendar_date);
YearMonth::new(
Expand Down Expand Up @@ -604,7 +620,10 @@ impl Calendar {
}

/// Provides field keys to be ignored depending on the calendar.
pub fn field_keys_to_ignore(&self, _keys: &[String]) -> TemporalResult<Vec<String>> {
pub fn field_keys_to_ignore(
&self,
_keys: &[TemporalFieldKey],
) -> TemporalResult<Vec<TemporalFieldKey>> {
// TODO: Research and implement the appropriate KeysToIgnore for all `BuiltinCalendars.`
Err(TemporalError::range().with_message("FieldKeysToIgnore is not yet implemented."))
}
Expand Down
Loading