optimization: use ternary if possible

nftgp · Feb 11, 2022 · cb6b396 · cb6b396
1 parent 0fcaad5
commit cb6b396
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/compile.ts b/src/compile.ts
@@ -248,10 +248,28 @@ ${options.contract ? "contract" : "library"} ${options.name || "Template"} {
     narrowInput(scope.inputType, conditionResolvedPath, "bool")
 
     const negate = statement.path.head === "unless"
+    const condition = `${negate ? "!" : ""}${conditionResolvedPath}`
+
+    const containsSingleAppend =
+      statement.program.body.length === 1 &&
+      statement.program.body[0].type !== "BlockStatement"
+
+    // Optimization: use ternary if possible
+    if (containsSingleAppend) {
+      const [singleAppend] = processStatement(statement.program.body[0], scope)
+      if (
+        singleAppend &&
+        "append" in singleAppend &&
+        singleAppend.append.length === 1
+      ) {
+        const [appendStr] = singleAppend.append
+        return [{ append: [`${condition} ? ${appendStr} : ""`] }]
+      }
+    }
 
     return [
       {
-        line: `if(${negate ? "!" : ""}${conditionResolvedPath}) {`,
+        line: `if(${condition}) {`,
       },
       ...processProgram(statement.program, scope),
       {

diff --git a/test/cases/wand.only/Template.sol b/test/cases/wand.only/Template.sol
@@ -64,17 +64,13 @@ contract Template {
           __result,
           '    <g\n      style="transform: rotate(calc(',
           uint2str(__i),
-          ' * 15deg)) translateY(-520px);"\n    >\n      '
+          ' * 15deg)) translateY(-520px);"\n    >\n      ',
+          __input.rhythm[__i].halo0 ? '<use href="#h0"></use>' : "",
+          "\n      ",
+          __input.rhythm[__i].halo1 ? '<use href="#h1"></use>' : "",
+          "\n    </g>\n"
         )
       );
-      if (__input.rhythm[__i].halo0) {
-        __result = string(abi.encodePacked(__result, '<use href="#h0"></use>'));
-      }
-      __result = string(abi.encodePacked(__result, "\n      "));
-      if (__input.rhythm[__i].halo1) {
-        __result = string(abi.encodePacked(__result, '<use href="#h1"></use>'));
-      }
-      __result = string(abi.encodePacked(__result, "\n    </g>\n"));
     }
     __result = string(abi.encodePacked(__result, "</g>"));
   }