archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Handle statements better for returned nodes

Browse Source
This commit is contained in:
Patrick Steele-Idem 2015-12-23 17:11:40 -07:00
parent 1bf6838c2c
commit 9b602800a3
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/CodeGenerator.js
View File

@ -125,6 +125,7 @@ class Generator {
let finalNode;
let generateCodeFunc;
var isStatement = node.statement;
if (node.getCodeGenerator) {
generateCodeFunc = node.getCodeGenerator(this.outputType);
@ -143,7 +144,11 @@ class Generator {
}
if (finalNode) {
this.generateCode(finalNode);
if (isStatement) {
this.generateStatements(finalNode);
} else {
this.generateCode(finalNode);
}
} else if (node) {
let generateCodeMethod = node.generateCode;
@ -167,7 +172,11 @@ class Generator {
throw new Error('Invalid node returned. Same node returned: ' + util.inspect(node));
}
this.generateCode(finalNode);
if (isStatement) {
this.generateStatements(finalNode);
} else {
this.generateCode(finalNode);
}
}
}
@ -246,6 +255,10 @@ class Generator {
ok(nodes, '"nodes" expected');
let firstStatement = true;
if (nodes instanceof Node) {
nodes = [nodes];
}
nodes.forEach((node) => {
if (node instanceof Node) {
node.statement = true;