Reviewers: marja,
Message:
PTAL
Description:
Fix scanning of regexp flags.
Set start and end positions of regex body and regex flags so that later
literal
construction produces correct result.
BUG=
Please review this at https://codereview.chromium.org/91843004/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/parser
Affected files (+4, -3 lines):
M src/lexer/experimental-scanner.h
Index: src/lexer/experimental-scanner.h
diff --git a/src/lexer/experimental-scanner.h
b/src/lexer/experimental-scanner.h
index
e0a0f4c6461323ed7583fc1ff7a29fb2020a5542..fea691a2246be1f6ac6ca5c9f8cd065c12da41eb
100644
--- a/src/lexer/experimental-scanner.h
+++ b/src/lexer/experimental-scanner.h
@@ -396,8 +396,7 @@ bool ExperimentalScanner<Char>::ScanRegExpPattern(bool
seen_equal) {
// Previous token is either '/' or '/=', in the second case, the
// pattern starts at =.
- next_.beg_pos = (cursor_ - buffer_) - (seen_equal ? 2 : 1);
- next_.end_pos = (cursor_ - buffer_) - (seen_equal ? 1 : 0);
+ next_.beg_pos = next_.end_pos = (cursor_ - buffer_) - (seen_equal ? 1 :
0);
// Scan regular expression body: According to ECMA-262, 3rd, 7.8.5,
// the scanner should pass uninterpreted bodies to the RegExp
@@ -428,6 +427,7 @@ bool ExperimentalScanner<Char>::ScanRegExpPattern(bool
seen_equal) {
if (++cursor_ >= buffer_end_) return false;
}
}
+ next_.end_pos = (cursor_ - buffer_);
++cursor_; // consume '/'
return true;
}
@@ -435,6 +435,7 @@ bool ExperimentalScanner<Char>::ScanRegExpPattern(bool
seen_equal) {
template<typename Char>
bool ExperimentalScanner<Char>::ScanRegExpFlags() {
+ next_.beg_pos = cursor_ - buffer_;
// Scan regular expression flags.
while (cursor_ < buffer_end_ &&
unicode_cache_->IsIdentifierPart(*cursor_)) {
if (*cursor_ != '\\') {
@@ -444,7 +445,7 @@ bool ExperimentalScanner<Char>::ScanRegExpFlags() {
if (++cursor_ >= buffer_end_) break;
}
}
- next_.end_pos = cursor_ - buffer_ - 1;
+ next_.end_pos = cursor_ - buffer_;
return true;
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
