rip-lang 3.13.122 → 3.13.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rip-lang",
-  "version": "3.13.122",
+  "version": "3.13.124",
   "description": "A modern language that compiles to JavaScript",
   "type": "module",
   "main": "src/compiler.js",

package/src/compiler.js

@@ -2402,8 +2402,9 @@ export class CodeGenerator {
           if (!isConstructor && !sideEffectOnly && isLast && h === 'if') {
             let [cond, thenB, ...elseB] = stmt.slice(1);
             let hasMulti = (b) => this.is(b, 'block') && b.length > 2;
-            if (hasMulti(thenB) || elseB.some(hasMulti)) {
-              code += this.generateIfElseWithEarlyReturns(stmt);
+            let hasCtrlStmt = this.hasStatementInBranch(thenB) || elseB.some(b => this.hasStatementInBranch(b));
+            if (hasCtrlStmt || hasMulti(thenB) || elseB.some(hasMulti)) {
+              code += this.generateIfElseWithEarlyReturns(stmt) + '\n';
               return;
             }
           }
@@ -2647,6 +2648,7 @@ export class CodeGenerator {
   }
 
   generateBranchWithReturn(branch) {
+    branch = this.unwrapIfBranch(branch);
     let stmts = this.unwrapBlock(branch);
     let code = '';
     for (let i = 0; i < stmts.length; i++) {
@@ -2905,6 +2907,7 @@ export class CodeGenerator {
 
   hasStatementInBranch(branch) {
     if (!Array.isArray(branch)) return false;
+    if (branch.length === 1 && Array.isArray(branch[0])) return this.hasStatementInBranch(branch[0]);
     let h = branch[0];
     if (h === 'return' || h === 'throw' || h === 'break' || h === 'continue') return true;
     if (h === 'block') return branch.slice(1).some(s => this.hasStatementInBranch(s));

package/src/grammar/grammar.rip

@@ -950,7 +950,7 @@ operators = """
   right       = : COMPOUND_ASSIGN RIGHTWARD_ASSIGN RETURN THROW EXTENDS
   right       FORIN FOROF FORAS FORASAWAIT BY WHEN
   right       IF ELSE FOR WHILE UNTIL LOOP SUPER CLASS COMPONENT RENDER IMPORT EXPORT DYNAMIC_IMPORT OFFER ACCEPT
-  left        POST_IF
+  left        POST_IF POST_UNLESS
 """.trim().split('\n').reverse().map (line) -> line.trim().split /\s+/
 
 # ==============================================================================