Merge pull request #103 from eslint/issue96

Fix: Disallow octals in template strings (fixes #96)

Author: nzakas

espree.js

@@ -974,7 +974,6 @@ function scanTemplate() {
     var cooked = "",
         ch,
         escapedSequence,
-        octal = false,
         start = index,
         terminated = false,
         tail = false,
@@ -999,8 +998,13 @@ function scanTemplate() {
         } else if (ch === "\\") {
             ch = source[index++];
             escapedSequence = scanEscapeSequence(ch);
+
+            if (escapedSequence.octal) {
+                throwError({}, Messages.TemplateOctalLiteral);
+            }
+
             cooked += escapedSequence.ch;
-            octal = escapedSequence.octal || octal;
+
         } else if (syntax.isLineTerminator(ch.charCodeAt(0))) {
             ++lineNumber;
             if (ch === "\r" && source[index] === "\n") {
@@ -1037,7 +1041,6 @@ function scanTemplate() {
         },
         head: head,
         tail: tail,
-        octal: octal,
         lineNumber: lineNumber,
         lineStart: lineStart,
         range: [start, index]
@@ -2770,10 +2773,6 @@ function parseTemplateElement(option) {
     marker = markerCreate();
     token = lex();
 
-    if (strict && token.octal) {
-        throwError(token, Messages.StrictOctalLiteral);
-    }
-
     return markerApply(
         marker,
         astNodeFactory.createTemplateElement(

lib/messages.js

@@ -68,6 +68,7 @@ module.exports = {
     StrictVarName: "Variable name may not be eval or arguments in strict mode",
     StrictParamName: "Parameter name eval or arguments is not allowed in strict mode",
     StrictParamDupe: "Strict mode function may not have duplicate parameter names",
+    TemplateOctalLiteral: "Octal literals are not allowed in template strings.",
     ParameterAfterRestParameter: "Rest parameter must be final parameter of an argument list",
     DefaultRestParameter: "Rest parameter can not have a default value",
     ElementAfterSpreadElement: "Spread must be the final element of an element list",

tests/fixtures/ecma-features/templateStrings/octal-literal.result.js

@@ -0,0 +1,6 @@
+module.exports = {
+    "index":4,
+    "lineNumber":1,
+    "column":5,
+    "description":"Octal literals are not allowed in template strings."
+};

tests/fixtures/ecma-features/templateStrings/octal-literal.src.js

@@ -0,0 +1 @@
+`\07`;

tests/lib/ecma-features.js

@@ -122,46 +122,50 @@ describe("ecmaFeatures", function() {
         });
     });
 
-    leche.withData(moduleTestFiles, function(filename) {
+    describe("Modules", function() {
 
-        var code = shelljs.cat(path.resolve(FIXTURES_DIR, filename) + ".src.js");
+        leche.withData(moduleTestFiles, function(filename) {
 
-        it("should parse correctly when sourceType is module", function() {
-            var expected = require(path.resolve(__dirname, "../../", FIXTURES_DIR, filename) + ".result.js");
-            var result;
+            var code = shelljs.cat(path.resolve(FIXTURES_DIR, filename) + ".src.js");
 
-            config.sourceType = "module";
+            it("should parse correctly when sourceType is module", function() {
+                var expected = require(path.resolve(__dirname, "../../", FIXTURES_DIR, filename) + ".result.js");
+                var result;
 
-            // set sourceType of program node to module
-            if (expected.type === "Program") {
-                expected.sourceType = "module";
-            }
+                config.sourceType = "module";
 
-            try {
-                result = espree.parse(code, config);
-            } catch (ex) {
+                // set sourceType of program node to module
+                if (expected.type === "Program") {
+                    expected.sourceType = "module";
+                }
 
-                // if the result is an error, create an error object so deepEqual works
-                if (expected.message || expected.description) {
+                try {
+                    result = espree.parse(code, config);
+                } catch (ex) {
 
-                    var expectedError = new Error(expected.message || expected.description);
-                    Object.keys(expected).forEach(function(key) {
-                        expectedError[key] = expected[key];
-                    });
-                    expected = expectedError;
-                } else {
-                    throw ex;
-                }
+                    // if the result is an error, create an error object so deepEqual works
+                    if (expected.message || expected.description) {
 
-                result = ex;    // if an error is thrown, match the error
+                        var expectedError = new Error(expected.message || expected.description);
+                        Object.keys(expected).forEach(function(key) {
+                            expectedError[key] = expected[key];
+                        });
+                        expected = expectedError;
+                    } else {
+                        throw ex;
+                    }
 
-            }
-            assert.deepEqual(result, expected);
-        });
+                    result = ex;    // if an error is thrown, match the error
+
+                }
+                assert.deepEqual(result, expected);
+            });
 
+        });
     });
 
 
+
     leche.withData(mixFiles, function(filename) {
 
         var features = path.dirname(filename),