Skip to content

[WIP] Fix [RegExp|String].prototype methods and Regex matcher #6615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

[WIP] Fix [RegExp|String].prototype methods and Regex matcher #6615

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
df5334f
kill regex props fast paths
MadProbe Feb 20, 2021
ec40dc0
fix RegExp.prototype[@@search]()
MadProbe Feb 20, 2021
919c6a3
fix copyrights
MadProbe Feb 20, 2021
ec358a8
fix RegExp.prototype\[@@split]()
MadProbe Feb 22, 2021
c8614d5
Fix String.prototype.split()
MadProbe Feb 22, 2021
446bd06
fix dumb mistake
MadProbe Feb 22, 2021
3132cdd
Fix GetRegExSymbolFunction
MadProbe Feb 23, 2021
898f10b
Merge branch 'master' into regex-fixes
MadProbe Feb 25, 2021
fbc00fc
Fix AdvanceStringIndex
MadProbe Feb 25, 2021
1c7ac95
Merge branch 'regex-fixes' of https://github.com/MadProbe/ChakraCore …
MadProbe Feb 25, 2021
e4fd4be
Fix AdvanceLastIndex again
MadProbe Feb 25, 2021
e5b24b7
dont leak
MadProbe Feb 25, 2021
68e9fa7
add JavascriptString::GetCodePoints for later use
MadProbe Mar 8, 2021
d3b1f5a
Merge branch 'master' of https://github.com/chakra-core/ChakraCore in…
MadProbe Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions lib/Runtime/Library/RegexHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,16 +1941,33 @@ namespace Js
w = scriptContext->GetRegexDebugWriter();
#endif

pattern->rep.unified.matcher->Match
(state.input
, inputLength
, offset
, scriptContext
if (pattern->IsUnicode())
{
pattern->rep.unified.matcher->Match<true>
(state.input
, inputLength
, offset
, scriptContext
#if ENABLE_REGEX_CONFIG_OPTIONS
, stats
, w
, stats
, w
#endif
);
);
}
else
{
pattern->rep.unified.matcher->Match<false>
(state.input
, inputLength
, offset
, scriptContext
#if ENABLE_REGEX_CONFIG_OPTIONS
, stats
, w
#endif
);
}


#if ENABLE_REGEX_CONFIG_OPTIONS
if (REGEX_CONFIG_FLAG(RegexProfile))
Expand Down Expand Up @@ -2412,7 +2429,7 @@ namespace Js
{
if (string->GetLength() > (0 > index || (uint64_t)index + (uint64_t)1 > UINT32_MAX ? UINT32_MAX : (uint32_t)(index + 1)) &&
NumberUtilities::IsSurrogateLowerPart(string->GetString()[index]) &&
NumberUtilities::IsSurrogateUpperPart(string->GetString()[index + 1]))
NumberUtilities::IsSurrogateUpperPart(string->GetString()[index + 1]) && isUnicode)
Copy link
Collaborator

@rhuanjl rhuanjl Feb 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: ideally should do the isUnicode check first - it's much quicker, than the IsSurrogateLowerPart and IsSuurrogateUpperPart checks; if we do it first can skip the slower bits when it's false.

{
return index + 2;
}
Expand All @@ -2424,7 +2441,7 @@ namespace Js
{
if (string->GetLength() > index + 1 &&
NumberUtilities::IsSurrogateLowerPart(string->GetString()[index]) &&
NumberUtilities::IsSurrogateUpperPart(string->GetString()[index + 1]))
NumberUtilities::IsSurrogateUpperPart(string->GetString()[index + 1]) && isUnicode)
{
return JavascriptRegExp::AddIndex(index, 2);
}
Expand Down