Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions packages/struktolab/src/common/code-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ export function generateCode(tree, lang = "python") {
return transform(tree, 0, t, lang.toLowerCase()).join("");
}

function body(node, level, t, lang) {
const lines = transform(node, level, t, lang);
if (lines.length === 0 && lang === "python") return [indent(level) + "pass\n"];
return lines;
}

function transform(node, level, t, lang) {
if (!node) return [];
if (node.type === "InsertNode" || node.type === "Placeholder") {
Expand Down Expand Up @@ -164,9 +170,12 @@ function transform(node, level, t, lang) {
t.BranchNode.post +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.trueChild, level + 1, t, lang));
lines.push(indent(level) + t.BranchNode.between);
lines.push(...transform(node.falseChild, level + 1, t, lang));
lines.push(...body(node.trueChild, level + 1, t, lang));
const falseLines = transform(node.falseChild, level + 1, t, lang);
if (falseLines.length > 0 || lang !== "python") {
lines.push(indent(level) + t.BranchNode.between);
lines.push(...falseLines);
}
if (t.rightBracket) lines.push(indent(level) + t.rightBracket + "\n");
break;
}
Expand All @@ -179,7 +188,7 @@ function transform(node, level, t, lang) {
t.HeadLoopNode.post +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.child, level + 1, t, lang));
lines.push(...body(node.child, level + 1, t, lang));
if (t.rightBracket) lines.push(indent(level) + t.rightBracket + "\n");
break;

Expand All @@ -191,7 +200,7 @@ function transform(node, level, t, lang) {
t.CountLoopNode.post +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.child, level + 1, t, lang));
lines.push(...body(node.child, level + 1, t, lang));
if (t.rightBracket) lines.push(indent(level) + t.rightBracket + "\n");
break;

Expand Down Expand Up @@ -226,7 +235,7 @@ function transform(node, level, t, lang) {
t.FunctionNode.post +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.child, level + 1, t, lang));
lines.push(...body(node.child, level + 1, t, lang));
if (t.rightBracket) lines.push(indent(level) + t.rightBracket + "\n");
break;
}
Expand All @@ -237,7 +246,7 @@ function transform(node, level, t, lang) {
t.TryCatchNode.pre +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.tryChild, level + 1, t, lang));
lines.push(...body(node.tryChild, level + 1, t, lang));
lines.push(
indent(level) +
(t.rightBracket ? t.rightBracket + " " : "") +
Expand All @@ -246,7 +255,7 @@ function transform(node, level, t, lang) {
t.TryCatchNode.post +
(t.leftBracket ? " " + t.leftBracket + "\n" : ""),
);
lines.push(...transform(node.catchChild, level + 1, t, lang));
lines.push(...body(node.catchChild, level + 1, t, lang));
if (t.rightBracket) lines.push(indent(level) + t.rightBracket + "\n");
break;
}
Expand All @@ -266,7 +275,7 @@ function transform(node, level, t, lang) {
c.text +
t.InsertCase.post,
);
lines.push(...transform(c.followElement, level + 1, t, lang));
lines.push(...body(c.followElement, level + 1, t, lang));
first = false;
}
}
Expand All @@ -275,7 +284,7 @@ function transform(node, level, t, lang) {
indent(level) + t.InsertCase.preDefault + t.InsertCase.post,
);
lines.push(
...transform(node.defaultNode.followElement, level + 1, t, lang),
...body(node.defaultNode.followElement, level + 1, t, lang),
);
}
} else {
Expand Down
Loading