Skip to content

Commit b15fa2c

Browse files
author
Kenji Fukuda
committed
Change parsing of \c to reflect spec
Fixes #2973
1 parent 288d7fe commit b15fa2c

File tree

3 files changed

+222
-21
lines changed

3 files changed

+222
-21
lines changed

‎lib/Parser/RegexParser.cpp

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,13 @@ namespace UnifiedRegex
15291529
else if (ECLookahead() == 'c')
15301530
{
15311531
if (standardEncodedChars->IsLetter(ECLookahead(1))) // terminating 0 is not a letter
1532+
{
15321533
ECConsume(2);
1534+
}
1535+
else
1536+
{
1537+
DeferredFailIfUnicode(JSERR_RegExpInvalidEscape);
1538+
}
15331539
return false;
15341540
}
15351541
else
@@ -2494,6 +2500,8 @@ namespace UnifiedRegex
24942500
}
24952501
else
24962502
{
2503+
DeferredFailIfUnicode(JSERR_RegExpInvalidEscape); // Fail in unicode mode for non-letter escaped control characters according to 262 Annex-B RegExp grammar SPEC #prod-annexB-Term
2504+
24972505
if (!IsEOF())
24982506
{
24992507
EncodedChar ecLookahead = ECLookahead();
@@ -2625,33 +2633,19 @@ namespace UnifiedRegex
26252633
standardChars->SetNonWordChars(ctAllocator, deferredSetNode->set);
26262634
return deferredSetNode;
26272635
case 'c':
2628-
if (standardEncodedChars->IsLetter(ECLookahead())) // terminating 0 is not a letter
2636+
if (standardEncodedChars->IsWord(ECLookahead())) // terminating 0 is not a word
26292637
{
26302638
c = UTC(Chars<EncodedChar>::CTU(ECLookahead()) % 32);
26312639
ECConsume();
26322640
// fall-through for identity escape
26332641
}
26342642
else
26352643
{
2636-
// SPEC DEVIATION: For non-letters, still take lower 5 bits, e.g. [\c1] == [\x11].
2637-
// However, '-', ']', and EOF make the \c just a 'c'.
2638-
if (!IsEOF())
2639-
{
2640-
EncodedChar ec = ECLookahead();
2641-
switch (ec)
2642-
{
2643-
case '-':
2644-
case ']':
2645-
// fall-through for identity escape with 'c'
2646-
break;
2647-
default:
2648-
c = UTC(Chars<EncodedChar>::CTU(ec) % 32);
2649-
ECConsume();
2650-
// fall-through for identity escape
2651-
break;
2652-
}
2653-
}
2654-
// else: fall-through for identity escape with 'c'
2644+
// If the lookahead is a non-alphanumeric and not a dash('-'), then treat '\' and 'c' separately.
2645+
//#sec-regular-expression-patterns-semantics
2646+
ECRevert(1); //Put cursor back at 'c' and treat it as a non-escaped character.
2647+
deferredCharNode->cs[0] = '\\';
2648+
return deferredCharNode;
26552649
}
26562650
break;
26572651
case 'x':

‎test/Regex/control_character_escapes.js

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
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+
WScript.LoadScriptFile("..\\UnitTestFramework\\UnitTestFramework.js");
7+
8+
function matchRegExp(str, regexpLiteral, expectedResult)
9+
{
10+
matchResultLiteral = str.match(regexpLiteral);
11+
errorMsgBase = "Expected result of match between string: '" + str + "' and regular expression: " + regexpLiteral + " to be " +
12+
expectedResult + " but was "
13+
14+
actualResultLiteral = matchResultLiteral == null ? null : matchResultLiteral[0];
15+
assert.areEqual(expectedResult, actualResultLiteral, errorMsgBase + actualResultLiteral);
16+
17+
regexpConstructor = new RegExp(regexpLiteral);
18+
matchResultConstructor = str.match(regexpConstructor);
19+
20+
actualResultConstructor = matchResultConstructor == null ? null : matchResultConstructor[0];
21+
assert.areEqual(expectedResult, actualResultConstructor, errorMsgBase + actualResultConstructor);
22+
}
23+
24+
var tests = [
25+
{
26+
name : "Control characters followed by a word character ([A-Za-z0-9_])",
27+
body : function ()
28+
{
29+
re = /[\c6]+/; //'6' = ascii x36
30+
matchRegExp("6", re, null);
31+
matchRegExp("\\", re, null);
32+
matchRegExp("\\c6", re, null);
33+
matchRegExp("c", re, null);
34+
matchRegExp("\x16", re, "\x16");
35+
36+
re = /\c6/; //'6' = ascii x36
37+
matchRegExp("\\c6", re, "\\c6");
38+
matchRegExp("\\", re, null);
39+
matchRegExp("6", re, null);
40+
matchRegExp("c", re, null);
41+
matchRegExp("\x16", re, null);
42+
43+
re = /\c6[\c6]+/; //'6' = ascii x36
44+
matchRegExp("\\c6\x16", re, "\\c6\x16");
45+
matchRegExp("\\", re, null);
46+
matchRegExp("c", re, null);
47+
matchRegExp("\x16", re, null);
48+
49+
re = /[\ca]+/; //'a' = ascii x61
50+
matchRegExp("a", re, null);
51+
matchRegExp("\\", re, null);
52+
matchRegExp("c", re, null);
53+
matchRegExp("00xyzabc123\x01qrst", re, "\x01");
54+
55+
re = /[\c_]+/; //'_' = ascii 0x5F
56+
matchRegExp("\x1F\x1F\x05", re, "\x1F\x1F");
57+
matchRegExp("\\\\\\", re, null);
58+
matchRegExp("////", re, null);
59+
matchRegExp("ccc_", re, null);
60+
61+
re = /[\cG]*/; //'G' = ascii x47
62+
matchRegExp("\x07\x06\x05", re, "\x07");
63+
matchRegExp("\\\\", re, "");
64+
matchRegExp("////", re, "");
65+
matchRegExp("cccG", re, "");
66+
67+
re = /\cG\cf/; //'G' = ascii x47, 'f' = ascii x66
68+
matchRegExp("\x00\x03\x07\x06\x07\x08", re, "\x07\x06");
69+
matchRegExp("\\", re, null);
70+
matchRegExp("/", re, null);
71+
matchRegExp("\\cG\\c6\\cf", re, null);
72+
73+
re = /[\cG\c6\cf]+/; //'G' = ascii x47, '6' = ascii x36, 'f' = ascii x66
74+
matchRegExp("\x00\x03\x07\x06\x16\x07\x08", re, "\x07\x06\x16\x07");
75+
matchRegExp("\\\\", re, null);
76+
matchRegExp("////", re, null);
77+
matchRegExp("cfG6", re, null);
78+
79+
re = /\cG\cf/; //'G' = ascii x47, 'f' = ascii x66
80+
matchRegExp("\x00\x03\x07\x06\x16\x07\x08", re, "\x07\x06");
81+
matchRegExp("\\", re, null);
82+
matchRegExp("/", re, null);
83+
matchRegExp("\\cG\\c6\\cf", re, null);
84+
85+
re = /[\cz\cZ]+/; //'z' = ascii x7A, 'Z' = ascii x5A, have the same lowest 5 bits
86+
matchRegExp("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" +
87+
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", re, "\x1a");
88+
matchRegExp("\\\\", re, null);
89+
matchRegExp("////", re, null);
90+
matchRegExp("ccczZ", re, null);
91+
}
92+
},
93+
{
94+
name : "Control characters followed by a non-word character ([^A-Za-z0-9_])",
95+
body : function ()
96+
{
97+
re = /[\c*]+/; //'*' = ascii 42
98+
matchRegExp("\x0a\x09\x08", re, null);
99+
matchRegExp("a*c*b*d*", re, "*c*");
100+
matchRegExp("\\\\", re, "\\\\");
101+
matchRegExp("////", re, null);
102+
matchRegExp("ccc", re, "ccc");
103+
104+
re = /[\c}]*/; //'}' = ascii 125
105+
matchRegExp("\x1d\x7d\x3d", re, "");
106+
matchRegExp("}c}}cd*c*b*d*", re, "}c}}c");
107+
matchRegExp("\\\\", re, "\\\\");
108+
matchRegExp("////", re, "");
109+
matchRegExp("ccc", re, "ccc");
110+
111+
re = /[\c;]+/; //';' = ascii 59
112+
matchRegExp("\x1b\x1c", re, null);
113+
matchRegExp("d;c;d;*", re, ";c;");
114+
matchRegExp("\\\\", re, "\\\\");
115+
matchRegExp("////", re, null);
116+
matchRegExp("ccc", re, "ccc");
117+
118+
re = /\c%/; //'%' = ascii x25
119+
matchRegExp("\\", re, null);
120+
matchRegExp("\\", re, null);
121+
matchRegExp("\\c%", re, "\\c%");
122+
matchRegExp("\x05", re, null);
123+
}
124+
},
125+
{
126+
name : "Control Character tests with unicode flag present",
127+
body : function ()
128+
{
129+
re = /[\cAg]+/u; //'A' = ascii x41
130+
matchRegExp("abcdefghi", re, "g");
131+
matchRegExp("\\\\", re, null);
132+
matchRegExp("////", re, null);
133+
matchRegExp("\x01\x01gg\x02\x04ggg", re, "\x01\x01gg");
134+
135+
re = /[\czA]+/u; //'z' = ascii x7A
136+
matchRegExp("abcdefghi", re, null);
137+
matchRegExp("\\\\", re, null);
138+
matchRegExp("////", re, null);
139+
matchRegExp("YZA\x1aABC", re, "A\x1aA");
140+
141+
assert.throws(() => eval("\"\".match(/[\\c]/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
142+
"Invalid regular expression: invalid escape in unicode pattern");
143+
assert.throws(() => eval("\"\".match(/[\\c-d]/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
144+
"Invalid regular expression: invalid escape in unicode pattern");
145+
assert.throws(() => eval("\"\".match(/[ab\\c_$]/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
146+
"Invalid regular expression: invalid escape in unicode pattern");
147+
assert.throws(() => eval("\"\".match(/[ab\\c\\d]/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
148+
"Invalid regular expression: invalid escape in unicode pattern");
149+
assert.throws(() => eval("\"\".match(/[ab\\c3]/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
150+
"Invalid regular expression: invalid escape in unicode pattern");
151+
152+
re = /\cAg/u; //'A' = ascii x41
153+
matchRegExp("abcdefghi", re, null);
154+
matchRegExp("\\\\", re, null);
155+
matchRegExp("////", re, null);
156+
matchRegExp("\x01\x01gg\x02\x04ggg", re, "\x01g");
157+
158+
re = /\czA/u; //'z' = ascii x7A
159+
matchRegExp("abcdefghi", re, null);
160+
matchRegExp("\\\\", re, null);
161+
matchRegExp("////", re, null);
162+
matchRegExp("YZA\x1aABC", re, "\x1aA");
163+
164+
assert.throws(() => eval("\"\".match(/\\c/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
165+
"Invalid regular expression: invalid escape in unicode pattern");
166+
assert.throws(() => eval("\"\".match(/\\c-d/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
167+
"Invalid regular expression: invalid escape in unicode pattern");
168+
assert.throws(() => eval("\"\".match(/ab\\c_$/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
169+
"Invalid regular expression: invalid escape in unicode pattern");
170+
assert.throws(() => eval("\"\".match(/ab\\c\\d/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
171+
"Invalid regular expression: invalid escape in unicode pattern");
172+
assert.throws(() => eval("\"\".match(/ab\\c3/u)"), SyntaxError, "Expected an error due to non-letters being disallowed from control character when unicode flag present",
173+
"Invalid regular expression: invalid escape in unicode pattern");
174+
}
175+
},
176+
{
177+
name : "Control character edge cases",
178+
body : function ()
179+
{
180+
re = /[\c-g]+/; //'-' = ascii x2D
181+
matchRegExp("abcdefghi", re, "cdefg");
182+
matchRegExp("\\\\", re, "\\\\");
183+
matchRegExp("////", re, null);
184+
matchRegExp("\x0d", re, null);
185+
matchRegExp("aobd\\f\\d", re, "d\\f\\d");
186+
187+
re = /[\c-]+/; //'-' = ascii x2D
188+
matchRegExp("abcdefghi", re, "c");
189+
matchRegExp("\x0d", re, null);
190+
matchRegExp("\\\\", re, "\\\\");
191+
matchRegExp("////", re, null);
192+
matchRegExp("aobd\\f\\d", re, "\\");
193+
194+
assert.throws(() => eval("\"\".match(/[\\c-a]/)"), SyntaxError, "Expected an error due to 'c-a' being an invalid range.", "Invalid range in character set");
195+
}
196+
}
197+
];
198+
199+
testRunner.runTests(tests, {
200+
verbose : WScript.Arguments[0] != "summary"
201+
});

‎test/Regex/rlexe.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,16 @@
229229
<compile-flags>-args summary -endargs</compile-flags>
230230
</default>
231231
</test>
232-
<test>
232+
<test>
233233
<default>
234234
<files>characterclass_with_range.js</files>
235235
<compile-flags>-args summary -endargs</compile-flags>
236236
</default>
237237
</test>
238+
<test>
239+
<default>
240+
<files>control_character_escapes.js</files>
241+
<compile-flags>-args summary -endargs</compile-flags>
242+
</default>
243+
</test>
238244
</regress-exe>

0 commit comments

Comments
 (0)