Skip to content

Commit bed094f

Browse files
LeeHayunzherczeg
authored andcommitted
Fixes the bug of ecma_date_make_day() (#1836) & ecma_date_week_day(). (#1466)
The ecma_date_make_day() handled any date in October on leap years incorrectly, which was mentioned in issue #1836. The ecma_date_week_day() returned minus values when return week_day before 1970 years which was also incorrect. This change solves these bugs. In addition, this enhances the algorithm of accessing 'the ym-mn-1' by replacing binary search to simple computation at ecma_date_make_day(). JerryScript-DCO-1.0-Signed-off-by: Hayun Lee lhy920806@gmail.com
1 parent 4ef3c0c commit bed094f

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ ecma_date_week_day (ecma_number_t time) /**< time value */
432432
return time; /* time is NaN */
433433
}
434434

435-
return (ecma_number_t) fmod ((ecma_date_day (time) + 4), 7);
435+
ecma_number_t week_day = (ecma_number_t) fmod ((ecma_date_day (time) + 4), 7);
436+
return (week_day < 0) ? 7 + week_day : week_day;
436437
} /* ecma_date_week_day */
437438

438439
/**
@@ -752,45 +753,19 @@ ecma_date_make_day (ecma_number_t year, /**< year value */
752753

753754
/* 7. */
754755
ecma_number_t time = ecma_date_time_from_year (ym);
755-
int32_t step = 182;
756-
int32_t delta = step;
757756

758757
/**
759758
* The algorithm below searches the following date: ym-mn-1
760759
* To find this time it starts from the beggining of the year (ym)
761-
* then increase it by ECMA_DATE_MS_PER_DAY until it reaches the
762-
* right date.
760+
* then find the first day of the month.
763761
*/
764762
if (ecma_date_year_from_time (time) == ym)
765763
{
766-
/**
767-
* Binary search to get the closest day in the previous month.
768-
* It has to use integer days so sometimes the found time
769-
* needs some more increasing which is done day by day below.
770-
*/
771-
while (delta)
772-
{
773-
if (ecma_date_month_from_time (time + step * ECMA_DATE_MS_PER_DAY) < mn)
774-
{
775-
step += delta;
776-
}
777-
else
778-
{
779-
step -= delta;
780-
}
781-
delta = delta / 2;
782-
}
783-
784-
if (ecma_date_month_from_time (time + step) < mn)
785-
{
786-
time += step * ECMA_DATE_MS_PER_DAY;
787-
}
764+
/* Get the month */
765+
time += 31 * mn * ECMA_DATE_MS_PER_DAY;
788766

789767
/* Get the month's first day */
790-
while (ecma_date_month_from_time (time) < mn)
791-
{
792-
time += ECMA_DATE_MS_PER_DAY;
793-
}
768+
time += ((ecma_number_t) 1.0 - ecma_date_date_from_time (time)) * ECMA_DATE_MS_PER_DAY;
794769

795770
if (ecma_date_month_from_time (time) == mn && ecma_date_date_from_time (time) == 1)
796771
{
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2016 Hayun Lee (lhy920806@gmail.com)
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
for (var y = 1950; y < 2050; y++) {
16+
for (var m = 0; m < 12; m++) {
17+
var last_date = new Date(y, m, 1).getDay ();
18+
assert (!isNaN (last_date));
19+
for (var d = 1; d < 32; d++) {
20+
assert (last_date == new Date(y, m, d).getDay ());
21+
last_date = (last_date + 1) % 7;
22+
}
23+
}
24+
}

tests/unit/test-date-helpers.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ main ()
162162
TEST_ASSERT (ecma_date_make_day (1970, 1, 35) == 65);
163163
TEST_ASSERT (ecma_date_make_day (1970, 13, 35) == 430);
164164
TEST_ASSERT (ecma_date_make_day (2016, 2, 1) == 16861);
165+
TEST_ASSERT (ecma_date_make_day (2016, 8, 31) == 17075);
166+
TEST_ASSERT (ecma_date_make_day (2016, 9, 1) == 17075);
165167

166168
/* ecma_number_t ecma_date_make_date (day, time) */
167169

0 commit comments

Comments
 (0)