RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:17:35 +00:00
Code Issues Activity Actions

LibJS: Align ToDurationRecord with ToTemporalDurationRecord

Browse source 
This is an editorial change in the Intl.DurationFormat proposal. See:
527ea58
This commit is contained in:
Timothy Flynn 2022-08-30 11:19:43 -04:00 • committed by Tim Flynn
parent a28ff92106
commit f8c51fec1d
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Libraries/LibJS/Runtime/Intl/DurationFormat.cpp
View file

@ -139,39 +139,34 @@ ThrowCompletionOr<Temporal::DurationRecord> to_duration_record(VM& vm, Value inp
return vm.throw_completion<TypeError>(ErrorType::NotAnObject, input); return vm.throw_completion<TypeError>(ErrorType::NotAnObject, input);
auto& input_object = input.as_object(); auto& input_object = input.as_object();
// 2. Let result be a new Record. // 2. Let result be a new Duration Record with each field set to 0.
Temporal::DurationRecord result; Temporal::DurationRecord result = {};
// 3. Let any be false. // 3. Let any be false.
auto any = false; auto any = false;
// 4. For each row in Table 1, except the header row, in table order, do // 4. For each row in Table 1, except the header row, in table order, do
for (auto const& duration_instances_component : duration_instances_components) { for (auto const& duration_instances_component : duration_instances_components) {
// a. Let valueSlot be the Value Slot value. // a. Let valueSlot be the Value Slot value of the current row.
auto value_slot = duration_instances_component.value_slot; auto value_slot = duration_instances_component.value_slot;
// b. Let unit be the Unit value. // b. Let unit be the Unit value of the current row.
auto unit = duration_instances_component.unit; auto unit = duration_instances_component.unit;
// c. Let value be ? Get(input, unit). // c. Let value be ? Get(input, unit).
auto value = TRY(input_object.get(FlyString(unit))); auto value = TRY(input_object.get(FlyString(unit)));
double value_number;
// d. If value is not undefined, then // d. If value is not undefined, then
if (!value.is_undefined()) { if (!value.is_undefined()) {
// i. Set any to true. // i. Set any to true.
any = true; any = true;
// ii. Set value to ? ToIntegerWithoutRounding(value).
value_number = TRY(Temporal::to_integer_without_rounding(vm, value, ErrorType::TemporalInvalidDurationPropertyValueNonIntegral, unit, value));
}
// e. Else,
else {
// i. Set value to 0.
value_number = 0;
}
// f. Set the field of result whose name is valueSlot to value. // ii. Set value to ? ToIntegerWithoutRounding(value).
result.*value_slot = value_number; auto value_number = TRY(Temporal::to_integer_without_rounding(vm, value, ErrorType::TemporalInvalidDurationPropertyValueNonIntegral, unit, value));
// iii. Set result.[[<valueSlot>]] to value.
result.*value_slot = value_number;
}
} }
// 5. If any is false, throw a TypeError exception. // 5. If any is false, throw a TypeError exception.