Bug 1974768 - Part 2: Update era codes. r=spidermonkey-reviewers,dminor

Update era codes to sync with <tc39/proposal-intl-era-monthcode#39>:
- Hijri calendars now have an inverse era `bh`.
- Era names matching the calendar name have been removed.

Differential Revision: https://phabricator.services.mozilla.com/D255510

Author: anba

js/src/builtin/temporal/Calendar.cpp

@@ -2449,19 +2449,6 @@ static bool CalendarResolveFields(JSContext* cx, CalendarId calendar,
   return true;
 }
 
-static bool IsIslamicCalendar(CalendarId id) {
-  switch (id) {
-    case CalendarId::Islamic:
-    case CalendarId::IslamicCivil:
-    case CalendarId::IslamicRGSA:
-    case CalendarId::IslamicTabular:
-    case CalendarId::IslamicUmmAlQura:
-      return true;
-    default:
-      return false;
-  }
-}
-
 /**
  * CalendarISOToDate ( calendar, isoDate )
  *
@@ -2484,12 +2471,6 @@ bool js::temporal::CalendarEra(JSContext* cx, Handle<CalendarValue> calendar,
     return true;
   }
 
-  if (IsIslamicCalendar(calendarId)) {
-    // ICU4X Hijri calender has inverted era year.
-    result.setUndefined();
-    return true;
-  }
-
   auto cal = CreateICU4XCalendar(calendarId);
   auto dt = CreateICU4XDate(cx, date, calendarId, cal.get());
   if (!dt) {
@@ -2533,12 +2514,6 @@ bool js::temporal::CalendarEraYear(JSContext* cx,
     return true;
   }
 
-  if (IsIslamicCalendar(calendarId)) {
-    // ICU4X Hijri calender has inverted era year.
-    result.setUndefined();
-    return true;
-  }
-
   auto cal = CreateICU4XCalendar(calendarId);
   auto dt = CreateICU4XDate(cx, date, calendarId, cal.get());
   if (!dt) {

js/src/builtin/temporal/Era.h

@@ -63,29 +63,21 @@ inline constexpr auto Empty = {
 };
 
 inline constexpr auto Gregorian = {
-    "gregory"sv,
     "ce"sv,
     "ad"sv,
 };
 
 inline constexpr auto GregorianInverse = {
-    "gregory-inverse"sv,
-    "bc"sv,
     "bce"sv,
+    "bc"sv,
 };
 
-inline constexpr auto Japanese = {
-    "japanese"sv,
-    "gregory"sv,
-    "ad"sv,
-    "ce"sv,
+inline constexpr auto Islamic = {
+    "ah"sv,
 };
 
-inline constexpr auto JapaneseInverse = {
-    "japanese-inverse"sv,
-    "gregory-inverse"sv,
-    "bc"sv,
-    "bce"sv,
+inline constexpr auto IslamicInverse = {
+    "bh"sv,
 };
 
 inline constexpr auto JapaneseMeiji = {
@@ -114,8 +106,9 @@ inline constexpr auto ROC = {
 };
 
 inline constexpr auto ROCInverse = {
-    "roc-inverse"sv,
+    "broc"sv,
     "before-roc"sv,
+    "minguo-qian"sv,
 };
 }  // namespace names
 }  // namespace eras
@@ -164,11 +157,6 @@ constexpr auto& CalendarEraNames(CalendarId calendar, EraCode era) {
     case CalendarId::EthiopianAmeteAlem:
     case CalendarId::Hebrew:
     case CalendarId::Indian:
-    case CalendarId::Islamic:
-    case CalendarId::IslamicCivil:
-    case CalendarId::IslamicRGSA:
-    case CalendarId::IslamicTabular:
-    case CalendarId::IslamicUmmAlQura:
     case CalendarId::Persian:
       return eras::names::Empty;
 
@@ -178,12 +166,22 @@ constexpr auto& CalendarEraNames(CalendarId calendar, EraCode era) {
                                       : eras::names::GregorianInverse;
     }
 
+    case CalendarId::Islamic:
+    case CalendarId::IslamicCivil:
+    case CalendarId::IslamicRGSA:
+    case CalendarId::IslamicTabular:
+    case CalendarId::IslamicUmmAlQura: {
+      MOZ_ASSERT(era == EraCode::Standard || era == EraCode::Inverse);
+      return era == EraCode::Standard ? eras::names::Islamic
+                                      : eras::names::IslamicInverse;
+    }
+
     case CalendarId::Japanese: {
       switch (era) {
         case EraCode::Standard:
-          return eras::names::Japanese;
+          return eras::names::Gregorian;
         case EraCode::Inverse:
-          return eras::names::JapaneseInverse;
+          return eras::names::GregorianInverse;
         case EraCode::Meiji:
           return eras::names::JapaneseMeiji;
         case EraCode::Taisho:
@@ -225,17 +223,17 @@ constexpr bool CalendarEraStartsAtYearBoundary(CalendarId id) {
     case CalendarId::EthiopianAmeteAlem:
     case CalendarId::Hebrew:
     case CalendarId::Indian:
-    case CalendarId::Islamic:
-    case CalendarId::IslamicCivil:
-    case CalendarId::IslamicRGSA:
-    case CalendarId::IslamicTabular:
-    case CalendarId::IslamicUmmAlQura:
     case CalendarId::Persian:
       return true;
 
     // Calendar system which use multiple eras, but each era starts at a year
     // boundary.
     case CalendarId::Gregorian:
+    case CalendarId::Islamic:
+    case CalendarId::IslamicCivil:
+    case CalendarId::IslamicRGSA:
+    case CalendarId::IslamicTabular:
+    case CalendarId::IslamicUmmAlQura:
     case CalendarId::ROC:
       return true;
 

js/src/tests/jstests.list

@@ -948,3 +948,12 @@ skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-ethiopic.js
 
 # https://github.com/tc39/proposal-intl-era-monthcode/issues/23 and https://github.com/tc39/proposal-intl-era-monthcode/issues/4
 skip script test262/staging/sm/Temporal/PlainDate/non-positive-era-year.js
+
+# Canonical era names have changed.
+skip script test262/intl402/Temporal/ZonedDateTime/from/canonicalize-era-codes.js 
+skip script test262/staging/Intl402/Temporal/old/japanese-before-era.js
+skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-gregory.js
+skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-islamicc.js
+skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-islamic-civil.js
+skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-islamic-tbla.js
+skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-islamic-umalqura.js