Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sebmck committed Sep 28, 2014
1 parent 4197302 commit 1db8afa
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 13 deletions.
1 change: 1 addition & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
test
lib/6to5/templates
4 changes: 3 additions & 1 deletion lib/6to5/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ var transform = module.exports = function (code, opts) {
format: {}
});

var tree;

try {
var tree = util.parse(code);
tree = util.parse(code);
} catch (err) {
err.message = opts.filename + ": " + err.message;
throw err;
Expand Down
7 changes: 3 additions & 4 deletions lib/6to5/transformers/block-binding.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var transform = require("../transform");
var traverse = require("../traverse");
var util = require("../util");
var _ = require("lodash");
var traverse = require("../traverse");
var util = require("../util");
var _ = require("lodash");

var isLet = function (node) {
if (node.type === "VariableDeclaration" && node.kind === "let") {
Expand Down
11 changes: 8 additions & 3 deletions lib/6to5/transformers/classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var traverse = require("../traverse");
var util = require("../util");
var _ = require("lodash");

exports.ClassDeclaration = function (node, parent, opts) {
exports.ClassDeclaration = function (node) {
var superName = node.superClass;
var className = node.id;

Expand Down Expand Up @@ -91,9 +91,8 @@ var replaceInstanceSuperReferences = function (superName, method) {
} else if (node.type === "MemberExpression") {
// no accessing of super properties

var obj = node.object;

if (parent.object === node && obj.type === "Identifier" && obj.name === "super") {
if (isAccessingSuperProperties(parent, node)) {
throw new Error("cannot access super properties");
} else {
return;
Expand All @@ -117,6 +116,12 @@ var replaceInstanceSuperReferences = function (superName, method) {
});
};

var isAccessingSuperProperties = function (parent, node) {
var obj = node.object;
return obj.type === "Identifier" && obj.name === "super" &&
parent.object === node;
};

var addConstructor = function (construct, method) {
construct.defaults = method.defaults;
construct.params = method.params;
Expand Down
2 changes: 1 addition & 1 deletion lib/6to5/transformers/rest-parameters.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var util = require("../util");

exports.FunctionExpression = function (node, parent) {
exports.FunctionExpression = function (node) {
if (!node.rest) return;

var rest = node.rest;
Expand Down
4 changes: 2 additions & 2 deletions lib/6to5/transformers/spread.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var util = require("../util");
var _ = require("lodash");

exports.ArrayExpression = function (node, parent) {
exports.ArrayExpression = function (node) {
//if (node.ignoreSpread) return;

var elements = node.elements;
Expand All @@ -22,7 +22,7 @@ exports.ArrayExpression = function (node, parent) {
return concat;
};

exports.CallExpression = function (node, parent) {
exports.CallExpression = function (node) {
var args = node.arguments;

if (args.length && _.last(args).type === "SpreadElement") {
Expand Down
5 changes: 3 additions & 2 deletions lib/6to5/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ exports.parse = function (code, opts) {
return tree;
} catch (err) {
if (err.lineNumber) {
err.message = err.message + exports.codeFrame(code, err.lineNumber, err.column);
var frame = exports.codeFrame(code, err.lineNumber, err.column);
err.message = err.message + frame;
}
throw err;
}
Expand Down Expand Up @@ -163,7 +164,7 @@ exports.codeFrame = function (lines, lineNumber, colNumber) {

exports.repeat = function (width, cha) {
cha = cha || " ";
return Array(width + 1).join(cha);
return new Array(width + 1).join(cha);
};

var templatesCacheLoc = __dirname + "/../../templates.json";
Expand Down

0 comments on commit 1db8afa

Please sign in to comment.