Codegen: while-expr recalculate condition and the end of the loop

nois-lang · Mar 12, 2024 · 11b692b · 11b692b
1 parent 5638f02
commit 11b692b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/codegen/js/expr.ts b/src/codegen/js/expr.ts
@@ -151,8 +151,13 @@ export const emitOperand = (operand: Operand, module: Module, ctx: Context): Emi
             return { emit: jsError('if-let'), resultVar }
         case 'while-expr': {
             const { emit: cEmit, resultVar: cVar } = emitExpr(operand.condition, module, ctx)
-            const block = emitBlock(operand.block, module, ctx)
-            return { emit: emitLines([cEmit, `while (${extractValue(cVar)}) ${block}`]), resultVar }
+            const { emit: cEndEmit, resultVar: cEndVar } = emitExpr(operand.condition, module, ctx)
+            const block = emitLines([
+                ...emitBlockStatements(operand.block, module, ctx),
+                cEndEmit,
+                `${cVar} = ${cEndVar}`
+            ])
+            return { emit: emitLines([cEmit, `while (${extractValue(cVar)}) {\n${indent(block)}\n}`]), resultVar }
         }
         case 'for-expr': {
             const expr = emitExpr(operand.expr, module, ctx)

diff --git a/src/codegen/js/index.ts b/src/codegen/js/index.ts
@@ -81,7 +81,7 @@ export const jsString = (str: string): string => {
 }
 
 export const jsVariable = (name: string, emit?: string, pub = false): string => {
-    const assign = emit !== undefined ? `const ${name} = ${emit};` : `let ${name}`
+    const assign = `let ${name}${emit !== undefined ? ` = ${emit}` : ''}`
     return `${pub ? 'export ' : ''}${assign}`
 }