Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: src/regexp/regexp-parser.h

Issue 1651073002: [regexp] do not store flags as bitfield in the parser. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/regexp/regexp-parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/regexp/regexp-parser.h
diff --git a/src/regexp/regexp-parser.h b/src/regexp/regexp-parser.h
index b7dfb4875fe071a3d4ee12b47569f47fad1ac35f..85b9354010e67f9bbe6fedfd389c4ce20d7e1208 100644
--- a/src/regexp/regexp-parser.h
+++ b/src/regexp/regexp-parser.h
@@ -99,7 +99,7 @@ class BufferedZoneList {
// Accumulates RegExp atoms and assertions into lists of terms and alternatives.
class RegExpBuilder : public ZoneObject {
public:
- RegExpBuilder(Zone* zone, JSRegExp::Flags flags);
+ RegExpBuilder(Zone* zone, bool ignore_case, bool unicode);
void AddCharacter(uc16 character);
void AddUnicodeCharacter(uc32 character);
// "Adds" an empty expression. Does nothing except consume a
@@ -126,12 +126,13 @@ class RegExpBuilder : public ZoneObject {
bool NeedsDesugaringForUnicode(RegExpCharacterClass* cc);
bool NeedsDesugaringForIgnoreCase(uc32 c);
Zone* zone() const { return zone_; }
- bool unicode() const { return (flags_ & JSRegExp::kUnicode) != 0; }
- bool ignore_case() const { return (flags_ & JSRegExp::kIgnoreCase) != 0; }
+ bool ignore_case() const { return ignore_case_; }
+ bool unicode() const { return unicode_; }
Zone* zone_;
bool pending_empty_;
- JSRegExp::Flags flags_;
+ bool ignore_case_;
+ bool unicode_;
ZoneList<uc16>* characters_;
uc16 pending_surrogate_;
BufferedZoneList<RegExpTree, 2> terms_;
@@ -195,8 +196,9 @@ class RegExpParser BASE_EMBEDDED {
int captures_started() { return captures_started_; }
int position() { return next_pos_ - 1; }
bool failed() { return failed_; }
- bool unicode() const { return (flags_ & JSRegExp::kUnicode) != 0; }
- bool multiline() const { return (flags_ & JSRegExp::kMultiline) != 0; }
+ bool ignore_case() const { return ignore_case_; }
+ bool multiline() const { return multiline_; }
+ bool unicode() const { return unicode_; }
static bool IsSyntaxCharacterOrSlash(uc32 c);
@@ -217,10 +219,10 @@ class RegExpParser BASE_EMBEDDED {
RegExpParserState(RegExpParserState* previous_state,
SubexpressionType group_type,
RegExpLookaround::Type lookaround_type,
- int disjunction_capture_index, JSRegExp::Flags flags,
- Zone* zone)
+ int disjunction_capture_index, bool ignore_case,
+ bool unicode, Zone* zone)
: previous_state_(previous_state),
- builder_(new (zone) RegExpBuilder(zone, flags)),
+ builder_(new (zone) RegExpBuilder(zone, ignore_case, unicode)),
group_type_(group_type),
lookaround_type_(lookaround_type),
disjunction_capture_index_(disjunction_capture_index) {}
@@ -275,7 +277,9 @@ class RegExpParser BASE_EMBEDDED {
ZoneList<RegExpCapture*>* captures_;
FlatStringReader* in_;
uc32 current_;
- JSRegExp::Flags flags_;
+ bool ignore_case_;
+ bool multiline_;
+ bool unicode_;
int next_pos_;
int captures_started_;
// The capture count is only valid after we have scanned for captures.
« no previous file with comments | « no previous file | src/regexp/regexp-parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698