Commit 2603fad2 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Clarify RegExp namespace (v8::RegExp or v8::internal::RegExp)

There are two RegExp classes, one in v8 and one in
v8::internal and in some Windows jumbo builds the compiler
tried to use v8::internal when v8 was intended. In normal builds
the compiler does not know about v8::internal::RegExp so
it works anyway.

Bug: v8:9359
Change-Id: I9a39d342ddefd6570d5d070b7c073dc257705969
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1666992
Commit-Queue: Daniel Bratell <bratell@opera.com>
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Reviewed-by: 's avatarLeszek Swirski <leszeks@chromium.org>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#62272}
parent b72addcf
......@@ -1004,45 +1004,44 @@ bool Scanner::ScanRegExpPattern() {
return true;
}
Maybe<RegExp::Flags> Scanner::ScanRegExpFlags() {
Maybe<v8::RegExp::Flags> Scanner::ScanRegExpFlags() {
DCHECK_EQ(Token::REGEXP_LITERAL, next().token);
// Scan regular expression flags.
int flags = 0;
while (IsIdentifierPart(c0_)) {
RegExp::Flags flag = RegExp::kNone;
v8::RegExp::Flags flag = v8::RegExp::kNone;
switch (c0_) {
case 'g':
flag = RegExp::kGlobal;
flag = v8::RegExp::kGlobal;
break;
case 'i':
flag = RegExp::kIgnoreCase;
flag = v8::RegExp::kIgnoreCase;
break;
case 'm':
flag = RegExp::kMultiline;
flag = v8::RegExp::kMultiline;
break;
case 's':
flag = RegExp::kDotAll;
flag = v8::RegExp::kDotAll;
break;
case 'u':
flag = RegExp::kUnicode;
flag = v8::RegExp::kUnicode;
break;
case 'y':
flag = RegExp::kSticky;
flag = v8::RegExp::kSticky;
break;
default:
return Nothing<RegExp::Flags>();
return Nothing<v8::RegExp::Flags>();
}
if (flags & flag) {
return Nothing<RegExp::Flags>();
return Nothing<v8::RegExp::Flags>();
}
Advance();
flags |= flag;
}
next().location.end_pos = source_pos();
return Just(RegExp::Flags(flags));
return Just(v8::RegExp::Flags(flags));
}
const AstRawString* Scanner::CurrentSymbol(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment