[[FIX]] Allow object-literals within template strings

Uses context introduced in previous diff to let lexer be contextually aware when parsing a "}" character.

Closes #2082

src/lex.js

@@ -35,7 +35,8 @@ var Token = {
 };
 
 var Context = {
-  Template: 1
+  Block: 1,
+  Template: 2
 };
 
 // Object that handles postponed lexing verifications that checks the parsed
@@ -224,8 +225,6 @@ Lexer.prototype = {
     case ")":
     case ";":
     case ",":
-    case "{":
-    case "}":
     case "[":
     case "]":
     case ":":
@@ -236,6 +235,25 @@ Lexer.prototype = {
         value: ch1
       };
 
+    // A block/object opener
+    case "{":
+      this.context.push(Context.Block);
+      return {
+        type: Token.Punctuator,
+        value: ch1
+      };
+
+    // A block/object closer
+    case "}":
+      if (!this.inContext(Context.Block)) {
+        return null;
+      }
+      this.context.pop();
+      return {
+        type: Token.Punctuator,
+        value: ch1
+      };
+
     // A pound sign (for Node shebangs)
     case "#":
       return {

tests/unit/core.js

@@ -846,9 +846,9 @@ exports.testES6TemplateLiterals = function (test) {
   var src = fs.readFileSync(__dirname + "/fixtures/es6-template-literal.js", "utf8");
   TestRun(test)
     .addError(14, "Octal literals are not allowed in strict mode.")
-    .addError(19, "Unclosed template literal.")
-    .addError(20, "Expected an identifier and instead saw '(end)'.")
-    .addError(20, "Missing semicolon.")
+    .addError(21, "Unclosed template literal.")
+    .addError(22, "Expected an identifier and instead saw '(end)'.")
+    .addError(22, "Missing semicolon.")
     .test(src, { esnext: true });
   test.done();
 };

tests/unit/fixtures/es6-template-literal.js

@@ -16,4 +16,6 @@ function octal_strictmode() {
 
 var nested = `Look and ${ `Nested ${ `whoaaa` } template` } listen`;
 
+var innerobj = `Template with ${ {obj: "literal"} } inside`;
+
 var unterminated = `${one}