summaryrefslogtreecommitdiff
path: root/deps/v8/src/parsing/scanner.cc
diff options
context:
space:
mode:
authorAli Ijaz Sheikh <ofrobots@google.com>2016-02-29 13:21:43 -0800
committerAli Sheikh <ofrobots@lemonhope.roam.corp.google.com>2016-03-03 20:35:20 -0800
commitf8e8075a62f910b33e6a2a93afdfe7b4df482264 (patch)
treeee9a0d6fa9f66cf8c49ddaeed034ab9cc9620ebe /deps/v8/src/parsing/scanner.cc
parent206a81fb145e5e8bfaa8de256e9bf1a9c8815fae (diff)
downloadnode-new-f8e8075a62f910b33e6a2a93afdfe7b4df482264.tar.gz
deps: upgrade to V8 4.9.385.27
Pick up the latest known good release from the V8 4.9 branch: 4.9.385.27. V8 Commits: https://github.com/v8/v8/compare/4.9.385.18...4.9.385.27 PR-URL: https://github.com/nodejs/node/pull/5494 Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: targos - Michaƫl Zasso <mic.besace@gmail.com>
Diffstat (limited to 'deps/v8/src/parsing/scanner.cc')
-rw-r--r--deps/v8/src/parsing/scanner.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/v8/src/parsing/scanner.cc b/deps/v8/src/parsing/scanner.cc
index 19fab9355e..73175934b5 100644
--- a/deps/v8/src/parsing/scanner.cc
+++ b/deps/v8/src/parsing/scanner.cc
@@ -356,7 +356,7 @@ Token::Value Scanner::SkipSourceURLComment() {
void Scanner::TryToParseSourceURLComment() {
- // Magic comments are of the form: //[#]\s<name>=\s*<value>\s*.* and this
+ // Magic comments are of the form: //[#@]\s<name>=\s*<value>\s*.* and this
// function will just return if it cannot parse a magic comment.
if (c0_ < 0 || !unicode_cache_->IsWhiteSpace(c0_)) return;
Advance();
@@ -574,7 +574,7 @@ void Scanner::Scan() {
Advance();
if (c0_ == '/') {
Advance();
- if (c0_ == '#') {
+ if (c0_ == '#' || c0_ == '@') {
Advance();
token = SkipSourceURLComment();
} else {