diff options
Diffstat (limited to 'src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs')
| -rw-r--r-- | src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs b/src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs index 94b235085e..06e7c7d75a 100644 --- a/src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs +++ b/src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs @@ -4,6 +4,7 @@ namespace System.Globalization { using System; + using System.Diagnostics; using System.Diagnostics.Contracts; @@ -338,9 +339,9 @@ namespace System.Globalization { =========================ConvertHijriToGregorian============================*/ static void ConvertHijriToGregorian(int HijriYear, int HijriMonth, int HijriDay, ref int yg, ref int mg, ref int dg) { - Contract.Assert( (HijriYear >= MinCalendarYear) && (HijriYear <= MaxCalendarYear), "Hijri year is out of range."); - Contract.Assert( HijriMonth >= 1, "Hijri month is out of range."); - Contract.Assert( HijriDay >= 1, "Hijri day is out of range."); + Debug.Assert( (HijriYear >= MinCalendarYear) && (HijriYear <= MaxCalendarYear), "Hijri year is out of range."); + Debug.Assert( HijriMonth >= 1, "Hijri month is out of range."); + Debug.Assert( HijriDay >= 1, "Hijri day is out of range."); int index, b, nDays = HijriDay-1; DateTime dt; @@ -392,7 +393,7 @@ namespace System.Globalization { static internal void CheckEraRange(int era) { if (era != CurrentEra && era != UmAlQuraEra) { - throw new ArgumentOutOfRangeException("era", Environment.GetResourceString("ArgumentOutOfRange_InvalidEraValue")); + throw new ArgumentOutOfRangeException(nameof(era), Environment.GetResourceString("ArgumentOutOfRange_InvalidEraValue")); } } @@ -400,7 +401,7 @@ namespace System.Globalization { CheckEraRange(era); if (year < MinCalendarYear || year > MaxCalendarYear) { throw new ArgumentOutOfRangeException( - "year", + nameof(year), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Range"), @@ -412,7 +413,7 @@ namespace System.Globalization { static internal void CheckYearMonthRange(int year, int month, int era) { CheckYearRange(year, era); if (month < 1 || month > 12) { - throw new ArgumentOutOfRangeException("month", Environment.GetResourceString("ArgumentOutOfRange_Month")); + throw new ArgumentOutOfRangeException(nameof(month), Environment.GetResourceString("ArgumentOutOfRange_Month")); } } @@ -430,7 +431,7 @@ namespace System.Globalization { TimeSpan ts; int yh1=0, mh1=0, dh1=0; - Contract.Assert((time.Ticks >= minDate.Ticks) && (time.Ticks <= maxDate.Ticks), "Gregorian date is out of range."); + Debug.Assert((time.Ticks >= minDate.Ticks) && (time.Ticks <= maxDate.Ticks), "Gregorian date is out of range."); // Find the index where we should start our search by quessing the Hijri year that we will be in HijriYearInfo. // A Hijri year is 354 or 355 days. Use 355 days so that we will search from a lower index. @@ -528,7 +529,7 @@ namespace System.Globalization { public override DateTime AddMonths(DateTime time, int months) { if (months < -120000 || months > 120000) { throw new ArgumentOutOfRangeException( - "months", + nameof(months), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Range"), @@ -631,7 +632,7 @@ namespace System.Globalization { { int days = 0, b; - Contract.Assert( (year >= MinCalendarYear) && (year <= MaxCalendarYear), "Hijri year is out of range."); + Debug.Assert( (year >= MinCalendarYear) && (year <= MaxCalendarYear), "Hijri year is out of range."); b = HijriYearInfo[year-MinCalendarYear].HijriMonthsLengthFlags; @@ -640,7 +641,7 @@ namespace System.Globalization { days += 29 + (b & 0x1); b = b >> 1; } - Contract.Assert((days == 354)||(days == 355), "Hijri year has to be 354 or 355 days."); + Debug.Assert((days == 354)||(days == 355), "Hijri year has to be 354 or 355 days."); return days; } @@ -712,7 +713,7 @@ namespace System.Globalization { int daysInMonth = GetDaysInMonth(year, month, era); if (day < 1 || day > daysInMonth) { throw new ArgumentOutOfRangeException( - "day", + nameof(day), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Day"), @@ -774,7 +775,7 @@ namespace System.Globalization { if (day < 1 || day > daysInMonth) { BCLDebug.Log("year = " + year + ", month = " + month + ", day = " + day); throw new ArgumentOutOfRangeException( - "day", + nameof(day), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Day"), @@ -806,7 +807,7 @@ DayInRang: set { if (value != 99 && (value < MinCalendarYear || value > MaxCalendarYear)) { throw new ArgumentOutOfRangeException( - "value", + nameof(value), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Range"), @@ -824,7 +825,7 @@ DayInRang: public override int ToFourDigitYear(int year) { if (year < 0) { - throw new ArgumentOutOfRangeException("year", + throw new ArgumentOutOfRangeException(nameof(year), Environment.GetResourceString("ArgumentOutOfRange_NeedNonNegNum")); } Contract.EndContractBlock(); @@ -835,7 +836,7 @@ DayInRang: if ((year < MinCalendarYear) || (year > MaxCalendarYear)) { throw new ArgumentOutOfRangeException( - "year", + nameof(year), String.Format( CultureInfo.CurrentCulture, Environment.GetResourceString("ArgumentOutOfRange_Range"), |