diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
| commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
| tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/v8/src/regexp/regexp-parser.cc | |
| parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
| parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
| download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz | |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/v8/src/regexp/regexp-parser.cc')
| -rw-r--r-- | chromium/v8/src/regexp/regexp-parser.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chromium/v8/src/regexp/regexp-parser.cc b/chromium/v8/src/regexp/regexp-parser.cc index b0dcaa8ee95..d433fc8578a 100644 --- a/chromium/v8/src/regexp/regexp-parser.cc +++ b/chromium/v8/src/regexp/regexp-parser.cc @@ -1430,14 +1430,10 @@ void RegExpBuilder::FlushTerms() { bool RegExpBuilder::NeedsDesugaringForUnicode(RegExpCharacterClass* cc) { if (!unicode()) return false; - switch (cc->standard_type()) { - case 's': // white space - case 'w': // ASCII word character - case 'd': // ASCII digit - return false; // These characters do not need desugaring. - default: - break; - } + // TODO(yangguo): we could be smarter than this. Case-insensitivity does not + // necessarily mean that we need to desugar. It's probably nicer to have a + // separate pass to figure out unicode desugarings. + if (ignore_case()) return true; ZoneList<CharacterRange>* ranges = cc->ranges(zone()); CharacterRange::Canonicalize(ranges); for (int i = ranges->length() - 1; i >= 0; i--) { |