Skip to content

Commit d1c4faf

Browse files
dilijevdilijev
committed
[1.8>1.9] [MERGE #4318 @xiaoyinl] Make Date.parse recognize padded and negative years (Fixes #4178)
Merge pull request #4318 from xiaoyinl:DateParse_zero_padded_years This PR will finally make `Date.parse` able to parse any output of `Date.toString()`, `Date.toUTCString`, and `Date.toISOString()`. Fixes #4178 Fixes #4300 Todo: - [x] Add, update and re-enable tests (#4300) - [x] `new Date("2017-jan-01")` causes an assertion failure
2 parents d7d99e1 + 55e9c9d commit d1c4faf

6 files changed

Lines changed: 176 additions & 13 deletions

File tree

‎lib/Runtime/Library/DateImplementation.cpp‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ namespace Js {
10431043

10441044
char16 *pchBase;
10451045
char16 *pch;
1046-
char16 *pchEndOfDigits = nullptr;
10471046
char16 ch;
10481047
char16 *pszSrc = nullptr;
10491048

@@ -1067,6 +1066,7 @@ namespace Js {
10671066
int tAmPm = 0;
10681067
int tBcAd = 0;
10691068

1069+
size_t numOfDigits = 0;
10701070
double tv = JavascriptNumber::NaN; // Initialized for error handling.
10711071

10721072
//Create a copy to analyze
@@ -1080,6 +1080,7 @@ namespace Js {
10801080
_wcslwr_s(pszSrc,ulength+1);
10811081
bool isDateNegativeVersion5 = false;
10821082
bool isNextFieldDateNegativeVersion5 = false;
1083+
bool isZeroPaddedYear = false;
10831084
const Js::CharClassifier *classifier = scriptContext->GetCharClassifier();
10841085
#pragma prefast(suppress: __WARNING_INCORRECT_VALIDATION, "pch is guaranteed to be null terminated by __in_z on psz and js_memcpy_s copying the null byte")
10851086
for (pch = pszSrc; 0 != (ch = classifier->SkipBiDirectionalChars(pch));)
@@ -1235,6 +1236,12 @@ namespace Js {
12351236
goto LError;
12361237
}
12371238
lwMonth = pszs->lwVal;
1239+
if ('-' == *pch)
1240+
{
1241+
// handle the case date is negative for "Thu, 23 Sep -0007 00:00:00 GMT"
1242+
isDateNegativeVersion5 = true;
1243+
pch++;
1244+
}
12381245
break;
12391246
}
12401247
case ParseStringTokenType::Zone:
@@ -1269,7 +1276,7 @@ namespace Js {
12691276
lwT = lwT * 10 + *pch - '0';
12701277
}
12711278

1272-
pchEndOfDigits = pch;
1279+
numOfDigits = pch - pchBase;
12731280
// skip to the next real character
12741281
while (0 != (ch = *pch) && (ch <= ' ' || classifier->IsBiDirectionalChar(ch)))
12751282
{
@@ -1317,7 +1324,6 @@ namespace Js {
13171324
{
13181325
AssertMsg(isNextFieldDateNegativeVersion5 == false, "isNextFieldDateNegativeVersion5 == false");
13191326

1320-
size_t numOfDigits = static_cast<size_t>(pchEndOfDigits - pchBase);
13211327
if (numOfDigits <= 1)
13221328
{
13231329
// 1 digit only, treat it as hundreds
@@ -1395,14 +1401,19 @@ namespace Js {
13951401
AssertMsg(isDateNegativeVersion5 == false, "lwYear should be positive as pre-version:5 parsing");
13961402
lwYear = lwT;
13971403
ss = ssNil;
1404+
if (lwT < 1000 && numOfDigits >= 4)
1405+
{
1406+
isZeroPaddedYear = true;
1407+
}
13981408
break;
13991409
}
14001410
default:
14011411
{
14021412
// assumptions for getting a YEAR:
14031413
// - an absolute value greater or equal than 70 (thus not hour!)
14041414
// - wasn't preceded by negative sign for -version:5 year format
1405-
if (lwT >= 70 || isNextFieldDateNegativeVersion5)
1415+
// - lwT has at least 4 digits (e.g. 0017 is year 17 AD)
1416+
if (lwT >= 70 || isNextFieldDateNegativeVersion5 || numOfDigits >= 4)
14061417
{
14071418
// assume it's a year - this is used particularly as version:5 year parsing
14081419
if (lwNil != lwYear)
@@ -1412,6 +1423,11 @@ namespace Js {
14121423
lwYear = isDateNegativeVersion5 ? -lwT : lwT;
14131424
isNextFieldDateNegativeVersion5 = false;
14141425

1426+
if (lwT < 1000 && numOfDigits >= 4)
1427+
{
1428+
isZeroPaddedYear = true;
1429+
}
1430+
14151431
if (FDateDelimiter(ch))
14161432
{
14171433
// Mark the next token as the month so that it won't be confused with another token.
@@ -1499,11 +1515,11 @@ namespace Js {
14991515
lwYear = -lwYear + 1;
15001516
}
15011517
}
1502-
else if (lwYear < 50 && isDateNegativeVersion5 == false)
1518+
else if (lwYear < 50 && isDateNegativeVersion5 == false && isZeroPaddedYear == false)
15031519
{
15041520
lwYear += 2000;
15051521
}
1506-
else if (lwYear < 100 && isDateNegativeVersion5 == false)
1522+
else if (lwYear < 100 && isDateNegativeVersion5 == false && isZeroPaddedYear == false)
15071523
{
15081524
lwYear += 1900;
15091525
}

‎test/Date/DateParse2.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
myPrint("A --");
99
testDate(new Date(-2012, 1, 2, 1, 2, 3));
1010
testParseDate(new Date(-2012, 1, 2, 1, 2, 3).toString());
11-
// Disabled due to https://github.com/Microsoft/ChakraCore/issues/4300
12-
//testParseDate(new Date(-2012, 1, 2, 1, 2, 3).toUTCString());
11+
testParseDate(new Date(-2012, 1, 2, 1, 2, 3).toUTCString());
1312
testParseDate(new Date(-2012, 1, 2, 1, 2, 3).toISOString());
1413

1514
myPrint("B --");
@@ -27,7 +26,7 @@ testParseDate(new Date(99999, 1, 2, 1, 2, 3).toISOString());
2726
myPrint("D --");
2827
testDate(new Date(-99999, 1, 2, 1, 2, 3));
2928
testParseDate(new Date(-99999, 1, 2, 1, 2, 3).toString());
30-
//testParseDate(new Date(-99999, 1, 2, 1, 2, 3).toUTCString());
29+
testParseDate(new Date(-99999, 1, 2, 1, 2, 3).toUTCString());
3130
testParseDate(new Date(-99999, 1, 2, 1, 2, 3).toISOString());
3231

3332
myPrint("E --");
@@ -50,6 +49,10 @@ testParseDate("Tue Feb 02 2012 01:02:03 GMT-0000");
5049
testParseDate("Tue Feb 02 2012 01:02:03 GMT+0430 (prisec@)");
5150
testParseDate("Tue Feb 2 01:02:03 PST 2013 B.C.");
5251
testParseDate("Thu Feb 2 01:02:03 PST 2012");
52+
testParseDate("Thu, 23 Sep -");
53+
testParseDate("Thu, 23 Sep-");
54+
testParseDate("Tue Feb 02 -");
55+
testParseDate("Tue Feb 02-");
5356

5457
function CUT_NAME(str) {
5558
return str.replace("(PST)", "(Pacific Standard Time)")

‎test/Date/DateParse2.v5.baseline‎

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ Date string: Tue Feb 02 -2012 01:02:03 GMT-0800 (Pacific Standard Time)
2020
-2012/1/2
2121
1:2:3.0
2222

23+
Date string: Tue, 02 Feb -2012 09:02:03 GMT
24+
raw: -125657017077000
25+
toString: Tue Feb 02 -2012 01:02:03 GMT-0800 (Pacific Standard Time)
26+
toUTCString: Tue, 02 Feb -2012 09:02:03 GMT
27+
toGMTString: Tue, 02 Feb -2012 09:02:03 GMT
28+
toISOString: -002012-02-02T09:02:03.000Z
29+
2 -125657017077000 480
30+
-2012/1/2
31+
1:2:3.0
32+
2333
Date string: -002012-02-02T09:02:03.000Z
2434
raw: -125657017077000
2535
toString: Tue Feb 02 -2012 01:02:03 GMT-0800 (Pacific Standard Time)
@@ -133,6 +143,16 @@ Date string: Fri Feb 02 -99999 01:02:03 GMT-0800 (Pacific Standard Time)
133143
-99999/1/5
134144
1:2:3.0
135145

146+
Date string: Fri, 02 Feb -99999 09:02:03 GMT
147+
raw: -3217827999477000
148+
toString: Fri Feb 02 -99999 01:02:03 GMT-0800 (Pacific Standard Time)
149+
toUTCString: Fri, 02 Feb -99999 09:02:03 GMT
150+
toGMTString: Fri, 02 Feb -99999 09:02:03 GMT
151+
toISOString: -099999-02-02T09:02:03.000Z
152+
2 -3217827999477000 480
153+
-99999/1/5
154+
1:2:3.0
155+
136156
Date string: -099999-02-02T09:02:03.000Z
137157
raw: -3217827999477000
138158
toString: Fri Feb 02 -99999 01:02:03 GMT-0800 (Pacific Standard Time)
@@ -165,10 +185,14 @@ Date string: Tue Feb 02 -0012 01:02:03 GMT-0800 (Pacific Standard Time)
165185
1:2:3.0
166186

167187
Date string: Tue, 02 Feb -0012 09:02:03 GMT
168-
raw: NaN
169-
toString: Invalid Date
170-
toUTCString: Invalid Date
171-
toGMTString: Invalid Date
188+
raw: -62543113077000
189+
toString: Tue Feb 02 -0012 01:02:03 GMT-0800 (Pacific Standard Time)
190+
toUTCString: Tue, 02 Feb -0012 09:02:03 GMT
191+
toGMTString: Tue, 02 Feb -0012 09:02:03 GMT
192+
toISOString: -000012-02-02T09:02:03.000Z
193+
2 -62543113077000 480
194+
-12/1/2
195+
1:2:3.0
172196

173197
Date string: -000012-02-02T09:02:03.000Z
174198
raw: -62543113077000
@@ -292,3 +316,27 @@ Date string: Thu Feb 2 01:02:03 PST 2012
292316
2012/1/4
293317
1:2:3.0
294318

319+
Date string: Thu, 23 Sep -
320+
raw: NaN
321+
toString: Invalid Date
322+
toUTCString: Invalid Date
323+
toGMTString: Invalid Date
324+
325+
Date string: Thu, 23 Sep-
326+
raw: NaN
327+
toString: Invalid Date
328+
toUTCString: Invalid Date
329+
toGMTString: Invalid Date
330+
331+
Date string: Tue Feb 02 -
332+
raw: NaN
333+
toString: Invalid Date
334+
toUTCString: Invalid Date
335+
toGMTString: Invalid Date
336+
337+
Date string: Tue Feb 02-
338+
raw: NaN
339+
toString: Invalid Date
340+
toUTCString: Invalid Date
341+
toGMTString: Invalid Date
342+

‎test/Date/parseToStringResults.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
4+
//-------------------------------------------------------------------------------------------------------
5+
6+
// Date.parse must be able to parse the strings returned by Date.toString() for negative and zero-padded
7+
// years. See https://github.com/Microsoft/ChakraCore/pull/4318
8+
9+
// This test is disabled on xplat because the time zone for negative years on xplat is different from
10+
// time zone on Windows.
11+
12+
/// <reference path="../UnitTestFramework/UnitTestFramework.js" />
13+
if (this.WScript && this.WScript.LoadScriptFile) { // Check for running in ch
14+
this.WScript.LoadScriptFile("..\\UnitTestFramework\\UnitTestFramework.js");
15+
}
16+
17+
function testDate(isoDateString) {
18+
let Dateobj = new Date(isoDateString);
19+
let value = Dateobj.valueOf();
20+
let str = Dateobj.toString();
21+
22+
assert.areEqual(value, Date.parse(str), "Date.parse('" + str + "') returns wrong value.");
23+
}
24+
25+
let tests = [{
26+
name: "test if Date.parse() can correctly parse outputs of Date.toString()",
27+
body: function () {
28+
testDate("0001-10-13T05:16:33Z");
29+
testDate("0011-10-13T05:16:33Z");
30+
testDate("0111-10-13T05:16:33Z");
31+
testDate("1111-10-13T05:16:33Z");
32+
33+
// test BC years
34+
testDate("-000001-11-13T19:40:33Z");
35+
testDate("-000011-11-13T19:40:33Z");
36+
testDate("-000111-11-13T19:40:33Z");
37+
testDate("-001111-11-13T19:40:33Z");
38+
}
39+
}];
40+
41+
testRunner.run(tests, { verbose: WScript.Arguments[0] != "summary" });

‎test/Date/parseToUTCStringAndToISOStringResults.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
4+
//-------------------------------------------------------------------------------------------------------
5+
6+
// Date.parse must be able to parse the strings returned by Date.toUTCString() and Date.toISOString()
7+
// for negative and zero-padded years.
8+
// See https://github.com/Microsoft/ChakraCore/pull/4318
9+
10+
/// <reference path="../UnitTestFramework/UnitTestFramework.js" />
11+
if (this.WScript && this.WScript.LoadScriptFile) { // Check for running in ch
12+
this.WScript.LoadScriptFile("..\\UnitTestFramework\\UnitTestFramework.js");
13+
}
14+
15+
function testDate(isoDateString) {
16+
let Dateobj = new Date(isoDateString);
17+
let value = Dateobj.valueOf();
18+
let UTCstr = Dateobj.toUTCString();
19+
let ISOstr = Dateobj.toISOString();
20+
21+
assert.areEqual(value, Date.parse(UTCstr), "Date.parse('" + UTCstr + "') returns wrong value.");
22+
assert.areEqual(value, Date.parse(ISOstr), "Date.parse('" + ISOstr + "') returns wrong value.");
23+
}
24+
25+
let tests = [{
26+
name: "test if Date.parse() can correctly parse outputs of Date.toUTCString() and Date.toISOString()",
27+
body: function () {
28+
testDate("0001-10-13T05:16:33Z");
29+
testDate("0011-10-13T05:16:33Z");
30+
testDate("0111-10-13T05:16:33Z");
31+
testDate("1111-10-13T05:16:33Z");
32+
33+
// test BC years
34+
testDate("-000001-11-13T19:40:33Z");
35+
testDate("-000011-11-13T19:40:33Z");
36+
testDate("-000111-11-13T19:40:33Z");
37+
testDate("-001111-11-13T19:40:33Z");
38+
}
39+
}];
40+
41+
testRunner.run(tests, { verbose: WScript.Arguments[0] != "summary" });

‎test/Date/rlexe.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,18 @@
154154
<compile-flags>-args summary -endargs</compile-flags>
155155
</default>
156156
</test>
157+
<test>
158+
<default>
159+
<files>parseToStringResults.js</files>
160+
<!-- xplat tz info for BC != Windows tz info for BC -->
161+
<tags>exclude_xplat</tags>
162+
<compile-flags>-args summary -endargs</compile-flags>
163+
</default>
164+
</test>
165+
<test>
166+
<default>
167+
<files>parseToUTCStringAndToISOStringResults.js</files>
168+
<compile-flags>-args summary -endargs</compile-flags>
169+
</default>
170+
</test>
157171
</regress-exe>

0 commit comments

Comments
 (0)