mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1155081 - Part 4: Replace ThrowError with ThrowTypeError/ThrowRangeError in Intl.js. r=till

This commit is contained in:
Tooru Fujisawa 2015-04-20 13:58:16 +09:00
Родитель 4fd6bd1f84
Коммит a6dafbec45
1 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
js/src/builtin/Intl.js
Просмотреть файл

@ -843,7 +843,7 @@ function SupportedLocales(availableLocales, requestedLocales, options) {
if (matcher !== undefined) {
matcher = ToString(matcher);
if (matcher !== "lookup" && matcher !== "best fit")
ThrowError(JSMSG_INVALID_LOCALE_MATCHER, matcher);
ThrowRangeError(JSMSG_INVALID_LOCALE_MATCHER, matcher);
}
}
@ -888,7 +888,7 @@ function GetOption(options, property, type, values, fallback) {
// Step 2.d.
if (values !== undefined && callFunction(std_Array_indexOf, values, value) === -1)
ThrowError(JSMSG_INVALID_OPTION_VALUE, property, value);
ThrowRangeError(JSMSG_INVALID_OPTION_VALUE, property, value);
// Step 2.e.
return value;
@ -917,7 +917,7 @@ function GetNumberOption(options, property, minimum, maximum, fallback) {
if (value !== undefined) {
value = ToNumber(value);
if (Number_isNaN(value) || value < minimum || value > maximum)
ThrowError(JSMSG_INVALID_DIGITS_VALUE, value);
ThrowRangeError(JSMSG_INVALID_DIGITS_VALUE, value);
return std_Math_floor(value);
}
@ -1081,7 +1081,7 @@ function getIntlObjectInternals(obj, className, methodName) {
assert(internals === undefined || isInitializedIntlObject(obj), "bad mapping in internalsMap");
if (internals === undefined || internals.type !== className)
ThrowError(JSMSG_INTL_OBJECT_NOT_INITED, className, methodName, className);
ThrowTypeError(JSMSG_INTL_OBJECT_NOT_INITED, className, methodName, className);
return internals;
}
@ -1255,7 +1255,7 @@ function InitializeCollator(collator, locales, options) {
// Step 1.
if (isInitializedIntlObject(collator))
ThrowError(JSMSG_INTL_OBJECT_REINITED);
ThrowTypeError(JSMSG_INTL_OBJECT_REINITED);
// Step 2.
var internals = initializeIntlObject(collator);
@ -1597,7 +1597,7 @@ function InitializeNumberFormat(numberFormat, locales, options) {
// Step 1.
if (isInitializedIntlObject(numberFormat))
ThrowError(JSMSG_INTL_OBJECT_REINITED);
ThrowTypeError(JSMSG_INTL_OBJECT_REINITED);
// Step 2.
var internals = initializeIntlObject(numberFormat);
@ -1666,11 +1666,11 @@ function InitializeNumberFormat(numberFormat, locales, options) {
// Steps 17-20.
var c = GetOption(options, "currency", "string", undefined, undefined);
if (c !== undefined && !IsWellFormedCurrencyCode(c))
ThrowError(JSMSG_INVALID_CURRENCY_CODE, c);
ThrowRangeError(JSMSG_INVALID_CURRENCY_CODE, c);
var cDigits;
if (s === "currency") {
if (c === undefined)
ThrowError(JSMSG_UNDEFINED_CURRENCY);
ThrowTypeError(JSMSG_UNDEFINED_CURRENCY);
// Steps 20.a-c.
c = toASCIIUpperCase(c);
@ -2045,7 +2045,7 @@ function InitializeDateTimeFormat(dateTimeFormat, locales, options) {
// Step 1.
if (isInitializedIntlObject(dateTimeFormat))
ThrowError(JSMSG_INTL_OBJECT_REINITED);
ThrowTypeError(JSMSG_INTL_OBJECT_REINITED);
// Step 2.
var internals = initializeIntlObject(dateTimeFormat);
@ -2101,7 +2101,7 @@ function InitializeDateTimeFormat(dateTimeFormat, locales, options) {
if (tz !== undefined) {
tz = toASCIIUpperCase(ToString(tz));
if (tz !== "UTC")
ThrowError(JSMSG_INVALID_TIME_ZONE, tz);
ThrowRangeError(JSMSG_INVALID_TIME_ZONE, tz);
}
lazyDateTimeFormatData.timeZone = tz;