Skip to content

Fix up eras, correctly expose arithmetic year #424

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

Merged
Manishearth merged 4 commits into from
Jul 20, 2025
+229 −173
Merged

Fix up eras, correctly expose arithmetic year #424

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05bd9d3
Allow specifying both year and era/eraYear in EraYear::try_from_parti…
Manishearth Jul 19, 2025
8b38b69
Use None eras for era-less calendars (ISO, Chinese, Dangi)
Manishearth Jul 19, 2025
244373d
Merge remote-tracking branch 'origin/main' into extended-year
Manishearth Jul 20, 2025
2ff444b
fix error
Manishearth Jul 20, 2025
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
86 changes: 34 additions & 52 deletions src/builtins/core/calendar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl Calendar {
let calendar_date = self
.0
.from_codes(
Some(resolved_fields.era_year.era.0.as_str()),
resolved_fields.era_year.era.as_ref().map(|e| e.0.as_str()),
resolved_fields.era_year.year,
IcuMonthCode(resolved_fields.month_code.0),
resolved_fields.day,
Expand Down Expand Up @@ -272,7 +272,7 @@ impl Calendar {
let calendar_date = self
.0
.from_codes(
Some(resolved_fields.era_year.era.0.as_str()),
resolved_fields.era_year.era.as_ref().map(|e| e.0.as_str()),
resolved_fields.era_year.year,
IcuMonthCode(resolved_fields.month_code.0),
resolved_fields.day,
Expand Down Expand Up @@ -361,13 +361,13 @@ impl Calendar {
.map(|era_info| era_info.year)
}

/// `CalendarYear`
/// `CalendarArithmeticYear`
pub fn year(&self, iso_date: &IsoDate) -> i32 {
if self.is_iso() {
return iso_date.year;
}
let calendar_date = self.0.from_iso(*iso_date.to_icu4x().inner());
self.0.year_info(&calendar_date).era_year_or_related_iso()
self.0.extended_year(&calendar_date)
}

/// `CalendarMonth`
Expand Down Expand Up @@ -493,19 +493,10 @@ impl Calendar {
impl Calendar {
pub(crate) fn get_era_info(&self, era_alias: &TinyAsciiStr<19>) -> Option<EraInfo> {
match self.0 .0.kind() {
AnyCalendarKind::Buddhist if era::BUDDHIST_ERA_IDENTIFIERS.contains(era_alias) => {
AnyCalendarKind::Buddhist if *era_alias == tinystr!(19, "be") => {
Some(era::BUDDHIST_ERA)
}
AnyCalendarKind::Chinese if *era_alias == tinystr!(19, "chinese") => {
Some(era::CHINESE_ERA)
}
AnyCalendarKind::Coptic if *era_alias == tinystr!(19, "coptic") => {
Some(era::COPTIC_ERA)
}
AnyCalendarKind::Coptic if *era_alias == tinystr!(19, "coptic-inverse") => {
Some(era::COPTIC_INVERSE_ERA)
}
AnyCalendarKind::Dangi if *era_alias == tinystr!(19, "dangi") => Some(era::DANGI_ERA),
AnyCalendarKind::Coptic if *era_alias == tinystr!(19, "am") => Some(era::COPTIC_ERA),
AnyCalendarKind::Ethiopian if era::ETHIOPIC_ERA_IDENTIFIERS.contains(era_alias) => {
Some(era::ETHIOPIC_ERA)
}
Expand All @@ -527,34 +518,24 @@ impl Calendar {
{
Some(era::GREGORY_INVERSE_ERA)
}
AnyCalendarKind::Hebrew if era::HEBREW_ERA_IDENTIFIERS.contains(era_alias) => {
Some(era::HEBREW_ERA)
}
AnyCalendarKind::Indian if era::INDIAN_ERA_IDENTIFIERS.contains(era_alias) => {
Some(era::INDIAN_ERA)
}
// TODO: Determine whether observational is islamic or islamic-rgsa
AnyCalendarKind::Hebrew if *era_alias == tinystr!(19, "am") => Some(era::HEBREW_ERA),
AnyCalendarKind::Indian if *era_alias == tinystr!(19, "shaka") => Some(era::INDIAN_ERA),
AnyCalendarKind::HijriTabularTypeIIFriday
if era::ISLAMIC_CIVIL_ERA_IDENTIFIERS.contains(era_alias) =>
{
Some(era::ISLAMIC_CIVIL_ERA)
}
AnyCalendarKind::HijriSimulatedMecca
if era::ISLAMIC_ERA_IDENTIFIERS.contains(era_alias) =>
| AnyCalendarKind::HijriSimulatedMecca
| AnyCalendarKind::HijriTabularTypeIIThursday
| AnyCalendarKind::HijriUmmAlQura
if *era_alias == tinystr!(19, "ah") =>
{
Some(era::ISLAMIC_ERA)
}
AnyCalendarKind::HijriTabularTypeIIThursday
if era::ISLAMIC_TBLA_ERA_IDENTIFIERS.contains(era_alias) =>
{
Some(era::ISLAMIC_TBLA_ERA)
}
AnyCalendarKind::HijriUmmAlQura
if era::ISLAMIC_UMALQURA_ERA_IDENTIFIERS.contains(era_alias) =>
AnyCalendarKind::HijriTabularTypeIIFriday
| AnyCalendarKind::HijriSimulatedMecca
| AnyCalendarKind::HijriTabularTypeIIThursday
| AnyCalendarKind::HijriUmmAlQura
if *era_alias == tinystr!(19, "bh") =>
{
Some(era::ISLAMIC_UMALQURA_ERA)
Some(era::ISLAMIC_INVERSE_ERA)
}
AnyCalendarKind::Iso if *era_alias == tinystr!(19, "default") => Some(era::ISO_ERA),
AnyCalendarKind::Japanese if *era_alias == tinystr!(19, "heisei") => {
Some(era::HEISEI_ERA)
}
Expand All @@ -566,8 +547,8 @@ impl Calendar {
{
Some(era::JAPANESE_INVERSE_ERA)
}
AnyCalendarKind::Japanese if *era_alias == tinystr!(19, "mejei") => {
Some(era::MEJEI_ERA)
AnyCalendarKind::Japanese if *era_alias == tinystr!(19, "meiji") => {
Copy link
Copy Markdown
Member

@nekevss nekevss Jul 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱 nice catch!

Some(era::MEIJI_ERA)
}
AnyCalendarKind::Japanese if *era_alias == tinystr!(19, "reiwa") => {
Some(era::REIWA_ERA)
Expand All @@ -578,13 +559,9 @@ impl Calendar {
AnyCalendarKind::Japanese if *era_alias == tinystr!(19, "taisho") => {
Some(era::TAISHO_ERA)
}
AnyCalendarKind::Persian if era::PERSIAN_ERA_IDENTIFIERS.contains(era_alias) => {
Some(era::PERSIAN_ERA)
}
AnyCalendarKind::Roc if era::ROC_ERA_IDENTIFIERS.contains(era_alias) => {
Some(era::ROC_ERA)
}
AnyCalendarKind::Roc if era::ROC_INVERSE_ERA_IDENTIFIERS.contains(era_alias) => {
AnyCalendarKind::Persian if *era_alias == tinystr!(19, "ap") => Some(era::PERSIAN_ERA),
AnyCalendarKind::Roc if *era_alias == tinystr!(19, "roc") => Some(era::ROC_ERA),
AnyCalendarKind::Roc if *era_alias == tinystr!(19, "broc") => {
Some(era::ROC_INVERSE_ERA)
}
_ => None,
Expand All @@ -594,17 +571,22 @@ impl Calendar {
pub(crate) fn get_calendar_default_era(&self) -> Option<EraInfo> {
match self.0 .0.kind() {
AnyCalendarKind::Buddhist => Some(era::BUDDHIST_ERA),
AnyCalendarKind::Chinese => Some(era::CHINESE_ERA),
AnyCalendarKind::Dangi => Some(era::DANGI_ERA),
AnyCalendarKind::Chinese => None,
AnyCalendarKind::Coptic => Some(era::COPTIC_ERA),
AnyCalendarKind::Dangi => None,
AnyCalendarKind::Ethiopian => Some(era::ETHIOPIC_ERA),
AnyCalendarKind::EthiopianAmeteAlem => Some(era::ETHIOAA_ERA),
AnyCalendarKind::Gregorian => Some(era::GREGORY_ERA),
AnyCalendarKind::Hebrew => Some(era::HEBREW_ERA),
AnyCalendarKind::Indian => Some(era::INDIAN_ERA),
AnyCalendarKind::HijriSimulatedMecca => Some(era::ISLAMIC_ERA),
AnyCalendarKind::HijriTabularTypeIIFriday => Some(era::ISLAMIC_CIVIL_ERA),
AnyCalendarKind::HijriTabularTypeIIThursday => Some(era::ISLAMIC_TBLA_ERA),
AnyCalendarKind::HijriUmmAlQura => Some(era::ISLAMIC_UMALQURA_ERA),
AnyCalendarKind::Iso => Some(era::ISO_ERA),
AnyCalendarKind::HijriTabularTypeIIFriday => Some(era::ISLAMIC_ERA),
AnyCalendarKind::HijriTabularTypeIIThursday => Some(era::ISLAMIC_ERA),
AnyCalendarKind::HijriUmmAlQura => Some(era::ISLAMIC_ERA),
AnyCalendarKind::Iso => None,
AnyCalendarKind::Japanese => Some(era::JAPANESE_ERA),
AnyCalendarKind::Persian => Some(era::PERSIAN_ERA),
AnyCalendarKind::Roc => Some(era::ROC_ERA),
_ => None,
}
}
Expand Down
Loading
Loading