cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generator: add _push method to simplify buffer pushing and location tracking

Browse Source
This commit is contained in:
Sebastian McKenzie 2014-11-03 11:13:37 +11:00
parent 72d924d85b
commit 115282d57b
1 changed files with 73 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
lib/6to5/generator.js
View File

@ -54,13 +54,11 @@ CodeGenerator.prototype.mark = function (node, locType) {
CodeGenerator.prototype.newline = function () {
this.buf = this.buf.replace(/\n(\s+)$/, "\n");
this.buf += "\n";
this.line++;
this._push("\n");
};
CodeGenerator.prototype.semicolon = function () {
this.buf += ";";
this.column++;
this._push(";");
};
CodeGenerator.prototype.keyword = function (name) {
@ -69,7 +67,7 @@ CodeGenerator.prototype.keyword = function (name) {
};
CodeGenerator.prototype.push = function (str, noIndent) {
if (this._indent && !noIndent) {
if (this._indent && !noIndent && str !== "\n") {
// we have an indent level and we aren't pushing a newline
var indent = this.getIndent();
@ -80,6 +78,10 @@ CodeGenerator.prototype.push = function (str, noIndent) {
if (this.isLast("\n")) str = indent + str;
}
this._push(str);
};
CodeGenerator.prototype._push = function (str) {
var self = this;
_.each(str, function (cha) {
@ -140,25 +142,70 @@ CodeGenerator.prototype.buildPrint = function (parent) {
};
CodeGenerator.prototype.printSequence = function (print, nodes, opts) {
var comments = this.ast.comments;
var tokens = this.ast.tokens;
var self = this;
opts = opts || {};
// calculate the whitespace between two tokens
var hasWhitespaceBetween = function (startToken, endToken) {
if (!startToken) return false;
var needsNewlineBefore = function (node) {
var startToken;
var endToken;
var whitespace = false;
_.each(tokens, function (token, i) {
// this is the token this node starts with
if (node.start === token.start) {
startToken = tokens[i - 1];
endToken = token;
return false;
}
});
var start = startToken.end;
return self.hasWhitespaceBetween(startToken, endToken);
};
var needsNewlineAfter = function (node) {
var startToken;
var endToken;
_.each(tokens, function (token, i) {
// this is the token this node ends with
if (node.end === token.end) {
startToken = token;
endToken = tokens[i + 1];
return false;
}
});
return self.hasWhitespaceBetween(startToken, endToken);
};
opts.print = function (node, i) {
print(node, node && node.start != null && {
before: function () {
if (needsNewlineBefore(node)) self.newline();
},
after: function () {
if (needsNewlineAfter(node)) self.newline();
}
});
};
return this.printJoin(print, nodes, "\n", opts);
};
CodeGenerator.prototype.hasWhitespaceBetween = function (startToken, endToken) {
if (!endToken || !this.opts.whitespace) return false;
var comments = this.ast.comments;
var start = startToken ? startToken.end : 0;
var end = endToken.start;
var sep = self.code.slice(start, end);
var sep = this.code.slice(start, end);
var lines = 0;
lines--; // take off the current line
if (start > 0) lines--; // take off the current line
// remove comments
_.each(comments, function (comment) {
@ -184,53 +231,6 @@ CodeGenerator.prototype.printSequence = function (print, nodes, opts) {
return lines > 0;
};
var needsNewlineBefore = function (node) {
var startToken;
var endToken;
_.each(tokens, function (token, i) {
// this is the token this node starts with
if (node.start === token.start) {
startToken = tokens[i - 1];
endToken = token;
return false;
}
});
return hasWhitespaceBetween(startToken, endToken);
};
var needsNewlineAfter = function (node) {
var startToken;
var endToken;
_.each(tokens, function (token, i) {
// this is the token this node ends with
if (node.end === token.end) {
startToken = token;
endToken = tokens[i + 1];
return false;
}
});
return hasWhitespaceBetween(startToken, endToken);
};
opts.print = function (node, i) {
print(node, node && node.start != null && {
before: function () {
if (needsNewlineBefore(node)) self.newline();
},
after: function () {
if (needsNewlineAfter(node)) self.newline();
}
});
};
return this.printJoin(print, nodes, "\n", opts);
};
CodeGenerator.prototype.print = function (node, parent, opts) {
if (!node) return "";
@ -238,16 +238,19 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
if (this[node.type]) {
this.printLeadingComments(node);
this.mark(node, "start");
if (opts.before) opts.before();
this.mark(node, "start");
var needsParans = t.needsParans(node, parent);
if (needsParans) this.push("(");
this[node.type](node, this.buildPrint(node), parent);
if (needsParans) this.push(")");
if (opts.after) opts.after();
this.mark(node, "end");
if (opts.after) opts.after();
this.printTrailingComments(node);
} else {
throw new ReferenceError("unknown node " + node.type + " " + JSON.stringify(node));
@ -257,24 +260,38 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
CodeGenerator.prototype.generateComment = function (comment) {
var val = comment.value;
if (comment.type === "Line") {
if (_.last(val) !== "\n") val += "\n";
return "//" + val;
val = "//" + val + "\n";
} else {
return "/*" + val + "*/\n";
val = "/*" + val + "*/\n";
}
return val;
};
CodeGenerator.prototype.printTrailingComments = function (node) {
var self = this;
_.each(node.trailingComments, function (comment) {
self.push(self.generateComment(comment));
});
this._printComments(node.trailingComments);
};
CodeGenerator.prototype.printLeadingComments = function (node) {
this._printComments(node.leadingComments);
};
CodeGenerator.prototype._printComments = function (comments) {
if (!comments || !comments.length) return;
var self = this;
_.each(node.leadingComments, function (comment) {
_.each(comments, function (comment, i) {
// whitespace before
if (self.hasWhitespaceBetween(comment, comments[i - 1])) {
self.newline();
}
self.push(self.generateComment(comment));
// whitespace after
if (self.hasWhitespaceBetween(comment, comments[i + 1])) {
self.newline();
}
});
};