From 0312e28ecb0fbf418fefbffc24232e8cfc3fe8b6 Mon Sep 17 00:00:00 2001
From: Thomas Weber <muffin@muffin.ink>
Date: Mon, 13 Jun 2022 21:12:33 -0500
Subject: [PATCH] Dirty hack to enable warp timer for loops that use timer in
 their condition

---
 src/compiler/irgen.js                         |  23 +++++++++++++++---
 src/compiler/jsgen.js                         |   6 ++++-
 ...w-warp-repeat-until-timer-greater-than.sb3 | Bin 0 -> 1973 bytes
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 test/fixtures/execute/tw-warp-repeat-until-timer-greater-than.sb3

diff --git a/src/compiler/irgen.js b/src/compiler/irgen.js
index dd92c768..fc777249 100644
--- a/src/compiler/irgen.js
+++ b/src/compiler/irgen.js
@@ -80,6 +80,8 @@ class ScriptTreeGenerator {
          * @private
          */
         this.variableCache = {};
+
+        this.usesTimer = false;
     }
 
     setProcedureVariant (procedureVariant) {
@@ -620,6 +622,7 @@ class ScriptTreeGenerator {
                 object: this.descendInputOfBlock(block, 'OBJECT')
             };
         case 'sensing_timer':
+            this.usesTimer = true;
             return {
                 kind: 'timer.get'
             };
@@ -751,16 +754,26 @@ class ScriptTreeGenerator {
                 times: this.descendInputOfBlock(block, 'TIMES'),
                 do: this.descendSubstack(block, 'SUBSTACK')
             };
-        case 'control_repeat_until':
+        case 'control_repeat_until': {
             this.analyzeLoop();
+            // Dirty hack: automatically enable warp timer for this block if it uses timer
+            // This fixes project that do things like "repeat until timer > 0.5"
+            this.usesTimer = false;
+            const condition = this.descendInputOfBlock(block, 'CONDITION');
+            const needsWarpTimer = this.usesTimer;
+            if (needsWarpTimer) {
+                this.script.yields = true;
+            }
             return {
                 kind: 'control.while',
                 condition: {
                     kind: 'op.not',
-                    operand: this.descendInputOfBlock(block, 'CONDITION')
+                    operand: condition
                 },
-                do: this.descendSubstack(block, 'SUBSTACK')
+                do: this.descendSubstack(block, 'SUBSTACK'),
+                warpTimer: needsWarpTimer
             };
+        }
         case 'control_stop': {
             const level = block.fields.STOP_OPTION.value;
             if (level === 'all') {
@@ -798,7 +811,9 @@ class ScriptTreeGenerator {
             return {
                 kind: 'control.while',
                 condition: this.descendInputOfBlock(block, 'CONDITION'),
-                do: this.descendSubstack(block, 'SUBSTACK')
+                do: this.descendSubstack(block, 'SUBSTACK'),
+                // We should consider analyzing this like we do for control_repeat_until
+                warpTimer: false
             };
 
         case 'data_addtolist':
diff --git a/src/compiler/jsgen.js b/src/compiler/jsgen.js
index 93ac816d..a23a662d 100644
--- a/src/compiler/jsgen.js
+++ b/src/compiler/jsgen.js
@@ -794,7 +794,11 @@ class JSGenerator {
             this.resetVariableInputs();
             this.source += `while (${this.descendInput(node.condition).asBoolean()}) {\n`;
             this.descendStack(node.do, new Frame(true));
-            this.yieldLoop();
+            if (node.warpTimer) {
+                this.yieldStuckOrNotWarp();
+            } else {
+                this.yieldLoop();
+            }
             this.source += `}\n`;
             break;
 
diff --git a/test/fixtures/execute/tw-warp-repeat-until-timer-greater-than.sb3 b/test/fixtures/execute/tw-warp-repeat-until-timer-greater-than.sb3
new file mode 100644
index 0000000000000000000000000000000000000000..77ef3f288ba13469e10b61fe24c9a8ab91c3457a
GIT binary patch
literal 1973
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
K@*sEo`T7IeV^iY*

literal 0
HcmV?d00001