From 38247f03c870036ee999eb9a98ffa23879526e8d Mon Sep 17 00:00:00 2001
From: Nilay Majorwar <nilaymajorwar@gmail.com>
Date: Wed, 15 Dec 2021 21:39:37 +0530
Subject: [PATCH] Minor changes in execution loop code

---
 engines/execution-controller.ts | 31 ++++++++++++++++++++++---------
 ui/Mainframe.tsx                |  4 ++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/engines/execution-controller.ts b/engines/execution-controller.ts
index a087545..8f89fc0 100644
--- a/engines/execution-controller.ts
+++ b/engines/execution-controller.ts
@@ -97,25 +97,38 @@ class ExecutionController<RS> {
    * @returns Returns last (already used) execution result
    */
   async executeAll({ interval, onResult }: ExecuteAllArgs<RS>) {
+    // Clear paused state
+    this._isPaused = false;
+
     while (true) {
+      // Run an execution step in the engine
       this._result = this._engine.executeStep();
-      console.log("Result: ", this._result);
+
+      // Check end of program
       if (!this._result.nextStepLocation) {
-        // End of program
         onResult && onResult(this._result);
         this._resolvePause && this._resolvePause(); // In case pause happens on same cycle
         break;
-      } else if (this._resolvePause) {
-        // Execution has been paused/stopped
+      }
+
+      // Check if execution has been paused
+      if (this._resolvePause) {
         this._result.signal = "paused";
         onResult && onResult(this._result);
-        this._resolvePause();
+        this._resolvePause && this._resolvePause();
         break;
-      } else {
-        onResult && onResult(this._result);
-        // Sleep for specified interval
-        await this.sleep(interval || 0);
       }
+
+      // Check if next line has breakpoint
+      if (this._breakpoints.includes(this._result.nextStepLocation.line)) {
+        this._result.signal = "paused";
+        onResult && onResult(this._result);
+        break;
+      }
+
+      // Continue as usual
+      onResult && onResult(this._result);
+      await this.sleep(interval || 0);
     }
 
     return this._result;
diff --git a/ui/Mainframe.tsx b/ui/Mainframe.tsx
index c71b9a7..c586a45 100644
--- a/ui/Mainframe.tsx
+++ b/ui/Mainframe.tsx
@@ -44,7 +44,7 @@ export const Mainframe = () => {
       setRendererState(result.rendererState);
       setCodeHighlights(result.nextStepLocation || undefined);
       setOutput((o) => (o || "") + (result.output || ""));
-    }, 1000);
+    }, 40);
   };
 
   /** Pause the ongoing execution */
@@ -70,7 +70,7 @@ export const Mainframe = () => {
       setRendererState(result.rendererState);
       setCodeHighlights(result.nextStepLocation || undefined);
       setOutput((o) => (o || "") + (result.output || ""));
-    }, 1000);
+    }, 40);
   };
 
   /** Stop the currently active execution */