ES6 template literals: Fix issue with template after rbrace
authorarv <arv@chromium.org>
Thu, 4 Dec 2014 14:50:09 +0000 (06:50 -0800)
committerCommit bot <commit-bot@chromium.org>
Thu, 4 Dec 2014 14:50:17 +0000 (14:50 +0000)
commitedf3dab4660ed6273e5d46bd2b0eae9f3210157d
tree9ad94a334527e9c12076537be00cb36fb31dab75
parentf5a027dc709885a0f76bb6c24a913ed0ad2b0d6d
ES6 template literals: Fix issue with template after rbrace

If we hade }` the right brace was always treated as part of the
template literal. We should only treat the right brace as part of
the literal when we continue to parse the template literal after a
placeholder.

BUG=v8:3734
LOG=Y

Review URL: https://codereview.chromium.org/778813003

Cr-Commit-Position: refs/heads/master@{#25661}
src/preparser.h
src/scanner.cc
src/scanner.h
test/mjsunit/harmony/templates.js