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

Prevent multiple return statements in a loop when replacing expressions (#5030)

Browse Source
This commit is contained in:
Brian Ng
2017-02-09 15:06:41 -06:00
committed by Logan Smyth
parent 1a325ce5d5
commit 6da9bb83df
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/babel-traverse/src/path/replacement.js
View File

@@ -219,10 +219,16 @@ export function replaceExpressionWithStatements(nodes: Array<Object>) {
const loop = path.findParent((path) => path.isLoop());
if (loop) {
const callee = this.get("callee");
let uid = loop.getData("expressionReplacementReturnUid");
const uid = callee.scope.generateDeclaredUidIdentifier("ret");
callee.get("body").pushContainer("body", t.returnStatement(uid));
if (!uid) {
const callee = this.get("callee");
uid = callee.scope.generateDeclaredUidIdentifier("ret");
callee.get("body").pushContainer("body", t.returnStatement(uid));
loop.setData("expressionReplacementReturnUid", uid);
} else {
uid = t.identifier(uid.name);
}
path.get("expression").replaceWith(
t.assignmentExpression("=", uid, path.node.expression)